comparison: src/gl/compiler.h
src/gl/compiler.h
- changeset 46
- 98645c8e7704
- parent 39
- caac957e9834
- child 47
- cd6704009eb9
equal
deleted
inserted
replaced
| 45:272c84c7c87e | 46:98645c8e7704 |
|---|---|
| 37 struct Vertex | 37 struct Vertex |
| 38 { | 38 { |
| 39 glm::vec3 position; | 39 glm::vec3 position; |
| 40 glm::vec4 color; | 40 glm::vec4 color; |
| 41 glm::vec3 normal; | 41 glm::vec3 normal; |
| 42 glm::vec3 id; | |
| 42 }; | 43 }; |
| 43 } | 44 } |
| 44 | 45 |
| 45 class gl::Compiler : public QObject, protected QOpenGLFunctions | 46 class gl::Compiler : public QObject, protected QOpenGLFunctions |
| 46 { | 47 { |
| 85 BoundingBox boundingBox; | 86 BoundingBox boundingBox; |
| 86 const ldraw::ColorTable& colorTable; | 87 const ldraw::ColorTable& colorTable; |
| 87 struct | 88 struct |
| 88 { | 89 { |
| 89 QOpenGLShaderProgram* program = nullptr; | 90 QOpenGLShaderProgram* program = nullptr; |
| 91 QOpenGLShaderProgram* pickSceneProgram = nullptr; | |
| 90 QOpenGLBuffer buffer{QOpenGLBuffer::VertexBuffer}; | 92 QOpenGLBuffer buffer{QOpenGLBuffer::VertexBuffer}; |
| 91 QOpenGLVertexArrayObject vertexArray; | 93 QOpenGLVertexArrayObject vertexArray; |
| 92 } glObjects[gl::NUM_ARRAY_CLASSES]; | 94 } glObjects[gl::NUM_ARRAY_CLASSES]; |
| 93 }; | 95 }; |
| 94 | 96 |
