Mercurial > ldforge2 / file diff

--- a/src/gl/compiler.h	Wed May 25 20:36:34 2022 +0300
+++ b/src/gl/compiler.h	Mon Jun 06 22:01:22 2022 +0300
@@ -27,6 +27,7 @@
 #include <QOpenGLBuffer>
 #include <QOpenGLShaderProgram>
 #include <QOpenGLExtraFunctions>
+#include "model.h"
 
 class Model;
 class DocumentManager;
@@ -64,9 +65,9 @@
 	void initializeModelShaders(ModelShaders* modelShaders);
 	void bindModelShaderVertexArray(gl::ModelShaders* shaders, gl::ArrayClass arrayClass);
 	void releaseModelShaderVertexArray(gl::ModelShaders* shaders, gl::ArrayClass arrayClass);
-	void setModelShaderSelectedObjects(gl::ModelShaders* shaders, const QSet<ldraw::id_t>& ids);
+	void setModelShaderSelectedObjects(gl::ModelShaders* shaders, const QSet<ModelId>& ids);
 	std::size_t vertexCount(const ModelShaders *shaders, gl::ArrayClass arrayClass);
-	ldraw::id_t idFromColor(const std::array<GLubyte, 3>& data);
+	ModelId idFromColor(const std::array<GLubyte, 3>& data);
 
 	template<typename T>
 	void setShaderUniform(gl::ModelShaders* shaders, const char* uniformName, T&& value)