X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Frenderer.h;h=2c727214a1ec2bce8cf09a7971eeb423a5cdd447;hb=86c912d603be75ac8b2fdb2229f1696e9c0c01d9;hp=a218dabdb3eb340523395ae1b982734abb55ef31;hpb=d1a2cf93cf54898bb4ad442da94fc61f2617cf9f;p=demo

diff --git a/src/renderer.h b/src/renderer.h
index a218dab..2c72721 100644
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -1,27 +1,64 @@
 #ifndef RENDERER_H_
 #define RENDERER_H_
 
+#include <gmath/gmath.h>
+
 class OrbitCamera;
 class Object;
 class Scene;
 class ShaderProgram;
+class Texture;
+class UniformBuffer;
+
+enum {
+	MATRIX_UNIFORMS = 0,
+	SHADING_UNIFORMS = 1,
+	SKY_MATRIX_UNIFORMS = 2,
+	MORPHING_MATRIX_UNIFORMS = 3,
+	MORPHING_SHADING_UNIFORMS = 4,
+};
+
+struct BaseMatrixUniforms {
+	Mat4 mview;
+	Mat4 mmviewproj;
+	Mat4 mmod;
+};
+
+struct BaseShadingUniforms {
+	Vec4 diffuse;
+	Vec4 specular;
+	float shininess;
+	float fog_density;
+};
+
+struct SkyMatrixUniforms {
+	Mat4 mviewproj;
+};
 
 class Renderer {
 protected:
-	int diff_loc;
-	int spec_loc;
-	int shin_loc;
-	int mmviewproj_loc;
-	int mview_loc;
+	BaseMatrixUniforms vu;
+	UniformBuffer *vbuf;
+
+	BaseShadingUniforms fu;
+	UniformBuffer *fbuf;
+
+	SkyMatrixUniforms svu;
+	UniformBuffer *svbuf;
 
 	ShaderProgram *sprog;
 
+	/* debug shader to draw normals */
+	ShaderProgram *nprog;
+
 	Texture *skytex, *dskytex;
 
-	virtual void draw_object(Object *object) const;
-	virtual void draw_skybox() const;
+	virtual void draw_object(Object *object);
+	virtual void draw_skybox();
 
 public:
+	float fog_density;
+
 	Scene *scene;
 	OrbitCamera *camera;
 
@@ -29,10 +66,10 @@ public:
 	virtual ~Renderer();
 
 	virtual bool create();
-	virtual void draw() const;
+	virtual void draw();
 
 	virtual void set_sky_tex(Texture *stex);
 	virtual void set_diffuse_sky_tex(Texture *dstex);
 };
 
-#endif // RENDERER_H_
\ No newline at end of file
+#endif // RENDERER_H_