Calculate matrices from node-hierarchy and pass via push constant

This commit is contained in:
Sascha Willems 2020-04-13 16:26:40 +02:00
parent 6c43ab37ff
commit 579c7d086f
5 changed files with 31 additions and 18 deletions

View file

@ -5,12 +5,16 @@ layout (location = 1) in vec3 inNormal;
layout (location = 2) in vec2 inUV;
layout (location = 3) in vec3 inColor;
layout (set = 0, binding = 0) uniform UBO
layout (set = 0, binding = 0) uniform UBOScene
{
mat4 projection;
mat4 model;
mat4 view;
vec4 lightPos;
} ubo;
} uboScene;
layout(push_constant) uniform PushConsts {
mat4 model;
} primitive;
layout (location = 0) out vec3 outNormal;
layout (location = 1) out vec3 outColor;
@ -18,21 +22,16 @@ layout (location = 2) out vec2 outUV;
layout (location = 3) out vec3 outViewVec;
layout (location = 4) out vec3 outLightVec;
out gl_PerVertex
{
vec4 gl_Position;
};
void main()
{
outNormal = inNormal;
outColor = inColor;
outUV = inUV;
gl_Position = ubo.projection * ubo.model * vec4(inPos.xyz, 1.0);
gl_Position = uboScene.projection * uboScene.view * primitive.model * vec4(inPos.xyz, 1.0);
vec4 pos = ubo.model * vec4(inPos, 1.0);
outNormal = mat3(ubo.model) * inNormal;
vec3 lPos = mat3(ubo.model) * ubo.lightPos.xyz;
vec4 pos = uboScene.view * vec4(inPos, 1.0);
outNormal = mat3(uboScene.view) * inNormal;
vec3 lPos = mat3(uboScene.view) * uboScene.lightPos.xyz;
outLightVec = lPos - pos.xyz;
outViewVec = -pos.xyz;
}