OpenGL renderer back in working condition

2015-10-20 14:31:12 +02:00
parent aacc194358
commit 80f34b27b9
7 changed files with 17 additions and 30 deletions
@@ -37,8 +37,6 @@ public:
 	GLuint VAO;
 	GLuint ElementBuffer;

-	glm::mat4 m_Matrix;
-
 private:
 	GLuint VertexBuffer;
 	GLuint DiffuseVertexColorBuffer;
@@ -30,6 +30,8 @@
 #include "Core/EventBroker.h"
 #include "Core/World.h"
 #include "Game/EScreenShake.h"
+#include "Rendering/Model.h"
+#include "Rendering/Texture.h"

 namespace dd
 {
@@ -36,9 +36,6 @@ public:

 	void Bind(GLenum textureUnit = GL_TEXTURE0);

-	operator GLuint() const { return m_Texture; }
-
-private:
 	GLuint m_Texture = 0;
 };