feat: WIP IQM support (glb is annoying)

Team-Fennec · Mar 30, 2024 · 6a1b15e · 6a1b15e
1 parent f3e29c0
commit 6a1b15e
Show file tree

Hide file tree

Showing 11 changed files with 2,790 additions and 6 deletions.
diff --git a/Game/engine/shaders/UnlitTextured.glsl b/Game/engine/shaders/UnlitTextured.glsl
@@ -10,10 +10,18 @@ VERTEX:
 
 void main()
 {
+    // joint/weight reference:
+    // https://github.khronos.org/glTF-Tutorials/gltfTutorial/gltfTutorial_020_Skins.html
+    /*mat4 skinMat =
+        v_Weight.x * Joints[int(v_Joint.x)] +
+        v_Weight.y * Joints[int(v_Joint.y)] +
+        v_Weight.z * Joints[int(v_Joint.z)] +
+        v_Weight.w * Joints[int(v_Joint.w)];
+
+    vec4 worldPosition = World * skinMat * vec4(v_Pos, 1);*/
     vec4 worldPosition = World * vec4(v_Pos, 1);
     vec4 viewPosition = View * worldPosition;
-    vec4 clipPosition = Projection * viewPosition;
-    gl_Position = clipPosition;
+    gl_Position = Projection * viewPosition;
     fsin_texCoords = v_Uv;
     fsin_Color = v_Col;
 }

diff --git a/Game/engine/shaders/include/Buffers.glsl b/Game/engine/shaders/include/Buffers.glsl
@@ -12,3 +12,8 @@ layout(set = 0, binding = 2) uniform WorldBuffer
 {
     mat4 World;
 };
+
+layout(set = 0, binding = 3) uniform JointBuffer
+{
+    mat4 Joints;
+};
diff --git a/Game/engine/shaders/include/webase.glsl b/Game/engine/shaders/include/webase.glsl
@@ -29,7 +29,7 @@
 	layout(location = 1) in vec2 fsin_texCoords;
 	layout(location = 0) out vec4 fsout_color;
 
-	layout(set = 0, binding = 3) uniform sampler SurfaceSampler;
+	layout(set = 0, binding = 4) uniform sampler SurfaceSampler;
 #endif
 
 // param types, wrapped just for linguistic convenience

diff --git a/Game/testgame/models/gort.glb b/Game/testgame/models/gort.glb