Wed, 22 Jan 2020 01:17:11 +0200
commit work done on plugging vao to the gl renderer, renders nonsense for now
| 19 | 1 | /* |
| 2 | * LDForge: LDraw parts authoring CAD | |
| 3 | * Copyright (C) 2013 - 2018 Teemu Piippo | |
| 4 | * | |
| 5 | * This program is free software: you can redistribute it and/or modify | |
| 6 | * it under the terms of the GNU General Public License as published by | |
| 7 | * the Free Software Foundation, either version 3 of the License, or | |
| 8 | * (at your option) any later version. | |
| 9 | * | |
| 10 | * This program is distributed in the hope that it will be useful, | |
| 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 13 | * GNU General Public License for more details. | |
| 14 | * | |
| 15 | * You should have received a copy of the GNU General Public License | |
| 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 17 | */ | |
| 18 | ||
| 19 | #define GL_GLEXT_PROTOTYPES | |
| 20 | #include <GL/glu.h> | |
| 21 | #include <GL/glext.h> | |
| 26 | 22 | #include <QMessageBox> |
| 19 | 23 | #include "gl/compiler.h" |
| 24 | #include "documentmanager.h" | |
| 25 | #include "invert.h" | |
| 26 | #include "ring.h" | |
| 27 | ||
|
27
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
28 | static const char* vertexShaderSource = R"( |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
29 | #version 330 core |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
30 | |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
31 | layout(location=0) in vec3 position; |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
32 | layout(location=1) in vec4 color; |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
33 | out vec4 vColor; |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
34 | uniform mat4 CameraTransformation; |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
35 | |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
36 | void main() |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
37 | { |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
38 | vColor = color; |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
39 | gl_Position = projection * modelview * CameraTransformation * vec4(position, 1.0); |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
40 | } |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
41 | )"; |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
42 | |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
43 | static const char* fragmentShaderSource = R"( |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
44 | #version 330 core |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
45 | |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
46 | in vec4 vColor; |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
47 | out vec4 fColor; |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
48 | |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
49 | void main() |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
50 | { |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
51 | fColor = vColor; |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
52 | } |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
53 | )"; |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
54 | |
| 26 | 55 | gl::Compiler::Compiler(const ColorTable& colorTable, QObject* parent) : |
| 56 | QObject{parent}, | |
| 57 | colorTable{colorTable} | |
| 21 | 58 | { |
| 59 | } | |
| 60 | ||
| 19 | 61 | gl::Compiler::~Compiler() |
| 62 | { | |
| 26 | 63 | } |
| 19 | 64 | |
| 26 | 65 | void gl::Compiler::initialize() |
| 66 | { | |
| 67 | if (not this->initialized) | |
| 68 | { | |
| 69 | this->initializeOpenGLFunctions(); | |
|
27
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
70 | for (int i = 0; i < gl::NUM_ARRAY_CLASSES; i += 1) |
| 26 | 71 | { |
|
27
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
72 | auto& object = this->glObjects[i]; |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
73 | object.program = new QOpenGLShaderProgram; |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
74 | object.program->create(); |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
75 | object.program->addShaderFromSourceCode(QOpenGLShader::Vertex, ::vertexShaderSource); |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
76 | object.program->addShaderFromSourceCode(QOpenGLShader::Fragment, ::fragmentShaderSource); |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
77 | object.program->link(); |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
78 | object.program->bind(); |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
79 | object.buffer.create(); |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
80 | object.buffer.bind(); |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
81 | object.buffer.setUsagePattern(QOpenGLBuffer::DynamicDraw); |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
82 | object.vertexArray.create(); |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
83 | object.vertexArray.bind(); |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
84 | object.program->enableAttributeArray(0); |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
85 | object.program->enableAttributeArray(1); |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
86 | object.program->setAttributeBuffer(0, GL_FLOAT, 0, 3); |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
87 | object.program->setAttributeBuffer(1, GL_FLOAT, 3, 4); |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
88 | object.vertexArray.release(); |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
89 | object.buffer.release(); |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
90 | object.program->release(); |
| 26 | 91 | } |
| 92 | this->initialized = true; | |
| 93 | } | |
| 19 | 94 | } |
| 21 | 95 | |
| 96 | void gl::Compiler::build(Model* model, DocumentManager* context) | |
| 97 | { | |
|
22
6da867fa5429
commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents:
21
diff
changeset
|
98 | this->boundingBox = {}; |
|
27
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
99 | std::vector<GLfloat> vboData[gl::NUM_ARRAY_CLASSES]; |
| 21 | 100 | const std::vector<gl::Polygon> polygons = model->getPolygons(context); |
| 101 | for (const gl::Polygon& polygon : polygons) | |
| 102 | { | |
| 103 | this->buildPolygon(polygon, vboData); | |
| 104 | } | |
| 26 | 105 | for (int arrayId = 0; arrayId < gl::NUM_ARRAY_CLASSES; arrayId += 1) |
| 21 | 106 | { |
|
27
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
107 | auto& buffer = this->glObjects[arrayId].buffer; |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
108 | auto& vector = vboData[arrayId]; |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
109 | this->storedVboSizes[arrayId] = vector.size(); |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
110 | buffer.bind(); |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
111 | buffer.allocate(vector.data(), static_cast<int>(vector.size() * sizeof vector[0])); |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
112 | buffer.release(); |
| 21 | 113 | } |
| 114 | } | |
| 115 | ||
| 26 | 116 | gl::ArrayClass classifyPolygon(const gl::Polygon& polygon) |
| 21 | 117 | { |
| 118 | switch (polygon.type) | |
| 119 | { | |
| 120 | case gl::Polygon::EdgeLine: | |
| 26 | 121 | return gl::ArrayClass::Lines; |
| 21 | 122 | case gl::Polygon::Triangle: |
| 26 | 123 | return gl::ArrayClass::Triangles; |
| 21 | 124 | case gl::Polygon::Quadrilateral: |
| 26 | 125 | return gl::ArrayClass::Quads; |
| 21 | 126 | case gl::Polygon::ConditionalEdge: |
| 26 | 127 | return gl::ArrayClass::ConditionalLines; |
| 21 | 128 | } |
| 26 | 129 | return gl::ArrayClass::Lines; |
| 21 | 130 | } |
| 131 | ||
| 26 | 132 | [[maybe_unused]] |
| 133 | static QColor colorFromId(linetypes::Id id) | |
| 21 | 134 | { |
| 135 | // Calculate a color based from this index. This method caters for | |
| 136 | // 16777216 objects. I don't think that will be exceeded anytime soon. | |
| 137 | const int r = (id.value / 0x10000) % 0x100; | |
| 138 | const int g = (id.value / 0x100) % 0x100; | |
| 139 | const int b = id.value % 0x100; | |
| 140 | return {r, g, b}; | |
| 141 | } | |
| 142 | ||
| 143 | void gl::Compiler::buildPolygon(gl::Polygon polygon, std::vector<GLfloat>* vboData) | |
| 144 | { | |
| 26 | 145 | const gl::ArrayClass vboClass = classifyPolygon(polygon); |
|
27
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
146 | //std::vector<GLfloat>& vertexBuffer = vboData[gl::vboIndex({vboClass, gl::VboSubclass::VertexData})]; |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
147 | std::vector<GLfloat>& vertexBuffer = vboData[static_cast<int>(vboClass)]; |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
148 | /* |
| 26 | 149 | std::vector<GLfloat>& normalsBuffer = vboData[gl::vboIndex({vboClass, gl::VboSubclass::Normals})]; |
| 21 | 150 | auto vertexRing = iter::ring(polygon.vertices, polygon.numPolygonVertices()); |
| 26 | 151 | reserveMore(normalsBuffer, polygon.numPolygonVertices() * 3_z); |
|
22
6da867fa5429
commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents:
21
diff
changeset
|
152 | for (unsigned int i = 0; i < polygon.numPolygonVertices(); i += 1) |
| 21 | 153 | { |
| 154 | const Point3D& v1 = vertexRing[i - 1]; | |
| 155 | const Point3D& v2 = vertexRing[i]; | |
| 156 | const Point3D& v3 = vertexRing[i + 1]; | |
| 157 | const QVector3D normal = QVector3D::crossProduct(v3 - v2, v1 - v2).normalized(); | |
| 158 | for (const GLfloat coord : {normal.x(), normal.y(), normal.z()}) | |
| 26 | 159 | normalsBuffer.push_back(coord); |
| 21 | 160 | } |
|
27
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
161 | */ |
| 26 | 162 | reserveMore(vertexBuffer, polygon.numPolygonVertices() * 7); |
| 163 | const QColor color = this->getColorForPolygon(polygon); | |
| 21 | 164 | // Transform vertices so that they're suitable for GL rendering |
|
22
6da867fa5429
commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents:
21
diff
changeset
|
165 | for (unsigned int i = 0; i < polygon.numPolygonVertices(); i += 1) |
| 21 | 166 | { |
| 26 | 167 | Point3D& point = polygon.vertices[i]; |
| 21 | 168 | polygon.vertices[i].y = -polygon.vertices[i].y; |
| 169 | polygon.vertices[i].z = -polygon.vertices[i].z; | |
|
22
6da867fa5429
commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents:
21
diff
changeset
|
170 | this->boundingBox.consider(polygon.vertices[i]); |
| 26 | 171 | vertexBuffer.push_back(static_cast<GLfloat>(point.x)); |
| 172 | vertexBuffer.push_back(static_cast<GLfloat>(point.y)); | |
| 173 | vertexBuffer.push_back(static_cast<GLfloat>(point.z)); | |
| 174 | vertexBuffer.push_back(static_cast<GLfloat>(color.redF())); | |
| 175 | vertexBuffer.push_back(static_cast<GLfloat>(color.greenF())); | |
| 176 | vertexBuffer.push_back(static_cast<GLfloat>(color.blueF())); | |
| 177 | vertexBuffer.push_back(static_cast<GLfloat>(color.alphaF())); | |
| 21 | 178 | } |
| 179 | } | |
| 180 | ||
| 26 | 181 | QColor gl::Compiler::getColorForPolygon(const gl::Polygon& polygon) |
| 21 | 182 | { |
| 183 | QColor color; | |
| 26 | 184 | // For normal colors, use the polygon's color. |
| 185 | if (polygon.color == colors::main) | |
| 21 | 186 | { |
| 26 | 187 | color = {255, 255, 64}; // mainColorRepresentation(); |
| 21 | 188 | } |
| 26 | 189 | else if (polygon.color == colors::edge) |
| 21 | 190 | { |
| 26 | 191 | // Edge color is black, unless we have a dark background, in which case lines need to be bright. |
| 192 | color = Qt::black; //luma(config::backgroundColor()) > 40 ? Qt::black : Qt::white; | |
| 21 | 193 | } |
| 194 | else | |
| 195 | { | |
| 26 | 196 | // Not main or edge color, use the polygon's color as is. |
| 197 | color = this->colorTable[polygon.color].faceColor; | |
| 21 | 198 | } |
| 199 | return color; | |
| 200 | } | |
| 201 | ||
|
22
6da867fa5429
commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents:
21
diff
changeset
|
202 | Point3D gl::Compiler::modelCenter() const |
|
6da867fa5429
commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents:
21
diff
changeset
|
203 | { |
|
6da867fa5429
commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents:
21
diff
changeset
|
204 | return boxCenter(this->boundingBox); |
|
6da867fa5429
commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents:
21
diff
changeset
|
205 | } |
|
6da867fa5429
commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents:
21
diff
changeset
|
206 | |
|
6da867fa5429
commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents:
21
diff
changeset
|
207 | double gl::Compiler::modelDistance() const |
|
6da867fa5429
commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents:
21
diff
changeset
|
208 | { |
|
6da867fa5429
commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents:
21
diff
changeset
|
209 | return longestMeasure(this->boundingBox); |
|
6da867fa5429
commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents:
21
diff
changeset
|
210 | } |
|
6da867fa5429
commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents:
21
diff
changeset
|
211 | |
| 26 | 212 | void gl::Compiler::bindVertexArray(gl::ArrayClass arrayClass) |
| 213 | { | |
|
27
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
214 | auto& object = this->glObjects[static_cast<int>(arrayClass)]; |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
215 | object.vertexArray.bind(); |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
216 | object.program->bind(); |
| 26 | 217 | } |
| 218 | ||
| 219 | void gl::Compiler::releaseVertexArray(gl::ArrayClass arrayClass) | |
| 220 | { | |
|
27
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
221 | auto& object = this->glObjects[static_cast<int>(arrayClass)]; |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
222 | object.program->release(); |
|
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
223 | object.vertexArray.release(); |
| 26 | 224 | } |
| 225 | ||
|
27
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
226 | std::size_t gl::Compiler::vboSize(const gl::ArrayClass arrayClass) const |
| 21 | 227 | { |
|
27
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
228 | return this->storedVboSizes[static_cast<int>(arrayClass)]; |
| 21 | 229 | } |
| 230 | ||
| 231 | int gl::vboIndex(const VboAddress vboAddress) | |
| 232 | { | |
| 233 | return static_cast<std::uint8_t>(vboAddress.vboClass) * gl::numVboSubclasses | |
| 234 | + static_cast<std::uint8_t>(vboAddress.vboSubclass); | |
| 235 | } |