no clue :) just to push it

[demo] / src / renderer.h

diff --git a/src/renderer.h b/src/renderer.h
index 9605aa3..bfd7622 100644 (file)
--- 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;