diff --git a/res/shader/FlatColor3D.vert b/res/shader/FlatColor3D.vert new file mode 100644 index 00000000..33d624dc --- /dev/null +++ b/res/shader/FlatColor3D.vert @@ -0,0 +1,18 @@ +#version 450 core + +layout(location = 0) in vec3 Vertex; +layout(location = 1) in vec3 Color; + +layout(binding = 0) uniform WorldConfig +{ + mat4 mvp; +} world; + +layout(location = 0) out vec4 FragmentColor; + +void main() +{ + FragmentColor=vec4(Color,1.0); + + gl_Position=vec4(Vertex,1.0)*world.mvp; +} diff --git a/res/shader/OnlyPosition3D.vert b/res/shader/OnlyPosition3D.vert index 1e24f3ed..d0946938 100644 --- a/res/shader/OnlyPosition3D.vert +++ b/res/shader/OnlyPosition3D.vert @@ -1,17 +1,25 @@ -#version 450 core +#version 450 core layout(location = 0) in vec3 Vertex; +layout(location = 1) in vec3 Normal; layout(binding = 0) uniform WorldConfig { mat4 mvp; } world; +layout(push_constant) uniform SkyLightConsts { + vec4 sun_color; + vec4 sun_direction; +} skylight; + layout(location = 0) out vec4 FragmentColor; +layout(location = 1) out vec3 FragmentNormal; void main() { - FragmentColor=vec4(1.0); + FragmentColor=vec4(Color,1.0); + FragmentNormal=Normal; gl_Position=vec4(Vertex,1.0)*world.mvp; }