Removed OpenGL specifics from RenderQueue

2015-10-06 19:34:31 +02:00
parent 13360856f9
commit 00f537bc03
4 changed files with 34 additions and 43 deletions
@@ -56,13 +56,12 @@ struct ModelJob : RenderJob
 	glm::mat4 ProjectionMatrix;
 	glm::mat4 ViewMatrix;
 	glm::mat4 ModelMatrix;
-	GLuint DiffuseTexture;
-	GLuint NormalTexture;
-	GLuint SpecularTexture;
+	const Texture* DiffuseTexture;
+	const Texture* NormalTexture;
+	const Texture* SpecularTexture;
 	float Shininess;
 	glm::vec4 Color;
-	GLuint VAO;
-	GLuint ElementBuffer;
+	const dd::Model* Model;
 	unsigned int StartIndex;
 	unsigned int EndIndex;

@@ -72,20 +71,6 @@ struct ModelJob : RenderJob
 	}
 };

-struct BlendMapModelJob : ModelJob
-{
-	GLuint BlendMapTextureRed;
-	GLuint BlendMapTextureRedNormal;
-	GLuint BlendMapTextureRedSpecular;
-	GLuint BlendMapTextureGreen;
-	GLuint BlendMapTextureGreenNormal;
-	GLuint BlendMapTextureGreenSpecular;
-	GLuint BlendMapTextureBlue;
-	GLuint BlendMapTextureBlueNormal;
-	GLuint BlendMapTextureBlueSpecular;
-	float TextureRepeat;
-};
-
 struct SpriteJob : RenderJob
 {
 	unsigned int ShaderID;
@@ -94,9 +79,9 @@ struct SpriteJob : RenderJob
 	glm::mat4 ProjectionMatrix;
 	glm::mat4 ViewMatrix;
 	glm::mat4 ModelMatrix;
-	GLuint DiffuseTexture;
-	GLuint NormalTexture;
-	GLuint SpecularTexture;
+	const Texture* DiffuseTexture;
+	const Texture* NormalTexture;
+	const Texture* SpecularTexture;
 	glm::vec4 Color;

 	void CalculateHash() override