src/GLCompiler.cc

Sun, 09 Mar 2014 15:00:05 +0200

author
Santeri Piippo <crimsondusk64@gmail.com>
date
Sun, 09 Mar 2014 15:00:05 +0200
changeset 691
ed26a5bbd585
parent 689
397870c6ed38
child 692
94feb28faffe
permissions
-rw-r--r--

Merge ../ldforge into gl

676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
1 #define GL_GLEXT_PROTOTYPES
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
2 #include <GL/glu.h>
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
3 #include <GL/glext.h>
672
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
4 #include "GLCompiler.h"
675
450827da2376 Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents: 674
diff changeset
5 #include "LDObject.h"
450827da2376 Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents: 674
diff changeset
6 #include "Colors.h"
450827da2376 Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents: 674
diff changeset
7 #include "Document.h"
450827da2376 Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents: 674
diff changeset
8 #include "Misc.h"
450827da2376 Merge ../ldforge into gl
Santeri Piippo <crimsondusk64@gmail.com>
parents: 674
diff changeset
9 #include "GLRenderer.h"
679
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
10 #include "Dialogs.h"
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
11
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
12 struct GLErrorInfo
679
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
13 {
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
14 GLenum value;
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
15 QString text;
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
16 };
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
17
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
18 static const GLErrorInfo g_GLErrors[] =
679
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
19 {
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
20 { GL_NO_ERROR, "No error" },
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
21 { GL_INVALID_ENUM, "Unacceptable enumerator passed" },
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
22 { GL_INVALID_VALUE, "Numeric argument out of range" },
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
23 { GL_INVALID_OPERATION, "The operation is not allowed to be done in this state" },
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
24 { GL_INVALID_FRAMEBUFFER_OPERATION, "Framebuffer object is not complete"},
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
25 { GL_OUT_OF_MEMORY, "Out of memory" },
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
26 { GL_STACK_UNDERFLOW, "The operation would have caused an underflow" },
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
27 { GL_STACK_OVERFLOW, "The operation would have caused an overflow" },
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
28 };
672
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
29
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
30 #include <QTime>
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
31
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
32 #define CLOCK_INIT QTime t0;
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
33
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
34 #define CLOCK_START \
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
35 { \
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
36 t0 = QTime::currentTime(); \
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
37 }
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
38
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
39 #define CLOCK_TIME(A) \
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
40 { \
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
41 fprint (stderr, A ": %1ms\n", t0.msecsTo (QTime::currentTime())); \
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
42 }
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
43
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
44 #define DEBUG_PRINT(...) fprint (stdout, __VA_ARGS__)
672
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
45
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
46 extern_cfg (Bool, gl_blackedges);
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
47 static QList<short> gWarnedColors;
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
48 static const QColor gBFCFrontColor (40, 192, 40);
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
49 static const QColor gBFCBackColor (224, 40, 40);
672
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
50
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
51 // =============================================================================
673
8e6f5b3f9d38 - rename GLCompiler::Vertex to GLCompiler::VAO to avoid name conflicts
Santeri Piippo <crimsondusk64@gmail.com>
parents: 672
diff changeset
52 //
679
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
53 void checkGLError_private (const char* file, int line)
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
54 {
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
55 QString errmsg;
679
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
56 GLenum errnum = glGetError();
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
57
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
58 if (errnum == GL_NO_ERROR)
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
59 return;
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
60
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
61 for (const GLErrorInfo& err : g_GLErrors)
679
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
62 {
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
63 if (err.value == errnum)
679
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
64 {
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
65 errmsg = err.text;
679
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
66 break;
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
67 }
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
68 }
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
69
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
70 log ("OpenGL ERROR: at %1:%2: %3", basename (QString (file)), line, errmsg);
679
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
71 }
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
72
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
73 // =============================================================================
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
74 //
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
75 GLCompiler::GLCompiler() :
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
76 m_Document (null)
672
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
77 {
679
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
78 needMerge();
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
79 }
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
80
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
81 // =============================================================================
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
82 //
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
83 void GLCompiler::initialize()
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
84 {
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
85 glGenBuffers (gNumVBOs, &mVBOs[0]);
679
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
86 checkGLError();
672
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
87 }
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
88
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
89 // =============================================================================
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
90 //
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
91 GLCompiler::~GLCompiler()
672
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
92 {
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
93 glDeleteBuffers (gNumVBOs, &mVBOs[0]);
679
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
94 checkGLError();
672
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
95 }
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
96
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
97 // =============================================================================
673
8e6f5b3f9d38 - rename GLCompiler::Vertex to GLCompiler::VAO to avoid name conflicts
Santeri Piippo <crimsondusk64@gmail.com>
parents: 672
diff changeset
98 //
672
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
99 uint32 GLCompiler::getColorRGB (const QColor& color)
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
100 {
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
101 return
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
102 (color.red() & 0xFF) << 0x00 |
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
103 (color.green() & 0xFF) << 0x08 |
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
104 (color.blue() & 0xFF) << 0x10 |
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
105 (color.alpha() & 0xFF) << 0x18;
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
106 }
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
107
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
108 // =============================================================================
673
8e6f5b3f9d38 - rename GLCompiler::Vertex to GLCompiler::VAO to avoid name conflicts
Santeri Piippo <crimsondusk64@gmail.com>
parents: 672
diff changeset
109 //
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
110 QColor GLCompiler::getIndexColor (int id) const
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
111 {
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
112 // Calculate a color based from this index. This method caters for
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
113 // 16777216 objects. I don't think that will be exceeded anytime soon. :)
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
114 int r = (id / 0x10000) % 0x100,
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
115 g = (id / 0x100) % 0x100,
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
116 b = id % 0x100;
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
117
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
118 return QColor (r, g, b);
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
119 }
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
120
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
121 // =============================================================================
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
122 //
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
123 QColor GLCompiler::getPolygonColor (LDPolygon& poly, LDObject* topobj) const
672
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
124 {
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
125 QColor qcol;
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
126
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
127 if (poly.color == maincolor)
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
128 qcol = GLRenderer::getMainColor();
672
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
129 else
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
130 {
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
131 LDColor* col = getColor (poly.color);
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
132
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
133 if (col)
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
134 qcol = col->faceColor;
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
135 }
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
136
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
137 if (poly.color == edgecolor)
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
138 {
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
139 qcol = QColor (32, 32, 32); // luma (m_bgcolor) < 40 ? QColor (64, 64, 64) : Qt::black;
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
140
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
141 /*
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
142 if (!gl_blackedges && poly.obj->getParent() && (col = getColor (poly.obj->getParent()->getColor())))
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
143 qcol = col->edgeColor;
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
144 */
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
145 }
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
146
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
147 if (qcol.isValid() == false)
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
148 {
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
149 // The color was unknown. Use main color to make the poly.object at least
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
150 // not appear pitch-black.
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
151 if (poly.color != edgecolor)
674
3d8ab0f89102 - refactoring
Santeri Piippo <crimsondusk64@gmail.com>
parents: 673
diff changeset
152 qcol = GLRenderer::getMainColor();
672
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
153 else
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
154 qcol = Qt::black;
672
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
155
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
156 // Warn about the unknown color, but only once.
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
157 for (short i : gWarnedColors)
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
158 if (poly.color == i)
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
159 return qcol;
672
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
160
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
161 log ("%1: Unknown color %2!\n", __func__, poly.color);
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
162 gWarnedColors << poly.color;
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
163 return qcol;
672
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
164 }
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
165
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
166 if (topobj->isSelected())
672
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
167 {
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
168 // Brighten it up if selected.
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
169 const int add = 51;
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
170
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
171 qcol.setRed (min (qcol.red() + add, 255));
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
172 qcol.setGreen (min (qcol.green() + add, 255));
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
173 qcol.setBlue (min (qcol.blue() + add, 255));
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
174 }
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
175
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
176 return qcol;
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
177 }
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
178
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
179 // =============================================================================
673
8e6f5b3f9d38 - rename GLCompiler::Vertex to GLCompiler::VAO to avoid name conflicts
Santeri Piippo <crimsondusk64@gmail.com>
parents: 672
diff changeset
180 //
672
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
181 void GLCompiler::needMerge()
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
182 {
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
183 // Set all of mChanged to true
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
184 // memset (mChanged, 0xFF, sizeof mChanged);
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
185 for (int i = 0; i < ((int) (sizeof mChanged / sizeof *mChanged)); ++i)
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
186 mChanged[i] = true;
672
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
187 }
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
188
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
189 // =============================================================================
673
8e6f5b3f9d38 - rename GLCompiler::Vertex to GLCompiler::VAO to avoid name conflicts
Santeri Piippo <crimsondusk64@gmail.com>
parents: 672
diff changeset
190 //
672
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
191 void GLCompiler::stageForCompilation (LDObject* obj)
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
192 {
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
193 mStaged << obj;
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
194 removeDuplicates (mStaged);
672
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
195 }
0925d25ea32c - renamed VertexCompiler to GLCompiler
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
196
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
197 // =============================================================================
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
198 //
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
199 void GLCompiler::compileDocument()
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
200 {
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
201 if (getDocument() == null)
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
202 return;
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
203
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
204 for (LDObject* obj : getDocument()->getObjects())
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
205 compileObject (obj);
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
206 }
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
207
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
208 // =============================================================================
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
209 //
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
210 void GLCompiler::compileStaged()
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
211 {
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
212 for (LDObject* obj : mStaged)
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
213 compileObject (obj);
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
214
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
215 mStaged.clear();
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
216 }
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
217
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
218 // =============================================================================
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
219 //
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
220 void GLCompiler::prepareVBO (int vbonum)
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
221 {
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
222 // Compile anything that still awaits it
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
223 compileStaged();
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
224
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
225 if (mChanged[vbonum] == false)
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
226 return;
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
227
684
8a56b1d4d44d - greatly improved the GL compiler, now deals colors and object removal properly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 681
diff changeset
228 mVBOData[vbonum].clear();
8a56b1d4d44d - greatly improved the GL compiler, now deals colors and object removal properly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 681
diff changeset
229
8a56b1d4d44d - greatly improved the GL compiler, now deals colors and object removal properly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 681
diff changeset
230 for (auto it = mObjectInfo.begin(); it != mObjectInfo.end(); ++it)
8a56b1d4d44d - greatly improved the GL compiler, now deals colors and object removal properly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 681
diff changeset
231 mVBOData[vbonum] += it->data[vbonum];
8a56b1d4d44d - greatly improved the GL compiler, now deals colors and object removal properly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 681
diff changeset
232
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
233 glBindBuffer (GL_ARRAY_BUFFER, mVBOs[vbonum]);
679
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
234 checkGLError();
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
235 glBufferData (GL_ARRAY_BUFFER, mVBOData[vbonum].size() * sizeof(float),
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
236 mVBOData[vbonum].constData(), GL_DYNAMIC_DRAW);
679
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
237 checkGLError();
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
238 glBindBuffer (GL_ARRAY_BUFFER, 0);
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
239 checkGLError();
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
240 mChanged[vbonum] = false;
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
241 }
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
242
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
243 // =============================================================================
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
244 //
684
8a56b1d4d44d - greatly improved the GL compiler, now deals colors and object removal properly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 681
diff changeset
245 void GLCompiler::dropObject (LDObject* obj)
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
246 {
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
247 auto it = mObjectInfo.find (obj);
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
248
684
8a56b1d4d44d - greatly improved the GL compiler, now deals colors and object removal properly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 681
diff changeset
249 if (it != mObjectInfo.end())
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
250 {
684
8a56b1d4d44d - greatly improved the GL compiler, now deals colors and object removal properly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 681
diff changeset
251 mObjectInfo.erase (it);
8a56b1d4d44d - greatly improved the GL compiler, now deals colors and object removal properly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 681
diff changeset
252 needMerge();
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
253 }
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
254 }
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
255
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
256 // =============================================================================
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
257 //
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
258 void GLCompiler::compileObject (LDObject* obj)
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
259 {
689
397870c6ed38 - minor stuff
Santeri Piippo <crimsondusk64@gmail.com>
parents: 688
diff changeset
260 log ("compile #%1\n", obj->getID());
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
261 ObjectVBOInfo info;
684
8a56b1d4d44d - greatly improved the GL compiler, now deals colors and object removal properly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 681
diff changeset
262 dropObject (obj);
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
263 compileSubObject (obj, obj, &info);
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
264 mObjectInfo[obj] = info;
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
265 needMerge();
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
266 }
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
267
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
268 // =============================================================================
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
269 //
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
270 void GLCompiler::compilePolygon (LDPolygon& poly, LDObject* topobj, ObjectVBOInfo* objinfo)
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
271 {
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
272 EVBOSurface surface;
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
273 int numverts;
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
274
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
275 switch (poly.num)
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
276 {
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
277 case 3: surface = vboTriangles; numverts = 3; break;
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
278 case 4: surface = vboQuads; numverts = 4; break;
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
279 case 2: surface = vboLines; numverts = 2; break;
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
280 case 5: surface = vboCondLines; numverts = 2; break;
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
281
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
282 default:
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
283 log ("OMGWTFBBQ weird polygon with number %1 (topobj: #%2, %3), origin: %4",
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
284 (int) poly.num, topobj->getID(), topobj->getTypeName(), poly.origin);
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
285 assert (false);
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
286 }
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
287
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
288 for (int complement = 0; complement < vboNumComplements; ++complement)
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
289 {
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
290 const int vbonum = getVBONumber (surface, (EVBOComplement) complement);
684
8a56b1d4d44d - greatly improved the GL compiler, now deals colors and object removal properly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 681
diff changeset
291 QVector<GLfloat>& vbodata = objinfo->data[vbonum];
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
292 const QColor normalColor = getPolygonColor (poly, topobj);
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
293 const QColor pickColor = getIndexColor (topobj->getID());
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
294
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
295 for (int vert = 0; vert < numverts; ++vert)
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
296 {
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
297 switch ((EVBOComplement) complement)
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
298 {
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
299 case vboSurfaces:
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
300 {
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
301 // Write coordinates. Apparently Z must be flipped too?
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
302 vbodata << poly.vertices[vert].x()
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
303 << -poly.vertices[vert].y()
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
304 << -poly.vertices[vert].z();
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
305 break;
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
306 }
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
307
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
308 case vboNormalColors:
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
309 {
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
310 writeColor (vbodata, normalColor);
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
311 break;
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
312 }
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
313
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
314 case vboPickColors:
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
315 {
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
316 writeColor (vbodata, pickColor);
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
317 break;
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
318 }
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
319
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
320 case vboBFCFrontColors:
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
321 {
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
322 writeColor (vbodata, gBFCFrontColor);
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
323 break;
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
324 }
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
325
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
326 case vboBFCBackColors:
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
327 {
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
328 writeColor (vbodata, gBFCBackColor);
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
329 break;
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
330 }
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
331
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
332 case vboNumComplements:
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
333 break;
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
334 }
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
335 }
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
336 }
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
337 }
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
338
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
339 // =============================================================================
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
340 //
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
341 void GLCompiler::compileSubObject (LDObject* obj, LDObject* topobj, ObjectVBOInfo* objinfo)
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
342 {
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
343 switch (obj->getType())
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
344 {
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
345 // Note: We cannot split quads into triangles here, it would mess up the
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
346 // wireframe view. Quads must go into separate vbos.
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
347 case LDObject::ETriangle:
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
348 case LDObject::EQuad:
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
349 case LDObject::ELine:
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
350 case LDObject::ECondLine:
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
351 {
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
352 LDPolygon* poly = obj->getPolygon();
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
353 poly->id = topobj->getID();
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
354 compilePolygon (*poly, topobj, objinfo);
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
355 delete poly;
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
356 break;
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
357 }
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
358
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
359 case LDObject::ESubfile:
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
360 {
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
361 LDSubfile* ref = static_cast<LDSubfile*> (obj);
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
362 auto data = ref->inlinePolygons();
689
397870c6ed38 - minor stuff
Santeri Piippo <crimsondusk64@gmail.com>
parents: 688
diff changeset
363 log ("inlinePolygons yielded %1 polys\n", data.size());
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
364
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
365 for (LDPolygon& poly : data)
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
366 {
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
367 poly.id = topobj->getID();
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
368 compilePolygon (poly, topobj, objinfo);
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
369 }
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
370 break;
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
371 }
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
372
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
373 default:
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
374 break;
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
375 }
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
376 }
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
377
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
378 // =============================================================================
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
379 //
679
dd7545e00a8f - now actually renders stuff correctly
Santeri Piippo <crimsondusk64@gmail.com>
parents: 678
diff changeset
380 void GLCompiler::writeColor (QVector<GLfloat>& array, const QColor& color)
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
381 {
681
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
382 array << ((float) color.red()) / 255.0f
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
383 << ((float) color.green()) / 255.0f
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
384 << ((float) color.blue()) / 255.0f
c1cc036c6e1f - work on improved rendering performance
Santeri Piippo <crimsondusk64@gmail.com>
parents: 679
diff changeset
385 << ((float) color.alpha()) / 255.0f;
676
f7f965742fd5 - converted to VBO
Santeri Piippo <crimsondusk64@gmail.com>
parents: 675
diff changeset
386 }

mercurial