src/gl/compiler.cpp

Sat, 05 Mar 2022 15:40:43 +0200

author
Teemu Piippo <teemu@hecknology.net>
date
Sat, 05 Mar 2022 15:40:43 +0200
changeset 167
c1ff4f107569
parent 150
b6cbba6e29a1
child 189
815fbaae9cb2
permissions
-rw-r--r--

the grid now has less lines

19
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
1 /*
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
2 * LDForge: LDraw parts authoring CAD
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
3 * Copyright (C) 2013 - 2018 Teemu Piippo
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
4 *
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
5 * This program is free software: you can redistribute it and/or modify
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
6 * it under the terms of the GNU General Public License as published by
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
7 * the Free Software Foundation, either version 3 of the License, or
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
8 * (at your option) any later version.
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
9 *
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
10 * This program is distributed in the hope that it will be useful,
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
13 * GNU General Public License for more details.
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
14 *
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
15 * You should have received a copy of the GNU General Public License
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
17 */
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
18
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
19 #define GL_GLEXT_PROTOTYPES
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
20 #include <GL/glu.h>
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
21 #include <GL/glext.h>
26
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
22 #include <QMessageBox>
19
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
23 #include "gl/compiler.h"
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
24 #include "documentmanager.h"
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
25 #include "invert.h"
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
26 #include "ring.h"
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
27
27
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
28 static const char* vertexShaderSource = R"(
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
29 #version 330 core
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
30
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
31 layout(location=0) in vec3 position;
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
32 layout(location=1) in vec4 color;
34
1de2b8d64e9f added some sort of lighting
Teemu Piippo <teemu@hecknology.net>
parents: 33
diff changeset
33 layout(location=2) in vec3 normal;
49
d56cc7387dad wrote the id color in terms of the id value in the shader now that I can get the id to the shader properly
Teemu Piippo <teemu@hecknology.net>
parents: 48
diff changeset
34 layout(location=3) in int id;
51
1a9eac27698d selection works now
Teemu Piippo <teemu@hecknology.net>
parents: 50
diff changeset
35 layout(location=4) in int selected;
27
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
36 out vec4 vColor;
34
1de2b8d64e9f added some sort of lighting
Teemu Piippo <teemu@hecknology.net>
parents: 33
diff changeset
37 out vec3 vFragPos;
1de2b8d64e9f added some sort of lighting
Teemu Piippo <teemu@hecknology.net>
parents: 33
diff changeset
38 out vec3 vNormal;
1de2b8d64e9f added some sort of lighting
Teemu Piippo <teemu@hecknology.net>
parents: 33
diff changeset
39 uniform mat4 modelMatrix;
1de2b8d64e9f added some sort of lighting
Teemu Piippo <teemu@hecknology.net>
parents: 33
diff changeset
40 uniform mat4 viewMatrix;
1de2b8d64e9f added some sort of lighting
Teemu Piippo <teemu@hecknology.net>
parents: 33
diff changeset
41 uniform mat4 projectionMatrix;
37
90443fb328ea wired renderstyle up
Teemu Piippo <teemu@hecknology.net>
parents: 35
diff changeset
42 uniform int fragmentStyle;
48
3c10f0e2fbe0 added selection highlighting
Teemu Piippo <teemu@hecknology.net>
parents: 47
diff changeset
43 uniform vec3 selectedColor;
3c10f0e2fbe0 added selection highlighting
Teemu Piippo <teemu@hecknology.net>
parents: 47
diff changeset
44 uniform int highlighted;
37
90443fb328ea wired renderstyle up
Teemu Piippo <teemu@hecknology.net>
parents: 35
diff changeset
45
90443fb328ea wired renderstyle up
Teemu Piippo <teemu@hecknology.net>
parents: 35
diff changeset
46 const int FRAGSTYLE_Normal = 0;
90443fb328ea wired renderstyle up
Teemu Piippo <teemu@hecknology.net>
parents: 35
diff changeset
47 const int FRAGSTYLE_BfcGreen = 1;
90443fb328ea wired renderstyle up
Teemu Piippo <teemu@hecknology.net>
parents: 35
diff changeset
48 const int FRAGSTYLE_BfcRed = 2;
90443fb328ea wired renderstyle up
Teemu Piippo <teemu@hecknology.net>
parents: 35
diff changeset
49 const int FRAGSTYLE_Random = 3;
46
98645c8e7704 added the pick scene
Teemu Piippo <teemu@hecknology.net>
parents: 43
diff changeset
50 const int FRAGSTYLE_Id = 4;
119
Teemu Piippo <teemu@hecknology.net>
parents: 115
diff changeset
51 const int FRAGSTYLE_Black = 5;
27
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
52
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
53 void main()
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
54 {
34
1de2b8d64e9f added some sort of lighting
Teemu Piippo <teemu@hecknology.net>
parents: 33
diff changeset
55 mat3 normalMatrix = transpose(inverse(mat3(modelMatrix)));
1de2b8d64e9f added some sort of lighting
Teemu Piippo <teemu@hecknology.net>
parents: 33
diff changeset
56 vNormal = normalize(normalMatrix * normal);
48
3c10f0e2fbe0 added selection highlighting
Teemu Piippo <teemu@hecknology.net>
parents: 47
diff changeset
57 if (fragmentStyle == FRAGSTYLE_Id)
37
90443fb328ea wired renderstyle up
Teemu Piippo <teemu@hecknology.net>
parents: 35
diff changeset
58 {
49
d56cc7387dad wrote the id color in terms of the id value in the shader now that I can get the id to the shader properly
Teemu Piippo <teemu@hecknology.net>
parents: 48
diff changeset
59 /* Calculate a color based from this index. This method caters for
d56cc7387dad wrote the id color in terms of the id value in the shader now that I can get the id to the shader properly
Teemu Piippo <teemu@hecknology.net>
parents: 48
diff changeset
60 * 16777216 objects. I don't think that will be exceeded anytime soon.
d56cc7387dad wrote the id color in terms of the id value in the shader now that I can get the id to the shader properly
Teemu Piippo <teemu@hecknology.net>
parents: 48
diff changeset
61 */
d56cc7387dad wrote the id color in terms of the id value in the shader now that I can get the id to the shader properly
Teemu Piippo <teemu@hecknology.net>
parents: 48
diff changeset
62 int r = (id / 0x10000) % 0x100;
d56cc7387dad wrote the id color in terms of the id value in the shader now that I can get the id to the shader properly
Teemu Piippo <teemu@hecknology.net>
parents: 48
diff changeset
63 int g = (id / 0x100) % 0x100;
d56cc7387dad wrote the id color in terms of the id value in the shader now that I can get the id to the shader properly
Teemu Piippo <teemu@hecknology.net>
parents: 48
diff changeset
64 int b = id % 0x100;
d56cc7387dad wrote the id color in terms of the id value in the shader now that I can get the id to the shader properly
Teemu Piippo <teemu@hecknology.net>
parents: 48
diff changeset
65 vColor = vec4(r / 255.0, g / 255.0, b / 255.0, 1.0);
46
98645c8e7704 added the pick scene
Teemu Piippo <teemu@hecknology.net>
parents: 43
diff changeset
66 }
51
1a9eac27698d selection works now
Teemu Piippo <teemu@hecknology.net>
parents: 50
diff changeset
67 else if (selected == 1)
1a9eac27698d selection works now
Teemu Piippo <teemu@hecknology.net>
parents: 50
diff changeset
68 {
1a9eac27698d selection works now
Teemu Piippo <teemu@hecknology.net>
parents: 50
diff changeset
69 vColor = vec4(selectedColor, 1.0);
1a9eac27698d selection works now
Teemu Piippo <teemu@hecknology.net>
parents: 50
diff changeset
70 }
37
90443fb328ea wired renderstyle up
Teemu Piippo <teemu@hecknology.net>
parents: 35
diff changeset
71 else
90443fb328ea wired renderstyle up
Teemu Piippo <teemu@hecknology.net>
parents: 35
diff changeset
72 {
48
3c10f0e2fbe0 added selection highlighting
Teemu Piippo <teemu@hecknology.net>
parents: 47
diff changeset
73 if (fragmentStyle == FRAGSTYLE_BfcGreen)
3c10f0e2fbe0 added selection highlighting
Teemu Piippo <teemu@hecknology.net>
parents: 47
diff changeset
74 {
3c10f0e2fbe0 added selection highlighting
Teemu Piippo <teemu@hecknology.net>
parents: 47
diff changeset
75 vColor = vec4(0.2, 0.9, 0.2, 1.0);
3c10f0e2fbe0 added selection highlighting
Teemu Piippo <teemu@hecknology.net>
parents: 47
diff changeset
76 }
3c10f0e2fbe0 added selection highlighting
Teemu Piippo <teemu@hecknology.net>
parents: 47
diff changeset
77 else if (fragmentStyle == FRAGSTYLE_BfcRed)
3c10f0e2fbe0 added selection highlighting
Teemu Piippo <teemu@hecknology.net>
parents: 47
diff changeset
78 {
3c10f0e2fbe0 added selection highlighting
Teemu Piippo <teemu@hecknology.net>
parents: 47
diff changeset
79 vColor = vec4(0.9, 0.2, 0.2, 1.0);
3c10f0e2fbe0 added selection highlighting
Teemu Piippo <teemu@hecknology.net>
parents: 47
diff changeset
80 }
119
Teemu Piippo <teemu@hecknology.net>
parents: 115
diff changeset
81 else if (fragmentStyle == FRAGSTYLE_Black)
Teemu Piippo <teemu@hecknology.net>
parents: 115
diff changeset
82 {
Teemu Piippo <teemu@hecknology.net>
parents: 115
diff changeset
83 vColor = vec4(0.0, 0.0, 0.0, 1.0);
Teemu Piippo <teemu@hecknology.net>
parents: 115
diff changeset
84 }
48
3c10f0e2fbe0 added selection highlighting
Teemu Piippo <teemu@hecknology.net>
parents: 47
diff changeset
85 else
3c10f0e2fbe0 added selection highlighting
Teemu Piippo <teemu@hecknology.net>
parents: 47
diff changeset
86 {
3c10f0e2fbe0 added selection highlighting
Teemu Piippo <teemu@hecknology.net>
parents: 47
diff changeset
87 vColor = color;
3c10f0e2fbe0 added selection highlighting
Teemu Piippo <teemu@hecknology.net>
parents: 47
diff changeset
88 }
3c10f0e2fbe0 added selection highlighting
Teemu Piippo <teemu@hecknology.net>
parents: 47
diff changeset
89 if (highlighted == id)
3c10f0e2fbe0 added selection highlighting
Teemu Piippo <teemu@hecknology.net>
parents: 47
diff changeset
90 {
3c10f0e2fbe0 added selection highlighting
Teemu Piippo <teemu@hecknology.net>
parents: 47
diff changeset
91 vColor = (vColor + vec4(selectedColor, 1.0) * 0.6) / 1.6;
3c10f0e2fbe0 added selection highlighting
Teemu Piippo <teemu@hecknology.net>
parents: 47
diff changeset
92 }
37
90443fb328ea wired renderstyle up
Teemu Piippo <teemu@hecknology.net>
parents: 35
diff changeset
93 }
48
3c10f0e2fbe0 added selection highlighting
Teemu Piippo <teemu@hecknology.net>
parents: 47
diff changeset
94
34
1de2b8d64e9f added some sort of lighting
Teemu Piippo <teemu@hecknology.net>
parents: 33
diff changeset
95 vFragPos = vec3(modelMatrix * vec4(position, 1.0));
1de2b8d64e9f added some sort of lighting
Teemu Piippo <teemu@hecknology.net>
parents: 33
diff changeset
96 gl_Position = projectionMatrix * viewMatrix * vec4(vFragPos, 1.0);
27
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
97 }
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
98 )";
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
99
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
100 static const char* fragmentShaderSource = R"(
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
101 #version 330 core
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
102
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
103 in vec4 vColor;
34
1de2b8d64e9f added some sort of lighting
Teemu Piippo <teemu@hecknology.net>
parents: 33
diff changeset
104 in vec3 vFragPos;
1de2b8d64e9f added some sort of lighting
Teemu Piippo <teemu@hecknology.net>
parents: 33
diff changeset
105 in vec3 vNormal;
27
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
106 out vec4 fColor;
34
1de2b8d64e9f added some sort of lighting
Teemu Piippo <teemu@hecknology.net>
parents: 33
diff changeset
107 const vec3 lightPos = vec3(0.5, 0.5, 0.5);
1de2b8d64e9f added some sort of lighting
Teemu Piippo <teemu@hecknology.net>
parents: 33
diff changeset
108 const vec4 lightColor = vec4(1.0, 1.0, 1.0, 1.0);
1de2b8d64e9f added some sort of lighting
Teemu Piippo <teemu@hecknology.net>
parents: 33
diff changeset
109 const float ambientStrength = 0.7;
46
98645c8e7704 added the pick scene
Teemu Piippo <teemu@hecknology.net>
parents: 43
diff changeset
110 uniform bool useLighting;
27
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
111
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
112 void main()
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
113 {
46
98645c8e7704 added the pick scene
Teemu Piippo <teemu@hecknology.net>
parents: 43
diff changeset
114 if (useLighting)
98645c8e7704 added the pick scene
Teemu Piippo <teemu@hecknology.net>
parents: 43
diff changeset
115 {
98645c8e7704 added the pick scene
Teemu Piippo <teemu@hecknology.net>
parents: 43
diff changeset
116 vec4 ambient = ambientStrength * lightColor;
98645c8e7704 added the pick scene
Teemu Piippo <teemu@hecknology.net>
parents: 43
diff changeset
117 vec3 lightDirection = normalize(lightPos - vFragPos);
98645c8e7704 added the pick scene
Teemu Piippo <teemu@hecknology.net>
parents: 43
diff changeset
118 vec4 diffuse = max(dot(vNormal, lightDirection), 0.0) * lightColor;
98645c8e7704 added the pick scene
Teemu Piippo <teemu@hecknology.net>
parents: 43
diff changeset
119 fColor = (ambient + diffuse) * vColor;
98645c8e7704 added the pick scene
Teemu Piippo <teemu@hecknology.net>
parents: 43
diff changeset
120 }
98645c8e7704 added the pick scene
Teemu Piippo <teemu@hecknology.net>
parents: 43
diff changeset
121 else
98645c8e7704 added the pick scene
Teemu Piippo <teemu@hecknology.net>
parents: 43
diff changeset
122 {
98645c8e7704 added the pick scene
Teemu Piippo <teemu@hecknology.net>
parents: 43
diff changeset
123 fColor = vColor;
98645c8e7704 added the pick scene
Teemu Piippo <teemu@hecknology.net>
parents: 43
diff changeset
124 }
27
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
125 }
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
126 )";
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
127
150
b6cbba6e29a1 extract polygon cache out of Model
Teemu Piippo <teemu@hecknology.net>
parents: 139
diff changeset
128 gl::Compiler::Compiler(Model *model, const ldraw::ColorTable& colorTable, QObject* parent) :
26
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
129 QObject{parent},
150
b6cbba6e29a1 extract polygon cache out of Model
Teemu Piippo <teemu@hecknology.net>
parents: 139
diff changeset
130 model{model},
26
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
131 colorTable{colorTable}
21
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
132 {
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
133 }
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
134
19
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
135 gl::Compiler::~Compiler()
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
136 {
26
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
137 }
19
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
138
53
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
139 void gl::buildShaders(
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
140 QOpenGLShaderProgram* shaderProgram,
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
141 const char* vertexShaderSource,
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
142 const char* fragmentShaderSource)
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
143 {
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
144 shaderProgram->create();
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
145 const bool vertexShaderCompiled = shaderProgram->addShaderFromSourceCode(QOpenGLShader::Vertex, vertexShaderSource);
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
146 QString log;
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
147 if (not vertexShaderCompiled)
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
148 {
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
149 log += "\n" + QObject::tr("Vertex shader:") + "\n" + shaderProgram->log();
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
150 }
115
ed884a2fb009 fix too long lines
Teemu Piippo <teemu@hecknology.net>
parents: 80
diff changeset
151 const bool fragmentShaderCompiled = shaderProgram->addShaderFromSourceCode(
ed884a2fb009 fix too long lines
Teemu Piippo <teemu@hecknology.net>
parents: 80
diff changeset
152 QOpenGLShader::Fragment,
ed884a2fb009 fix too long lines
Teemu Piippo <teemu@hecknology.net>
parents: 80
diff changeset
153 fragmentShaderSource);
53
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
154 if (not fragmentShaderCompiled)
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
155 {
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
156 log += "\n" + QObject::tr("Fragment shader:") + "\n" + shaderProgram->log();
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
157 }
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
158 if (not vertexShaderCompiled or not fragmentShaderCompiled)
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
159 {
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
160 QMessageBox::critical(
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
161 nullptr,
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
162 QObject::tr("Shader compile error"),
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
163 QObject::tr("Could not compile shaders.") + "\n" + log);
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
164 std::exit(-1);
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
165 }
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
166 const bool linkSuccessful = shaderProgram->link();
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
167 if (not linkSuccessful)
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
168 {
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
169 QMessageBox::critical(
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
170 nullptr,
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
171 QObject::tr("Shader link error"),
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
172 QObject::tr("Could not link shaders: %1").arg(shaderProgram->log())
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
173 );
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
174 }
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
175 }
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
176
26
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
177 void gl::Compiler::initialize()
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
178 {
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
179 if (not this->initialized)
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
180 {
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
181 this->initializeOpenGLFunctions();
80
764381756899 simplification
Teemu Piippo <teemu@hecknology.net>
parents: 78
diff changeset
182 for (auto& object : this->glObjects)
26
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
183 {
27
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
184 object.program = new QOpenGLShaderProgram;
53
3af627f7a40f added grid program
Teemu Piippo <teemu@hecknology.net>
parents: 51
diff changeset
185 gl::buildShaders(object.program, ::vertexShaderSource, ::fragmentShaderSource);
27
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
186 object.program->bind();
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
187 object.buffer.create();
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
188 object.buffer.bind();
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
189 object.buffer.setUsagePattern(QOpenGLBuffer::DynamicDraw);
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
190 object.vertexArray.create();
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
191 object.vertexArray.bind();
51
1a9eac27698d selection works now
Teemu Piippo <teemu@hecknology.net>
parents: 50
diff changeset
192 for (int k : {0, 1, 2, 3, 4})
48
3c10f0e2fbe0 added selection highlighting
Teemu Piippo <teemu@hecknology.net>
parents: 47
diff changeset
193 {
3c10f0e2fbe0 added selection highlighting
Teemu Piippo <teemu@hecknology.net>
parents: 47
diff changeset
194 object.program->enableAttributeArray(k);
3c10f0e2fbe0 added selection highlighting
Teemu Piippo <teemu@hecknology.net>
parents: 47
diff changeset
195 }
80
764381756899 simplification
Teemu Piippo <teemu@hecknology.net>
parents: 78
diff changeset
196 constexpr int stride = sizeof(Vertex);
764381756899 simplification
Teemu Piippo <teemu@hecknology.net>
parents: 78
diff changeset
197 object.program->setAttributeBuffer(0, GL_FLOAT, offsetof(Vertex, position), 3, stride);
764381756899 simplification
Teemu Piippo <teemu@hecknology.net>
parents: 78
diff changeset
198 object.program->setAttributeBuffer(1, GL_FLOAT, offsetof(Vertex, color), 4, stride);
764381756899 simplification
Teemu Piippo <teemu@hecknology.net>
parents: 78
diff changeset
199 object.program->setAttributeBuffer(2, GL_FLOAT, offsetof(Vertex, normal), 3, stride);
764381756899 simplification
Teemu Piippo <teemu@hecknology.net>
parents: 78
diff changeset
200 glVertexAttribIPointer(3, 1, GL_INT, stride, reinterpret_cast<void*>(offsetof(Vertex, id)));
764381756899 simplification
Teemu Piippo <teemu@hecknology.net>
parents: 78
diff changeset
201 glVertexAttribIPointer(4, 1, GL_INT, stride, reinterpret_cast<void*>(offsetof(Vertex, selected)));
27
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
202 object.vertexArray.release();
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
203 object.buffer.release();
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
204 object.program->release();
26
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
205 }
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
206 this->initialized = true;
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
207 }
19
ed9685f44ab3 added missing files
Teemu Piippo <teemu@hecknology.net>
parents:
diff changeset
208 }
21
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
209
150
b6cbba6e29a1 extract polygon cache out of Model
Teemu Piippo <teemu@hecknology.net>
parents: 139
diff changeset
210 void gl::Compiler::build(DocumentManager* context, const gl::RenderPreferences& preferences)
21
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
211 {
22
6da867fa5429 commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents: 21
diff changeset
212 this->boundingBox = {};
80
764381756899 simplification
Teemu Piippo <teemu@hecknology.net>
parents: 78
diff changeset
213 std::vector<Vertex> vboData[gl::NUM_POLYGON_TYPES];
150
b6cbba6e29a1 extract polygon cache out of Model
Teemu Piippo <teemu@hecknology.net>
parents: 139
diff changeset
214 std::optional<ModelId> modelId = context->findIdForModel(this->model);
b6cbba6e29a1 extract polygon cache out of Model
Teemu Piippo <teemu@hecknology.net>
parents: 139
diff changeset
215 if (modelId.has_value())
21
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
216 {
150
b6cbba6e29a1 extract polygon cache out of Model
Teemu Piippo <teemu@hecknology.net>
parents: 139
diff changeset
217 PolygonCache* polygonBuilder = context->getPolygonCacheForModel(modelId.value());
b6cbba6e29a1 extract polygon cache out of Model
Teemu Piippo <teemu@hecknology.net>
parents: 139
diff changeset
218 if (polygonBuilder != nullptr)
b6cbba6e29a1 extract polygon cache out of Model
Teemu Piippo <teemu@hecknology.net>
parents: 139
diff changeset
219 {
b6cbba6e29a1 extract polygon cache out of Model
Teemu Piippo <teemu@hecknology.net>
parents: 139
diff changeset
220 const std::vector<gl::Polygon> polygons = polygonBuilder->getPolygons(context);
b6cbba6e29a1 extract polygon cache out of Model
Teemu Piippo <teemu@hecknology.net>
parents: 139
diff changeset
221 for (const gl::Polygon& polygon : polygons)
b6cbba6e29a1 extract polygon cache out of Model
Teemu Piippo <teemu@hecknology.net>
parents: 139
diff changeset
222 {
b6cbba6e29a1 extract polygon cache out of Model
Teemu Piippo <teemu@hecknology.net>
parents: 139
diff changeset
223 this->buildPolygon(polygon, vboData, preferences);
b6cbba6e29a1 extract polygon cache out of Model
Teemu Piippo <teemu@hecknology.net>
parents: 139
diff changeset
224 }
b6cbba6e29a1 extract polygon cache out of Model
Teemu Piippo <teemu@hecknology.net>
parents: 139
diff changeset
225 for (int arrayId = 0; arrayId < gl::NUM_POLYGON_TYPES; arrayId += 1)
b6cbba6e29a1 extract polygon cache out of Model
Teemu Piippo <teemu@hecknology.net>
parents: 139
diff changeset
226 {
b6cbba6e29a1 extract polygon cache out of Model
Teemu Piippo <teemu@hecknology.net>
parents: 139
diff changeset
227 auto& buffer = this->glObjects[arrayId].buffer;
b6cbba6e29a1 extract polygon cache out of Model
Teemu Piippo <teemu@hecknology.net>
parents: 139
diff changeset
228 auto& vector = vboData[arrayId];
b6cbba6e29a1 extract polygon cache out of Model
Teemu Piippo <teemu@hecknology.net>
parents: 139
diff changeset
229 this->storedVertexCounts[arrayId] = vector.size();
b6cbba6e29a1 extract polygon cache out of Model
Teemu Piippo <teemu@hecknology.net>
parents: 139
diff changeset
230 this->glObjects[arrayId].cachedData = vector; // todo: get rid of this copy
b6cbba6e29a1 extract polygon cache out of Model
Teemu Piippo <teemu@hecknology.net>
parents: 139
diff changeset
231 buffer.bind();
b6cbba6e29a1 extract polygon cache out of Model
Teemu Piippo <teemu@hecknology.net>
parents: 139
diff changeset
232 buffer.allocate(vector.data(), static_cast<int>(vector.size() * sizeof vector[0]));
b6cbba6e29a1 extract polygon cache out of Model
Teemu Piippo <teemu@hecknology.net>
parents: 139
diff changeset
233 buffer.release();
b6cbba6e29a1 extract polygon cache out of Model
Teemu Piippo <teemu@hecknology.net>
parents: 139
diff changeset
234 }
b6cbba6e29a1 extract polygon cache out of Model
Teemu Piippo <teemu@hecknology.net>
parents: 139
diff changeset
235 }
21
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
236 }
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
237 }
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
238
26
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
239 gl::ArrayClass classifyPolygon(const gl::Polygon& polygon)
21
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
240 {
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
241 switch (polygon.type)
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
242 {
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
243 case gl::Polygon::EdgeLine:
26
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
244 return gl::ArrayClass::Lines;
21
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
245 case gl::Polygon::Triangle:
26
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
246 return gl::ArrayClass::Triangles;
21
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
247 case gl::Polygon::Quadrilateral:
26
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
248 return gl::ArrayClass::Quads;
21
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
249 case gl::Polygon::ConditionalEdge:
26
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
250 return gl::ArrayClass::ConditionalLines;
21
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
251 }
26
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
252 return gl::ArrayClass::Lines;
21
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
253 }
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
254
78
97c3ce5aa498 fixed signed vs unsigned nonsense in gl::Compiler::idFromColor
Teemu Piippo <teemu@hecknology.net>
parents: 73
diff changeset
255 ldraw::id_t gl::Compiler::idFromColor(const std::array<GLubyte, 3>& data)
47
cd6704009eb9 picking works now
Teemu Piippo <teemu@hecknology.net>
parents: 46
diff changeset
256 {
cd6704009eb9 picking works now
Teemu Piippo <teemu@hecknology.net>
parents: 46
diff changeset
257 return {data[0] * std::int32_t{0x10000} + data[1] * std::int32_t{0x100} + data[2]};
cd6704009eb9 picking works now
Teemu Piippo <teemu@hecknology.net>
parents: 46
diff changeset
258 }
cd6704009eb9 picking works now
Teemu Piippo <teemu@hecknology.net>
parents: 46
diff changeset
259
39
caac957e9834 Main color is now configurable
Teemu Piippo <teemu@hecknology.net>
parents: 37
diff changeset
260 void gl::Compiler::buildPolygon(
caac957e9834 Main color is now configurable
Teemu Piippo <teemu@hecknology.net>
parents: 37
diff changeset
261 gl::Polygon polygon,
80
764381756899 simplification
Teemu Piippo <teemu@hecknology.net>
parents: 78
diff changeset
262 std::vector<Vertex>* vboData,
39
caac957e9834 Main color is now configurable
Teemu Piippo <teemu@hecknology.net>
parents: 37
diff changeset
263 const gl::RenderPreferences& preferences)
21
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
264 {
26
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
265 const gl::ArrayClass vboClass = classifyPolygon(polygon);
80
764381756899 simplification
Teemu Piippo <teemu@hecknology.net>
parents: 78
diff changeset
266 std::vector<Vertex>& vertexBuffer = vboData[static_cast<int>(vboClass)];
21
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
267 auto vertexRing = iter::ring(polygon.vertices, polygon.numPolygonVertices());
34
1de2b8d64e9f added some sort of lighting
Teemu Piippo <teemu@hecknology.net>
parents: 33
diff changeset
268 reserveMore(vertexBuffer, polygon.numPolygonVertices());
39
caac957e9834 Main color is now configurable
Teemu Piippo <teemu@hecknology.net>
parents: 37
diff changeset
269 const QColor color = this->getColorForPolygon(polygon, preferences);
22
6da867fa5429 commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents: 21
diff changeset
270 for (unsigned int i = 0; i < polygon.numPolygonVertices(); i += 1)
21
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
271 {
33
4c41bfe2ec6e replaced matrix and vertex classes with glm
Teemu Piippo <teemu@hecknology.net>
parents: 30
diff changeset
272 const glm::vec3& v1 = vertexRing[i - 1];
4c41bfe2ec6e replaced matrix and vertex classes with glm
Teemu Piippo <teemu@hecknology.net>
parents: 30
diff changeset
273 const glm::vec3& v2 = vertexRing[i];
4c41bfe2ec6e replaced matrix and vertex classes with glm
Teemu Piippo <teemu@hecknology.net>
parents: 30
diff changeset
274 const glm::vec3& v3 = vertexRing[i + 1];
22
6da867fa5429 commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents: 21
diff changeset
275 this->boundingBox.consider(polygon.vertices[i]);
80
764381756899 simplification
Teemu Piippo <teemu@hecknology.net>
parents: 78
diff changeset
276 Vertex& vertex = vertexBuffer.emplace_back();
34
1de2b8d64e9f added some sort of lighting
Teemu Piippo <teemu@hecknology.net>
parents: 33
diff changeset
277 vertex.position = polygon.vertices[i];
1de2b8d64e9f added some sort of lighting
Teemu Piippo <teemu@hecknology.net>
parents: 33
diff changeset
278 vertex.normal = glm::normalize(glm::cross(v1 - v2, v3 - v2));
1de2b8d64e9f added some sort of lighting
Teemu Piippo <teemu@hecknology.net>
parents: 33
diff changeset
279 vertex.color = glm::vec4{color.redF(), color.greenF(), color.blueF(), color.alphaF()};
48
3c10f0e2fbe0 added selection highlighting
Teemu Piippo <teemu@hecknology.net>
parents: 47
diff changeset
280 vertex.id = polygon.id.value;
21
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
281 }
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
282 }
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
283
39
caac957e9834 Main color is now configurable
Teemu Piippo <teemu@hecknology.net>
parents: 37
diff changeset
284 QColor gl::Compiler::getColorForPolygon(const gl::Polygon& polygon, const gl::RenderPreferences& preferences)
21
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
285 {
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
286 QColor color;
26
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
287 // For normal colors, use the polygon's color.
139
72098474d362 Document and refactor colors.cpp and colors.h
Teemu Piippo <teemu@hecknology.net>
parents: 119
diff changeset
288 if (polygon.color == ldraw::MAIN_COLOR)
21
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
289 {
39
caac957e9834 Main color is now configurable
Teemu Piippo <teemu@hecknology.net>
parents: 37
diff changeset
290 color = preferences.mainColor;
21
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
291 }
139
72098474d362 Document and refactor colors.cpp and colors.h
Teemu Piippo <teemu@hecknology.net>
parents: 119
diff changeset
292 else if (polygon.color == ldraw::EDGE_COLOR)
21
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
293 {
26
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
294 // Edge color is black, unless we have a dark background, in which case lines need to be bright.
43
08dc62e03a6d made edges white in dark backgrounds
Teemu Piippo <teemu@hecknology.net>
parents: 39
diff changeset
295 color = luma(preferences.backgroundColor) > (40.0 / 256.0) ? Qt::black : Qt::white;
21
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
296 }
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
297 else
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
298 {
26
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
299 // Not main or edge color, use the polygon's color as is.
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
300 color = this->colorTable[polygon.color].faceColor;
21
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
301 }
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
302 return color;
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
303 }
Teemu Piippo <teemu@hecknology.net>
parents: 19
diff changeset
304
33
4c41bfe2ec6e replaced matrix and vertex classes with glm
Teemu Piippo <teemu@hecknology.net>
parents: 30
diff changeset
305 glm::vec3 gl::Compiler::modelCenter() const
22
6da867fa5429 commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents: 21
diff changeset
306 {
6da867fa5429 commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents: 21
diff changeset
307 return boxCenter(this->boundingBox);
6da867fa5429 commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents: 21
diff changeset
308 }
6da867fa5429 commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents: 21
diff changeset
309
51
1a9eac27698d selection works now
Teemu Piippo <teemu@hecknology.net>
parents: 50
diff changeset
310 double gl::Compiler::modelDistance() const
22
6da867fa5429 commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents: 21
diff changeset
311 {
51
1a9eac27698d selection works now
Teemu Piippo <teemu@hecknology.net>
parents: 50
diff changeset
312 return static_cast<double>(longestMeasure(this->boundingBox));
22
6da867fa5429 commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents: 21
diff changeset
313 }
6da867fa5429 commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents: 21
diff changeset
314
26
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
315 void gl::Compiler::bindVertexArray(gl::ArrayClass arrayClass)
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
316 {
27
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
317 auto& object = this->glObjects[static_cast<int>(arrayClass)];
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
318 object.vertexArray.bind();
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
319 object.program->bind();
26
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
320 }
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
321
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
322 void gl::Compiler::releaseVertexArray(gl::ArrayClass arrayClass)
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
323 {
27
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
324 auto& object = this->glObjects[static_cast<int>(arrayClass)];
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
325 object.program->release();
c57fb7a5ffa3 commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents: 26
diff changeset
326 object.vertexArray.release();
26
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
327 }
3a9e761e4faa at least VAOs work now
Teemu Piippo <teemu@hecknology.net>
parents: 22
diff changeset
328
73
97df974b5ed5 ldraw::Id is now templated for extra type safety
Teemu Piippo <teemu@hecknology.net>
parents: 53
diff changeset
329 void gl::Compiler::setSelectedObjects(const QSet<ldraw::id_t> ids)
51
1a9eac27698d selection works now
Teemu Piippo <teemu@hecknology.net>
parents: 50
diff changeset
330 {
80
764381756899 simplification
Teemu Piippo <teemu@hecknology.net>
parents: 78
diff changeset
331 for (auto& object : this->glObjects)
51
1a9eac27698d selection works now
Teemu Piippo <teemu@hecknology.net>
parents: 50
diff changeset
332 {
80
764381756899 simplification
Teemu Piippo <teemu@hecknology.net>
parents: 78
diff changeset
333 std::vector<Vertex>& vector = object.cachedData;
764381756899 simplification
Teemu Piippo <teemu@hecknology.net>
parents: 78
diff changeset
334 for (Vertex& vertex : vector)
51
1a9eac27698d selection works now
Teemu Piippo <teemu@hecknology.net>
parents: 50
diff changeset
335 {
1a9eac27698d selection works now
Teemu Piippo <teemu@hecknology.net>
parents: 50
diff changeset
336 vertex.selected = (ids.contains({vertex.id})) ? 1 : 0;
1a9eac27698d selection works now
Teemu Piippo <teemu@hecknology.net>
parents: 50
diff changeset
337 }
1a9eac27698d selection works now
Teemu Piippo <teemu@hecknology.net>
parents: 50
diff changeset
338 const GLsizeiptr size = static_cast<int>(vector.size() * sizeof vector[0]);
80
764381756899 simplification
Teemu Piippo <teemu@hecknology.net>
parents: 78
diff changeset
339 object.buffer.bind();
51
1a9eac27698d selection works now
Teemu Piippo <teemu@hecknology.net>
parents: 50
diff changeset
340 glBufferSubData(GL_ARRAY_BUFFER, 0, size, vector.data());
80
764381756899 simplification
Teemu Piippo <teemu@hecknology.net>
parents: 78
diff changeset
341 object.buffer.release();
51
1a9eac27698d selection works now
Teemu Piippo <teemu@hecknology.net>
parents: 50
diff changeset
342 }
1a9eac27698d selection works now
Teemu Piippo <teemu@hecknology.net>
parents: 50
diff changeset
343 }
1a9eac27698d selection works now
Teemu Piippo <teemu@hecknology.net>
parents: 50
diff changeset
344
34
1de2b8d64e9f added some sort of lighting
Teemu Piippo <teemu@hecknology.net>
parents: 33
diff changeset
345 std::size_t gl::Compiler::vertexCount(const gl::ArrayClass arrayClass) const
28
c92c1daf735f modelview matrix set up
Teemu Piippo <teemu@hecknology.net>
parents: 27
diff changeset
346 {
34
1de2b8d64e9f added some sort of lighting
Teemu Piippo <teemu@hecknology.net>
parents: 33
diff changeset
347 return this->storedVertexCounts[static_cast<int>(arrayClass)];
28
c92c1daf735f modelview matrix set up
Teemu Piippo <teemu@hecknology.net>
parents: 27
diff changeset
348 }

mercurial