src/glcompiler.cpp

Thu, 15 Feb 2018 11:34:04 +0200

author
Santeri Piippo
date
Thu, 15 Feb 2018 11:34:04 +0200
changeset 1246
0054d13ed614
parent 1245
338d66111168
child 1247
7e1ce2fc066b
permissions
-rw-r--r--

used mvc selection models

706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
1 /*
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
2 * LDForge: LDraw parts authoring CAD
1072
9ce9496427f2 Happy new year 2017!
Teemu Piippo <teemu@hecknology.net>
parents: 1065
diff changeset
3 * Copyright (C) 2013 - 2017 Teemu Piippo
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
4 *
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
5 * This program is free software: you can redistribute it and/or modify
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
6 * it under the terms of the GNU General Public License as published by
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
7 * the Free Software Foundation, either version 3 of the License, or
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
8 * (at your option) any later version.
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
9 *
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
10 * This program is distributed in the hope that it will be useful,
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
13 * GNU General Public License for more details.
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
14 *
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
15 * You should have received a copy of the GNU General Public License
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
17 */
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
18
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
19 #define GL_GLEXT_PROTOTYPES
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
20 #include <GL/glu.h>
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
21 #include <GL/glext.h>
1146
bb728c124d47 Renamed glCompiler.cpp → glcompiler.cpp
Teemu Piippo <teemu@hecknology.net>
parents: 1139
diff changeset
22 #include "glcompiler.h"
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
23 #include "miscallenous.h"
986
525921eae58c Refactor GLRenderer and GLCompiler
Teemu Piippo <crimsondusk64@gmail.com>
parents: 985
diff changeset
24 #include "guiutilities.h"
1012
413ecd6b9801 It worx again!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1011
diff changeset
25 #include "documentmanager.h"
1023
9450ac3cd930 Split grid stuff into a new class Grid in grid.cpp/grid.h
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1017
diff changeset
26 #include "grid.h"
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
27
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
28 void checkGLError(HierarchyElement* element, QString file, int line)
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
29 {
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
30 struct ErrorInfo
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
31 {
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
32 GLenum value;
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
33 QString text;
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
34 };
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
35
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
36 static const ErrorInfo knownErrors[] =
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
37 {
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
38 { GL_NO_ERROR, "No error" },
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
39 { GL_INVALID_ENUM, "Unacceptable enumerator passed" },
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
40 { GL_INVALID_VALUE, "Numeric argument out of range" },
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
41 { GL_INVALID_OPERATION, "The operation is not allowed to be done in this state" },
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
42 { GL_INVALID_FRAMEBUFFER_OPERATION, "Framebuffer object is not complete"},
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
43 { GL_OUT_OF_MEMORY, "Out of memory" },
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
44 { GL_STACK_UNDERFLOW, "The operation would have caused an underflow" },
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
45 { GL_STACK_OVERFLOW, "The operation would have caused an overflow" },
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
46 };
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
47
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
48 GLenum errorNumber = glGetError();
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
49
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
50 if (errorNumber != GL_NO_ERROR)
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
51 {
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
52 QString errorMessage;
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
53
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
54 for (const ErrorInfo& error : knownErrors)
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
55 {
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
56 if (error.value == errorNumber)
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
57 {
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
58 errorMessage = error.text;
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
59 break;
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
60 }
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
61 }
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
62
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
63 element->print("OpenGL ERROR: at %1:%2: %3", Basename(file), line, errorMessage);
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
64 }
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
65 }
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
66
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
67 /*
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
68 * Constructs a GL compiler.
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
69 */
759
038985b4a154 - added a selection hover effect to the renderer. selecting objects just became a lot more convenient...
Santeri Piippo <crimsondusk64@gmail.com>
parents: 757
diff changeset
70 GLCompiler::GLCompiler (GLRenderer* renderer) :
971
c00f9665a9f8 Now compiles and links but crashes shortly after startup.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 970
diff changeset
71 HierarchyElement (renderer),
759
038985b4a154 - added a selection hover effect to the renderer. selecting objects just became a lot more convenient...
Santeri Piippo <crimsondusk64@gmail.com>
parents: 757
diff changeset
72 m_renderer (renderer)
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
73 {
1245
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
74 connect(
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
75 renderer->model(),
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
76 SIGNAL(rowsInserted(QModelIndex, int, int)),
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
77 this,
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
78 SLOT(handleRowInsertion(QModelIndex, int, int))
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
79 );
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
80 connect(
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
81 renderer->model(),
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
82 SIGNAL(rowsRemoved(QModelIndex, int, int)),
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
83 this,
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
84 SLOT(handleRowRemoval(QModelIndex, int, int))
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
85 );
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
86 connect(
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
87 renderer->model(),
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
88 SIGNAL(dataChanged(QModelIndex, QModelIndex, QVector<int>)),
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
89 this,
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
90 SLOT(handleDataChange(QModelIndex, QModelIndex))
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
91 );
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
92 // connect(renderer, SIGNAL(objectHighlightingChanged(LDObject*)), this, SLOT(compileObject(LDObject*)));
1113
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
93 connect(m_window, SIGNAL(gridChanged()), this, SLOT(recompile()));
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
94
1244
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
95 for (QModelIndex index : renderer->model()->indices())
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
96 {
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
97 print("%1", index);
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
98 stageForCompilation(index);
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
99 }
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
100 }
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
101
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
102 /*
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
103 * Initializes the VBOs after OpenGL is initialized.
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
104 */
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
105 void GLCompiler::initialize()
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
106 {
855
e16f1587ef44 - fixed compilation on windows systems
Santeri Piippo <crimsondusk64@gmail.com>
parents: 852
diff changeset
107 initializeOpenGLFunctions();
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
108 glGenBuffers(countof(m_vbo), &m_vbo[0]);
861
83426c5fa732 - major identifier renaming
Teemu Piippo <crimsondusk64@gmail.com>
parents: 857
diff changeset
109 CHECK_GL_ERROR();
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
110 }
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
111
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
112 /*
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
113 * Destructs the VBOs when the compiler is deleted.
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
114 */
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
115 GLCompiler::~GLCompiler()
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
116 {
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
117 glDeleteBuffers(countof(m_vbo), &m_vbo[0]);
861
83426c5fa732 - major identifier renaming
Teemu Piippo <crimsondusk64@gmail.com>
parents: 857
diff changeset
118 CHECK_GL_ERROR();
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
119 }
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
120
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
121 /*
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
122 * Returns an index color for the LDObject ID given. This color represents the object in the picking scene.
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
123 */
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
124 QColor GLCompiler::indexColorForID (qint32 id) const
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
125 {
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
126 // Calculate a color based from this index. This method caters for
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
127 // 16777216 objects. I don't think that will be exceeded anytime soon. :)
1113
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
128 int r = (id / 0x10000) % 0x100;
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
129 int g = (id / 0x100) % 0x100;
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
130 int b = id % 0x100;
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
131 return {r, g, b};
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
132 }
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
133
1127
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
134 /*
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
135 * Returns the suitable color for the polygon.
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
136 * - polygon is the polygon to colorise.
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
137 * - polygonOwner is the LDObject from which the polygon originated.
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
138 * - subclass provides context for the polygon.
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
139 */
1246
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
140 QColor GLCompiler::getColorForPolygon(
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
141 LDPolygon& polygon,
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
142 const QModelIndex& polygonOwnerIndex,
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
143 VboSubclass subclass
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
144 ) {
1127
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
145 QColor color;
1246
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
146 LDObject* polygonOwner = m_renderer->model()->lookup(polygonOwnerIndex);
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
147
1127
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
148 switch (subclass)
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
149 {
1123
15e46ea3151f Reworked iterable enums: they all are enum classes now and the end value is marked with "_End"
Teemu Piippo <teemu@hecknology.net>
parents: 1122
diff changeset
150 case VboSubclass::Surfaces:
15e46ea3151f Reworked iterable enums: they all are enum classes now and the end value is marked with "_End"
Teemu Piippo <teemu@hecknology.net>
parents: 1122
diff changeset
151 case VboSubclass::Normals:
1239
f1cf9d2d463a add missing switch case
Santeri Piippo
parents: 1237
diff changeset
152 case VboSubclass::InvertedNormals:
1123
15e46ea3151f Reworked iterable enums: they all are enum classes now and the end value is marked with "_End"
Teemu Piippo <teemu@hecknology.net>
parents: 1122
diff changeset
153 case VboSubclass::_End:
1127
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
154 // Surface and normal VBOs contain vertex data, not colors. So we can't return anything meaningful.
1113
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
155 return {};
726
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
156
1123
15e46ea3151f Reworked iterable enums: they all are enum classes now and the end value is marked with "_End"
Teemu Piippo <teemu@hecknology.net>
parents: 1122
diff changeset
157 case VboSubclass::BfcFrontColors:
1127
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
158 // Use the constant green color for BFC front colors
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
159 return {64, 192, 80};
726
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
160
1123
15e46ea3151f Reworked iterable enums: they all are enum classes now and the end value is marked with "_End"
Teemu Piippo <teemu@hecknology.net>
parents: 1122
diff changeset
161 case VboSubclass::BfcBackColors:
1127
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
162 // Use the constant red color for BFC back colors
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
163 return {208, 64, 64};
726
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
164
1123
15e46ea3151f Reworked iterable enums: they all are enum classes now and the end value is marked with "_End"
Teemu Piippo <teemu@hecknology.net>
parents: 1122
diff changeset
165 case VboSubclass::PickColors:
1127
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
166 // For the picking scene, determine the color from the owner's ID.
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
167 return indexColorForID(polygonOwner->id());
726
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
168
1123
15e46ea3151f Reworked iterable enums: they all are enum classes now and the end value is marked with "_End"
Teemu Piippo <teemu@hecknology.net>
parents: 1122
diff changeset
169 case VboSubclass::RandomColors:
1127
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
170 // For the random color scene, the owner object has rolled up a random color. Use that.
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
171 color = polygonOwner->randomColor();
986
525921eae58c Refactor GLRenderer and GLCompiler
Teemu Piippo <crimsondusk64@gmail.com>
parents: 985
diff changeset
172 break;
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
173
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
174 case VboSubclass::RegularColors:
1127
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
175 // For normal colors, use the polygon's color.
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
176 if (polygon.color == MainColor)
986
525921eae58c Refactor GLRenderer and GLCompiler
Teemu Piippo <crimsondusk64@gmail.com>
parents: 985
diff changeset
177 {
1127
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
178 // If it's the main color, use the polygon owner's color.
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
179 if (polygonOwner->color() == MainColor)
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
180 {
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
181 // If that also is the main color, then we whatever the user has configured the main color to look like.
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
182 color = guiUtilities()->mainColorRepresentation();
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
183 }
726
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
184 else
1127
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
185 {
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
186 color = polygonOwner->color().faceColor();
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
187 }
986
525921eae58c Refactor GLRenderer and GLCompiler
Teemu Piippo <crimsondusk64@gmail.com>
parents: 985
diff changeset
188 }
1127
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
189 else if (polygon.color == EdgeColor)
986
525921eae58c Refactor GLRenderer and GLCompiler
Teemu Piippo <crimsondusk64@gmail.com>
parents: 985
diff changeset
190 {
1127
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
191 // Edge color is black, unless we have a dark background, in which case lines need to be bright.
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
192 color = luma(m_config->backgroundColor()) > 40 ? Qt::black : Qt::white;
986
525921eae58c Refactor GLRenderer and GLCompiler
Teemu Piippo <crimsondusk64@gmail.com>
parents: 985
diff changeset
193 }
525921eae58c Refactor GLRenderer and GLCompiler
Teemu Piippo <crimsondusk64@gmail.com>
parents: 985
diff changeset
194 else
525921eae58c Refactor GLRenderer and GLCompiler
Teemu Piippo <crimsondusk64@gmail.com>
parents: 985
diff changeset
195 {
1127
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
196 // Not main or edge color, use the polygon's color as is.
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
197 color = LDColor {polygon.color}.faceColor();
986
525921eae58c Refactor GLRenderer and GLCompiler
Teemu Piippo <crimsondusk64@gmail.com>
parents: 985
diff changeset
198 }
525921eae58c Refactor GLRenderer and GLCompiler
Teemu Piippo <crimsondusk64@gmail.com>
parents: 985
diff changeset
199 break;
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
200 }
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
201
1127
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
202 if (color.isValid())
1113
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
203 {
1127
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
204 // We may wish to apply blending on the color to indicate selection or highlight.
1113
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
205 double blendAlpha = 0.0;
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
206
1246
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
207 if (this->selectionModel and this->selectionModel->isSelected(polygonOwnerIndex))
1113
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
208 blendAlpha = 1.0;
1127
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
209 else if (polygonOwner == m_renderer->objectAtCursor())
1113
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
210 blendAlpha = 0.5;
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
211
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
212 if (blendAlpha != 0.0)
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
213 {
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
214 QColor selectedColor = m_config->selectColorBlend();
1127
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
215 double denominator = blendAlpha + 1.0;
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
216 color.setRed((color.red() + (selectedColor.red() * blendAlpha)) / denominator);
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
217 color.setGreen((color.green() + (selectedColor.green() * blendAlpha)) / denominator);
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
218 color.setBlue((color.blue() + (selectedColor.blue() * blendAlpha)) / denominator);
1113
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
219 }
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
220 }
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
221 else
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
222 {
1127
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
223 // The color was unknown. Use main color to make the polygon at least not appear pitch-black.
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
224 if (polygon.num != 2 and polygon.num != 5)
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
225 color = guiUtilities()->mainColorRepresentation();
890
903ec1e46298 - backed out work done on bfc (re-committing later)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 889
diff changeset
226 else
1127
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
227 color = Qt::black;
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
228
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
229 // Warn about the unknown color, but only once.
1113
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
230 static QSet<int> warnedColors;
1127
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
231 if (not warnedColors.contains(polygon.color))
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
232 {
1159
6ad8cdcd88d9 print() is no longer a global function but is tied to HierarchyElement.
Teemu Piippo <teemu@hecknology.net>
parents: 1146
diff changeset
233 print(tr("Unknown color %1!\n"), polygon.color);
1127
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
234 warnedColors.insert(polygon.color);
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
235 }
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
236 }
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
237
1127
3ab9d11dc76e Commented GLCompiler::getColorForPolygon
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
238 return color;
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
239 }
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
240
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
241 /*
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
242 * Tells the compiler that a merge of VBOs is required.
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
243 */
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
244 void GLCompiler::needMerge()
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
245 {
1065
c8ecddbd99e9 Actually, let's call it countof(). Makes more sense.
Teemu Piippo <teemu@hecknology.net>
parents: 1063
diff changeset
246 for (int i = 0; i < countof (m_vboChanged); ++i)
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
247 m_vboChanged[i] = true;
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
248 }
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
249
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
250 /*
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
251 * Stages the given object for compilation.
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
252 */
1245
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
253 void GLCompiler::stageForCompilation(const QModelIndex& index)
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
254 {
1244
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
255 m_staged.insert(index);
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
256 }
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
257
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
258 /*
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
259 * Removes an object from the set of objects to be compiled.
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
260 */
1245
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
261 void GLCompiler::unstage(const QModelIndex& index)
721
4cf0f6c9082d - now works with selection subfiling
Santeri Piippo <crimsondusk64@gmail.com>
parents: 717
diff changeset
262 {
1244
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
263 m_staged.remove(index);
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
264 }
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
265
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
266 /*
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
267 * Compiles all staged objects.
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
268 */
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
269 void GLCompiler::compileStaged()
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
270 {
1244
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
271 for (const QModelIndex& index : m_staged)
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
272 compileObject(index);
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
273
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
274 m_staged.clear();
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
275 }
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
276
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
277 /*
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
278 * Prepares a VBO for rendering. The VBO is merged if needed.
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
279 */
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
280 void GLCompiler::prepareVBO (int vbonum)
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
281 {
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
282 // Compile anything that still awaits it
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
283 compileStaged();
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
284
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
285 if (m_vboChanged[vbonum])
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
286 {
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
287 // Merge the VBO into a vector of floats.
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
288 QVector<GLfloat> vbodata;
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
289
1244
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
290 for (
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
291 auto iterator = m_objectInfo.begin();
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
292 iterator != m_objectInfo.end();
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
293 ) {
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
294 if (not iterator.key().isValid())
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
295 {
1244
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
296 iterator = m_objectInfo.erase(iterator);
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
297 }
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
298 else
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
299 {
1245
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
300 LDObject* object = m_renderer->model()->lookup(iterator.key());
1244
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
301 if (not object->isHidden())
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
302 vbodata += iterator->data[vbonum];
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
303
1244
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
304 ++iterator;
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
305 }
883
69b8adc9a669 - fixed: due to a shared pointer called via reference called dismiss() in LDDocument::closeInitialFile, this could cause LDDocuments to delete themselves in setImplicit(true) as no shared pointers were left inside closeInitialFile to keep the refcount up.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 861
diff changeset
306 }
886
3c83fe3486b1 - fixed endless loop in prepareVBO due to badly incremented iterator
Teemu Piippo <crimsondusk64@gmail.com>
parents: 883
diff changeset
307
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
308 // Transfer the VBO to the graphics processor.
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
309 glBindBuffer (GL_ARRAY_BUFFER, m_vbo[vbonum]);
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
310 glBufferData (GL_ARRAY_BUFFER, countof(vbodata) * sizeof(GLfloat), vbodata.constData(), GL_STATIC_DRAW);
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
311 glBindBuffer (GL_ARRAY_BUFFER, 0);
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
312 CHECK_GL_ERROR();
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
313 m_vboChanged[vbonum] = false;
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
314 m_vboSizes[vbonum] = countof(vbodata);
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
315 }
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
316 }
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
317
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
318 /*
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
319 * Removes the data related to the given object.
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
320 */
1244
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
321 void GLCompiler::dropObjectInfo(const QModelIndex& index)
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
322 {
1244
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
323 if (m_objectInfo.contains(index))
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
324 {
1244
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
325 // If we have data relating to this object, remove it.
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
326 // The VBOs have changed now and need to be merged.
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
327 m_objectInfo.remove(index);
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
328 needMerge();
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
329 }
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
330 }
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
331
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
332 /*
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
333 * Makes the compiler forget about the given object completely.
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
334 */
1244
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
335 void GLCompiler::forgetObject(QModelIndex index)
1113
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
336 {
1244
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
337 dropObjectInfo(index);
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
338 unstage(index);
1113
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
339 }
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
340
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
341 /*
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
342 * Compiles a single object.
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
343 */
1246
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
344 void GLCompiler::compileObject(const QModelIndex& index)
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
345 {
1245
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
346 LDObject* object = m_renderer->model()->lookup(index);
1244
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
347
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
348 if (object == nullptr)
708
3155f2c05f89 - more debugging...
Santeri Piippo <crimsondusk64@gmail.com>
parents: 706
diff changeset
349 return;
3155f2c05f89 - more debugging...
Santeri Piippo <crimsondusk64@gmail.com>
parents: 706
diff changeset
350
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
351 ObjectVboData info;
1244
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
352 dropObjectInfo(index);
726
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
353
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
354 switch (object->type())
726
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
355 {
1244
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
356 // Note: We cannot split quads into triangles here, it would mess up the
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
357 // wireframe view. Quads must go into separate vbos.
1123
15e46ea3151f Reworked iterable enums: they all are enum classes now and the end value is marked with "_End"
Teemu Piippo <teemu@hecknology.net>
parents: 1122
diff changeset
358 case LDObjectType::Triangle:
1139
51303023d651 LDObject subclass renaming:
Teemu Piippo <teemu@hecknology.net>
parents: 1127
diff changeset
359 case LDObjectType::Quadrilateral:
51303023d651 LDObject subclass renaming:
Teemu Piippo <teemu@hecknology.net>
parents: 1127
diff changeset
360 case LDObjectType::EdgeLine:
51303023d651 LDObject subclass renaming:
Teemu Piippo <teemu@hecknology.net>
parents: 1127
diff changeset
361 case LDObjectType::ConditionalEdge:
726
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
362 {
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
363 LDPolygon* poly = object->getPolygon();
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
364 poly->id = object->id();
1246
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
365 compilePolygon (*poly, index, info);
726
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
366 delete poly;
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
367 break;
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
368 }
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
369
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
370 // TODO: try use interfaces to remove these special treatments?
1123
15e46ea3151f Reworked iterable enums: they all are enum classes now and the end value is marked with "_End"
Teemu Piippo <teemu@hecknology.net>
parents: 1122
diff changeset
371 case LDObjectType::SubfileReference:
726
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
372 {
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
373 LDSubfileReference* subfileReference = static_cast<LDSubfileReference*>(object);
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
374 auto data = subfileReference->inlinePolygons();
726
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
375
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
376 for (LDPolygon& poly : data)
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
377 {
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
378 poly.id = object->id();
1246
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
379 compilePolygon (poly, index, info);
726
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
380 }
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
381 break;
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
382 }
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
383
1123
15e46ea3151f Reworked iterable enums: they all are enum classes now and the end value is marked with "_End"
Teemu Piippo <teemu@hecknology.net>
parents: 1122
diff changeset
384 case LDObjectType::BezierCurve:
1004
ba4200437179 Bézier curves now render in 3D
Teemu Piippo <crimsondusk64@gmail.com>
parents: 998
diff changeset
385 {
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
386 LDBezierCurve* curve = static_cast<LDBezierCurve*>(object);
1023
9450ac3cd930 Split grid stuff into a new class Grid in grid.cpp/grid.h
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1017
diff changeset
387 for (LDPolygon& polygon : curve->rasterizePolygons(grid()->bezierCurveSegments()))
1004
ba4200437179 Bézier curves now render in 3D
Teemu Piippo <crimsondusk64@gmail.com>
parents: 998
diff changeset
388 {
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
389 polygon.id = object->id();
1246
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
390 compilePolygon (polygon, index, info);
1004
ba4200437179 Bézier curves now render in 3D
Teemu Piippo <crimsondusk64@gmail.com>
parents: 998
diff changeset
391 }
ba4200437179 Bézier curves now render in 3D
Teemu Piippo <crimsondusk64@gmail.com>
parents: 998
diff changeset
392 }
ba4200437179 Bézier curves now render in 3D
Teemu Piippo <crimsondusk64@gmail.com>
parents: 998
diff changeset
393 break;
ba4200437179 Bézier curves now render in 3D
Teemu Piippo <crimsondusk64@gmail.com>
parents: 998
diff changeset
394
1011
4fdd74a04790 Rename LDSubfile to LDSubfileReference
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1006
diff changeset
395 default:
4fdd74a04790 Rename LDSubfile to LDSubfileReference
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1006
diff changeset
396 break;
726
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
397 }
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
398
1244
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
399 m_objectInfo[index] = info;
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
400 needMerge();
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
401 }
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
402
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
403 /*
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
404 * Inserts a single polygon into VBOs.
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
405 */
1246
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
406 void GLCompiler::compilePolygon(
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
407 LDPolygon& poly,
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
408 const QModelIndex& polygonOwnerIndex,
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
409 ObjectVboData& objectInfo
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
410 ) {
1123
15e46ea3151f Reworked iterable enums: they all are enum classes now and the end value is marked with "_End"
Teemu Piippo <teemu@hecknology.net>
parents: 1122
diff changeset
411 VboClass surface;
1122
795d1c3554b9 Added the RingAdapter class and interfacing ring() function and simplified some math in GLCompiler with it
Teemu Piippo <teemu@hecknology.net>
parents: 1121
diff changeset
412 int vertexCount;
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
413
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
414 switch (poly.num)
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
415 {
1123
15e46ea3151f Reworked iterable enums: they all are enum classes now and the end value is marked with "_End"
Teemu Piippo <teemu@hecknology.net>
parents: 1122
diff changeset
416 case 2: surface = VboClass::Lines; vertexCount = 2; break;
15e46ea3151f Reworked iterable enums: they all are enum classes now and the end value is marked with "_End"
Teemu Piippo <teemu@hecknology.net>
parents: 1122
diff changeset
417 case 3: surface = VboClass::Triangles; vertexCount = 3; break;
15e46ea3151f Reworked iterable enums: they all are enum classes now and the end value is marked with "_End"
Teemu Piippo <teemu@hecknology.net>
parents: 1122
diff changeset
418 case 4: surface = VboClass::Quads; vertexCount = 4; break;
15e46ea3151f Reworked iterable enums: they all are enum classes now and the end value is marked with "_End"
Teemu Piippo <teemu@hecknology.net>
parents: 1122
diff changeset
419 case 5: surface = VboClass::ConditionalLines; vertexCount = 2; break;
1011
4fdd74a04790 Rename LDSubfile to LDSubfileReference
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1006
diff changeset
420 default: return;
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
421 }
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
422
1119
749fdf61b5cd Implemented lighting. Yay! Unfortunately, faces that show up the wrong way around in BFC red/green mode also show up with inverted lighting here.
Teemu Piippo <teemu@hecknology.net>
parents: 1113
diff changeset
423 // Determine the normals for the polygon.
749fdf61b5cd Implemented lighting. Yay! Unfortunately, faces that show up the wrong way around in BFC red/green mode also show up with inverted lighting here.
Teemu Piippo <teemu@hecknology.net>
parents: 1113
diff changeset
424 Vertex normals[4];
1122
795d1c3554b9 Added the RingAdapter class and interfacing ring() function and simplified some math in GLCompiler with it
Teemu Piippo <teemu@hecknology.net>
parents: 1121
diff changeset
425 auto vertexRing = ring(poly.vertices, vertexCount);
795d1c3554b9 Added the RingAdapter class and interfacing ring() function and simplified some math in GLCompiler with it
Teemu Piippo <teemu@hecknology.net>
parents: 1121
diff changeset
426
795d1c3554b9 Added the RingAdapter class and interfacing ring() function and simplified some math in GLCompiler with it
Teemu Piippo <teemu@hecknology.net>
parents: 1121
diff changeset
427 for (int i = 0; i < vertexCount; ++i)
1119
749fdf61b5cd Implemented lighting. Yay! Unfortunately, faces that show up the wrong way around in BFC red/green mode also show up with inverted lighting here.
Teemu Piippo <teemu@hecknology.net>
parents: 1113
diff changeset
428 {
1122
795d1c3554b9 Added the RingAdapter class and interfacing ring() function and simplified some math in GLCompiler with it
Teemu Piippo <teemu@hecknology.net>
parents: 1121
diff changeset
429 const Vertex& v1 = vertexRing[i - 1];
795d1c3554b9 Added the RingAdapter class and interfacing ring() function and simplified some math in GLCompiler with it
Teemu Piippo <teemu@hecknology.net>
parents: 1121
diff changeset
430 const Vertex& v2 = vertexRing[i];
795d1c3554b9 Added the RingAdapter class and interfacing ring() function and simplified some math in GLCompiler with it
Teemu Piippo <teemu@hecknology.net>
parents: 1121
diff changeset
431 const Vertex& v3 = vertexRing[i + 1];
1119
749fdf61b5cd Implemented lighting. Yay! Unfortunately, faces that show up the wrong way around in BFC red/green mode also show up with inverted lighting here.
Teemu Piippo <teemu@hecknology.net>
parents: 1113
diff changeset
432 normals[i] = Vertex::crossProduct(v3 - v2, v1 - v2).normalized();
749fdf61b5cd Implemented lighting. Yay! Unfortunately, faces that show up the wrong way around in BFC red/green mode also show up with inverted lighting here.
Teemu Piippo <teemu@hecknology.net>
parents: 1113
diff changeset
433 }
749fdf61b5cd Implemented lighting. Yay! Unfortunately, faces that show up the wrong way around in BFC red/green mode also show up with inverted lighting here.
Teemu Piippo <teemu@hecknology.net>
parents: 1113
diff changeset
434
1123
15e46ea3151f Reworked iterable enums: they all are enum classes now and the end value is marked with "_End"
Teemu Piippo <teemu@hecknology.net>
parents: 1122
diff changeset
435 for (VboSubclass complement : iterateEnum<VboSubclass>())
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
436 {
1011
4fdd74a04790 Rename LDSubfile to LDSubfileReference
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1006
diff changeset
437 const int vbonum = vboNumber (surface, complement);
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
438 QVector<GLfloat>& vbodata = objectInfo.data[vbonum];
1246
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
439 const QColor color = getColorForPolygon (poly, polygonOwnerIndex, complement);
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
440
1122
795d1c3554b9 Added the RingAdapter class and interfacing ring() function and simplified some math in GLCompiler with it
Teemu Piippo <teemu@hecknology.net>
parents: 1121
diff changeset
441 for (int vert = 0; vert < vertexCount; ++vert)
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
442 {
1123
15e46ea3151f Reworked iterable enums: they all are enum classes now and the end value is marked with "_End"
Teemu Piippo <teemu@hecknology.net>
parents: 1122
diff changeset
443 if (complement == VboSubclass::Surfaces)
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
444 {
726
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
445 // Write coordinates. Apparently Z must be flipped too?
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
446 vbodata << poly.vertices[vert].x()
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
447 << -poly.vertices[vert].y()
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
448 << -poly.vertices[vert].z();
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
449 }
1123
15e46ea3151f Reworked iterable enums: they all are enum classes now and the end value is marked with "_End"
Teemu Piippo <teemu@hecknology.net>
parents: 1122
diff changeset
450 else if (complement == VboSubclass::Normals)
1119
749fdf61b5cd Implemented lighting. Yay! Unfortunately, faces that show up the wrong way around in BFC red/green mode also show up with inverted lighting here.
Teemu Piippo <teemu@hecknology.net>
parents: 1113
diff changeset
451 {
749fdf61b5cd Implemented lighting. Yay! Unfortunately, faces that show up the wrong way around in BFC red/green mode also show up with inverted lighting here.
Teemu Piippo <teemu@hecknology.net>
parents: 1113
diff changeset
452 vbodata << normals[vert].x()
749fdf61b5cd Implemented lighting. Yay! Unfortunately, faces that show up the wrong way around in BFC red/green mode also show up with inverted lighting here.
Teemu Piippo <teemu@hecknology.net>
parents: 1113
diff changeset
453 << -normals[vert].y()
749fdf61b5cd Implemented lighting. Yay! Unfortunately, faces that show up the wrong way around in BFC red/green mode also show up with inverted lighting here.
Teemu Piippo <teemu@hecknology.net>
parents: 1113
diff changeset
454 << -normals[vert].z();
749fdf61b5cd Implemented lighting. Yay! Unfortunately, faces that show up the wrong way around in BFC red/green mode also show up with inverted lighting here.
Teemu Piippo <teemu@hecknology.net>
parents: 1113
diff changeset
455 }
1237
40bb00d82e2b moved matrix calculations, added inverted normals for BFC back sides
Santeri Piippo
parents: 1173
diff changeset
456 else if (complement == VboSubclass::InvertedNormals)
40bb00d82e2b moved matrix calculations, added inverted normals for BFC back sides
Santeri Piippo
parents: 1173
diff changeset
457 {
40bb00d82e2b moved matrix calculations, added inverted normals for BFC back sides
Santeri Piippo
parents: 1173
diff changeset
458 vbodata << -normals[vert].x();
40bb00d82e2b moved matrix calculations, added inverted normals for BFC back sides
Santeri Piippo
parents: 1173
diff changeset
459 vbodata << +normals[vert].y();
40bb00d82e2b moved matrix calculations, added inverted normals for BFC back sides
Santeri Piippo
parents: 1173
diff changeset
460 vbodata << +normals[vert].z();
40bb00d82e2b moved matrix calculations, added inverted normals for BFC back sides
Santeri Piippo
parents: 1173
diff changeset
461 }
726
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
462 else
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
463 {
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
464 vbodata << ((GLfloat) color.red()) / 255.0f
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
465 << ((GLfloat) color.green()) / 255.0f
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
466 << ((GLfloat) color.blue()) / 255.0f
9a53d9a379de - refactored the gl compiler a tad, made selection blend work with BFC/random colors
Santeri Piippo <crimsondusk64@gmail.com>
parents: 725
diff changeset
467 << ((GLfloat) color.alpha()) / 255.0f;
706
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
468 }
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
469 }
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
470 }
d79083b9f74d Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
471 }
857
e62983881460 - fixed crash-on-exit (simply by not running full destruction processing during program termination)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 855
diff changeset
472
1123
15e46ea3151f Reworked iterable enums: they all are enum classes now and the end value is marked with "_End"
Teemu Piippo <teemu@hecknology.net>
parents: 1122
diff changeset
473 int GLCompiler::vboNumber (VboClass surface, VboSubclass complement)
986
525921eae58c Refactor GLRenderer and GLCompiler
Teemu Piippo <crimsondusk64@gmail.com>
parents: 985
diff changeset
474 {
1123
15e46ea3151f Reworked iterable enums: they all are enum classes now and the end value is marked with "_End"
Teemu Piippo <teemu@hecknology.net>
parents: 1122
diff changeset
475 return (static_cast<int>(surface) * EnumLimits<VboSubclass>::Count) + static_cast<int>(complement);
986
525921eae58c Refactor GLRenderer and GLCompiler
Teemu Piippo <crimsondusk64@gmail.com>
parents: 985
diff changeset
476 }
525921eae58c Refactor GLRenderer and GLCompiler
Teemu Piippo <crimsondusk64@gmail.com>
parents: 985
diff changeset
477
1011
4fdd74a04790 Rename LDSubfile to LDSubfileReference
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1006
diff changeset
478
986
525921eae58c Refactor GLRenderer and GLCompiler
Teemu Piippo <crimsondusk64@gmail.com>
parents: 985
diff changeset
479 GLuint GLCompiler::vbo (int vbonum) const
525921eae58c Refactor GLRenderer and GLCompiler
Teemu Piippo <crimsondusk64@gmail.com>
parents: 985
diff changeset
480 {
525921eae58c Refactor GLRenderer and GLCompiler
Teemu Piippo <crimsondusk64@gmail.com>
parents: 985
diff changeset
481 return m_vbo[vbonum];
525921eae58c Refactor GLRenderer and GLCompiler
Teemu Piippo <crimsondusk64@gmail.com>
parents: 985
diff changeset
482 }
525921eae58c Refactor GLRenderer and GLCompiler
Teemu Piippo <crimsondusk64@gmail.com>
parents: 985
diff changeset
483
1011
4fdd74a04790 Rename LDSubfile to LDSubfileReference
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1006
diff changeset
484
986
525921eae58c Refactor GLRenderer and GLCompiler
Teemu Piippo <crimsondusk64@gmail.com>
parents: 985
diff changeset
485 int GLCompiler::vboSize (int vbonum) const
525921eae58c Refactor GLRenderer and GLCompiler
Teemu Piippo <crimsondusk64@gmail.com>
parents: 985
diff changeset
486 {
525921eae58c Refactor GLRenderer and GLCompiler
Teemu Piippo <crimsondusk64@gmail.com>
parents: 985
diff changeset
487 return m_vboSizes[vbonum];
1113
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
488 }
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
489
1173
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
490 /*
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
491 * Recompiles the entire model.
6cd85b28f43b Cleanup ColorSelector::colorButtonClicked()
Teemu Piippo <teemu@hecknology.net>
parents: 1159
diff changeset
492 */
1113
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
493 void GLCompiler::recompile()
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
494 {
1244
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
495 for (QModelIndex index : m_renderer->model()->indices())
68e126e8c629 begin model rework
Santeri Piippo
parents: 1239
diff changeset
496 compileObject(index);
1113
5f3139c802bf Cleaned up GLCompiler. Among other changes, the compiler no longer has to be told what to compile.
Teemu Piippo <teemu@hecknology.net>
parents: 1098
diff changeset
497 }
1245
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
498
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
499 void GLCompiler::handleRowInsertion(const QModelIndex&, int first, int last)
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
500 {
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
501 for (int row = first; row <= last; row += 1)
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
502 compileObject(m_renderer->model()->index(row));
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
503 }
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
504
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
505 void GLCompiler::handleRowRemoval(const QModelIndex&, int first, int last)
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
506 {
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
507 for (int row = first; row <= last; row += 1)
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
508 forgetObject(m_renderer->model()->index(row));
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
509 }
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
510
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
511 void GLCompiler::handleDataChange(const QModelIndex& topLeft, const QModelIndex& bottomRight)
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
512 {
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
513 for (int row = topLeft.row(); row <= bottomRight.row(); row += 1)
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
514 compileObject(m_renderer->model()->index(row));
338d66111168 more work on mvc
Santeri Piippo
parents: 1244
diff changeset
515 }
1246
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
516
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
517 void GLCompiler::selectionChanged(const QItemSelection& selected, const QItemSelection& deselected)
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
518 {
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
519 for (const QModelIndex& index : selected.indexes())
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
520 m_staged.insert(index);
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
521
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
522 for (const QModelIndex& index : deselected.indexes())
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
523 m_staged.insert(index);
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
524
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
525 m_renderer->update();
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
526 }
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
527
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
528 void GLCompiler::setSelectionModel(QItemSelectionModel* selectionModel)
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
529 {
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
530 if (this->selectionModel)
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
531 disconnect(this->selectionModel, 0, 0, 0);
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
532
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
533 this->selectionModel = selectionModel;
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
534
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
535 if (this->selectionModel)
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
536 {
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
537 connect(
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
538 this->selectionModel,
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
539 SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
540 this,
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
541 SLOT(selectionChanged(const QItemSelection&, const QItemSelection&))
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
542 );
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
543 connect(
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
544 this->selectionModel,
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
545 SIGNAL(destroyed(QObject*)),
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
546 this,
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
547 SLOT(clearSelectionModel())
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
548 );
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
549 }
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
550 }
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
551
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
552 void GLCompiler::clearSelectionModel()
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
553 {
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
554 this->setSelectionModel(nullptr);
0054d13ed614 used mvc selection models
Santeri Piippo
parents: 1245
diff changeset
555 }

mercurial