Mercurial > ldforge2 / changeset

--- a/src/gl/basicshaderprogram.h	Tue Apr 11 22:51:12 2023 +0300
+++ b/src/gl/basicshaderprogram.h	Tue Apr 11 22:51:47 2023 +0300
@@ -36,8 +36,6 @@
 		GLenum drawMode);
 }
 
-using BasicShader = gl::basic_shader;
-
 //! @brief A collection of a single VAO with a single VBO,
 //! a vertex shader and a fragment shader.
 struct gl::basic_shader

--- a/src/layers/axeslayer.h	Tue Apr 11 22:51:12 2023 +0300
+++ b/src/layers/axeslayer.h	Tue Apr 11 22:51:47 2023 +0300
@@ -4,7 +4,7 @@
 
 class AxesLayer final : public RenderLayer
 {
-	BasicShader shader;
+	gl::basic_shader shader;
 public:
 	void initializeGL() override;
 	void overpaint(QPainter* painter) override;

--- a/src/layers/gridlayer.h	Tue Apr 11 22:51:12 2023 +0300
+++ b/src/layers/gridlayer.h	Tue Apr 11 22:51:47 2023 +0300
@@ -22,7 +22,7 @@
 
 class GridLayer final : public RenderLayer
 {
-	BasicShader shader;
+	gl::basic_shader shader;
 	glm::vec4 gridColor = {1.0f, 1.0f, 1.0f, 0.75f};
 	glm::mat4 gridMatrix{1};
 	bool isInitialized = false;