projects
/
demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some descriptor functions in vkutil - wip
[demo]
/
src
/
renderer.h
diff --git
a/src/renderer.h
b/src/renderer.h
index
9605aa3
..
2c72721
100644
(file)
--- a/
src/renderer.h
+++ b/
src/renderer.h
@@
-14,36
+14,36
@@
enum {
MATRIX_UNIFORMS = 0,
SHADING_UNIFORMS = 1,
SKY_MATRIX_UNIFORMS = 2,
MATRIX_UNIFORMS = 0,
SHADING_UNIFORMS = 1,
SKY_MATRIX_UNIFORMS = 2,
- MORPHING_UNIFORMS = 3,
+ MORPHING_MATRIX_UNIFORMS = 3,
MORPHING_SHADING_UNIFORMS = 4,
};
MORPHING_SHADING_UNIFORMS = 4,
};
-struct BaseVertUniforms {
+struct BaseMatrixUniforms {
Mat4 mview;
Mat4 mmviewproj;
Mat4 mmod;
};
Mat4 mview;
Mat4 mmviewproj;
Mat4 mmod;
};
-struct BaseFragUniforms {
+struct BaseShadingUniforms {
Vec4 diffuse;
Vec4 specular;
float shininess;
float fog_density;
};
Vec4 diffuse;
Vec4 specular;
float shininess;
float fog_density;
};
-struct SkyVertUniforms {
+struct SkyMatrixUniforms {
Mat4 mviewproj;
};
class Renderer {
protected:
Mat4 mviewproj;
};
class Renderer {
protected:
- BaseVertUniforms vu;
+ BaseMatrixUniforms vu;
UniformBuffer *vbuf;
UniformBuffer *vbuf;
- BaseFragUniforms fu;
+ BaseShadingUniforms fu;
UniformBuffer *fbuf;
UniformBuffer *fbuf;
- SkyVertUniforms svu;
+ SkyMatrixUniforms svu;
UniformBuffer *svbuf;
ShaderProgram *sprog;
UniformBuffer *svbuf;
ShaderProgram *sprog;