X-Git-Url: https://eleni.mutantstargoat.com/git/?p=demo;a=blobdiff_plain;f=src%2Frenderer.h;fp=src%2Frenderer.h;h=2c727214a1ec2bce8cf09a7971eeb423a5cdd447;hp=9605aa3952057bcb8fe39be00ac1b0045b49f4d7;hb=86c912d603be75ac8b2fdb2229f1696e9c0c01d9;hpb=e04bbfa8eb50d10fc87c3cbd6667de5de767eaa7 diff --git a/src/renderer.h b/src/renderer.h index 9605aa3..2c72721 100644 --- a/src/renderer.h +++ b/src/renderer.h @@ -14,36 +14,36 @@ 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; + BaseMatrixUniforms vu; UniformBuffer *vbuf; - BaseFragUniforms fu; + BaseShadingUniforms fu; UniformBuffer *fbuf; - SkyVertUniforms svu; + SkyMatrixUniforms svu; UniformBuffer *svbuf; ShaderProgram *sprog;