Skinned mesh stuff moved to class, added resources

This commit is contained in:
saschawillems 2016-05-14 21:19:52 +02:00
parent 26b02736d5
commit 7087d7d14e
19 changed files with 2637 additions and 14775 deletions

View file

@ -10,7 +10,7 @@ layout (location = 3) in vec3 inColor;
layout (location = 4) in vec4 inBoneWeights;
layout (location = 5) in ivec4 inBoneIDs;
#define MAX_BONES 128
#define MAX_BONES 64
layout (binding = 0) uniform UBO
{
@ -18,12 +18,13 @@ layout (binding = 0) uniform UBO
mat4 model;
mat4 bones[MAX_BONES];
vec4 lightPos;
vec4 viewPos;
} ubo;
layout (location = 0) out vec3 outNormal;
layout (location = 1) out vec3 outColor;
layout (location = 2) out vec2 outUV;
layout (location = 3) out vec3 outEyePos;
layout (location = 3) out vec3 outViewVec;
layout (location = 4) out vec3 outLightVec;
void main()
@ -32,15 +33,15 @@ void main()
boneTransform += ubo.bones[inBoneIDs[1]] * inBoneWeights[1];
boneTransform += ubo.bones[inBoneIDs[2]] * inBoneWeights[2];
boneTransform += ubo.bones[inBoneIDs[3]] * inBoneWeights[3];
outNormal = inNormal;
outColor = inColor;
outUV = inUV;
gl_Position = ubo.projection * ubo.model * boneTransform * vec4(inPos.xyz, 1.0);
outEyePos = (gl_Position).xyz;
vec4 lightPos = ubo.lightPos;
outLightVec = normalize(lightPos.xyz - outEyePos);
vec4 pos = ubo.model * vec4(inPos, 1.0);
outNormal = mat3(inverse(transpose(ubo.model))) * inNormal;
outLightVec = ubo.lightPos.xyz - pos.xyz;
outViewVec = ubo.viewPos.xyz - pos.xyz;
}