1 files changed, 14 insertions, 10 deletions
diff --git a/assets/shaders/vert.vert b/assets/shaders/vert.vert
index f3e7cf2..07044c8 100644
--- a/assets/shaders/vert.vert
+++ b/assets/shaders/vert.vert
@@ -7,17 +7,19 @@ layout(binding = 0) uniform UniformBufferObject {
 } ubo;
 
 // vertex
-layout(location = 0) in vec4 inColor;
-layout(location = 1) in vec3 inPosition;
-layout(location = 2) in vec3 inNorm;
-layout(location = 3) in vec2 inTexCoord;
+// layout(location = 0) in vec4 inColor;
+layout(location = 0) in vec3 inPosition;
+layout(location = 1) in vec3 inNorm;
+layout(location = 2) in vec2 inUV;
 
 // instance
-layout(location = 4) in mat4 instPosRotScale;
-layout(location = 8) in float textureIndex;
+layout(location = 3) in vec3 instPos;
+layout(location = 4) in vec3 instRot;
+layout(location = 5) in vec3 instScale;
+// layout(location = 6) in float textureIndex;
 
 // output
-layout(location = 0) out vec3 fragColor;
+layout(location = 0) out vec4 fragColor;
 layout(location = 1) out vec3 fragTexCoord;
 
 void main() {
@@ -25,8 +27,10 @@ void main() {
         ubo.proj *
         ubo.view *
         ubo.model *
-        instPosRotScale *
+        vec4(instPos, 1.0) *
+        vec4(instRot, 1.0) *
+        vec4(instScale, 1.0) *
         vec4(inPosition, 1.0);
-    fragColor = inColor;
-    fragTexCoord = vec3(inTexCoord, textureIndex);
+    fragColor = vec4(0.0, 0.0, 0.0, 0.0);
+    fragTexCoord = vec3(inUV, 0);
 }