From b9a7166d9a7e2b0eed948353c134e72dfa86ab58 Mon Sep 17 00:00:00 2001
From: Omniscient <omniscient.oce@gmail.com>
Date: Sun, 9 Jun 2024 16:51:46 +1000
Subject: fix texture on cube with opengl

---
 assets/shaders/cube.frag | 5 +++--
 assets/shaders/cube.vert | 7 +------
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'assets')

diff --git a/assets/shaders/cube.frag b/assets/shaders/cube.frag
index 9d8ab28..02cb9b3 100644
--- a/assets/shaders/cube.frag
+++ b/assets/shaders/cube.frag
@@ -4,10 +4,11 @@ layout(location = 0) in vec3 fragColor;
 layout(location = 1) in vec2 fragTexCoord;
 
 layout(binding = 1) uniform sampler2D texSampler;
+// uniform sampler2D texSampler;
 
 layout(location = 0) out vec4 outColor;
 
 void main() {
-  // outColor = texture(texSampler, fragTexCoord);  // vec4(fragTexCoord, 0.0);
-  outColor = vec4(fragColor, 1.0);
+  outColor = texture(texSampler, fragTexCoord);  // vec4(fragTexCoord, 0.0);
+  // outColor = vec4(fragColor, 1.0);
 }
diff --git a/assets/shaders/cube.vert b/assets/shaders/cube.vert
index e7d6a79..2f81e9c 100644
--- a/assets/shaders/cube.vert
+++ b/assets/shaders/cube.vert
@@ -5,9 +5,6 @@ layout( binding = 0) uniform Matrices {
   mat4 view;
   mat4 proj;
 } ubo;
-uniform mat4 model;
-uniform mat4 view;
-uniform mat4 projection;
 
 layout(location = 0) in vec3 inPosition;
 layout(location = 1) in vec3 inNormal;
@@ -17,9 +14,7 @@ layout(location = 0) out vec3 fragColor;
 layout(location = 1) out vec2 fragTexCoord;
 
 void main() {
-  // gl_Position = ubo.proj * ubo.view * ubo.model * vec4(inPosition, 1.0);
-  gl_Position = projection * view * model * vec4(inPosition, 1.0);
-  // gl_Position = vec4(inPosition, 1.0);
+  gl_Position = ubo.proj * ubo.view * ubo.model * vec4(inPosition, 1.0);
   fragColor = abs(inNormal);
   fragTexCoord = inTexCoords;
 }
-- 
cgit v1.2.3-70-g09d2