X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Frenderer.h;h=bfd7622cc22843bacf2f4885f1cbe7868d3e3a12;hb=f6ceb163227d00d7f97df1fc2dfbdd419c56277e;hp=9605aa3952057bcb8fe39be00ac1b0045b49f4d7;hpb=05d269a194496bcef85da78652b947f5bf1c9bcf;p=demo

diff --git a/src/renderer.h b/src/renderer.h
index 9605aa3..bfd7622 100644
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -14,37 +14,37 @@ enum {
 	MATRIX_UNIFORMS = 0,
 	SHADING_UNIFORMS = 1,
 	SKY_MATRIX_UNIFORMS = 2,
-	MORPHING_UNIFORMS = 3,
+	MORPHING_MATRIX_UNIFORMS = 3,
 	MORPHING_SHADING_UNIFORMS = 4,
 };
 
-struct BaseVertUniforms {
+struct BaseMatrixUniforms {
 	Mat4 mview;
 	Mat4 mmviewproj;
 	Mat4 mmod;
 };
 
-struct BaseFragUniforms {
+struct BaseShadingUniforms {
 	Vec4 diffuse;
 	Vec4 specular;
 	float shininess;
 	float fog_density;
 };
 
-struct SkyVertUniforms {
+struct SkyMatrixUniforms {
 	Mat4 mviewproj;
 };
 
 class Renderer {
 protected:
-	BaseVertUniforms vu;
-	UniformBuffer *vbuf;
+	BaseMatrixUniforms default_vs_uniforms;
+	UniformBuffer *default_vs_ub;
 
-	BaseFragUniforms fu;
-	UniformBuffer *fbuf;
+	BaseShadingUniforms default_fs_uniforms;
+	UniformBuffer *default_fs_ub;
 
-	SkyVertUniforms svu;
-	UniformBuffer *svbuf;
+	SkyMatrixUniforms sky_vs_uniforms;
+	UniformBuffer *sky_vs_ub;
 
 	ShaderProgram *sprog;