add torus and update models to not include vertex color

2 files changed, 8 insertions, 2 deletions

diff --git a/assets/shaders/texture.frag b/assets/shaders/texture.frag
index 44e3dd6..9859bb6 100644
--- a/assets/shaders/texture.frag
+++ b/assets/shaders/texture.frag
@@ -9,8 +9,12 @@ layout(binding = 1) uniform sampler2D texSampler;
 
 void main() {
   vec4 color = texture(texSampler, fragTexCoord.xy);
+/*
   if (color.w == 0) {
     discard;
   }
-  outColor = color;
+*/
+	outColor = color;
+  // outColor = vec4(0.0, 0.8, 0.0, 1.0);
+  // outColor = vec4(fragTexCoord.xyz, 1.0);
 }
diff --git a/assets/shaders/vert.vert b/assets/shaders/vert.vert
index 07044c8..593e88c 100644
--- a/assets/shaders/vert.vert
+++ b/assets/shaders/vert.vert
@@ -27,10 +27,12 @@ void main() {
         ubo.proj *
         ubo.view *
         ubo.model *
+        vec4(inPosition, 1.0);
+/*
         vec4(instPos, 1.0) *
         vec4(instRot, 1.0) *
         vec4(instScale, 1.0) *
-        vec4(inPosition, 1.0);
+*/
     fragColor = vec4(0.0, 0.0, 0.0, 0.0);
     fragTexCoord = vec3(inUV, 0);
 }