Merge remote-tracking branch 'origin/cel-67-load-animation-data-from-gltf' into ral

1 files changed, 10 insertions, 4 deletions

diff --git a/assets/shaders/object.frag b/assets/shaders/object.frag
index 11b33e1..fa50fcf 100644
--- a/assets/shaders/object.frag
+++ b/assets/shaders/object.frag
@@ -1,9 +1,15 @@
 #version 450
 #extension GL_ARB_separate_shader_objects : enable
 
-layout(location = 0) in vec3 in_normal;
-layout(location = 1) in vec3 in_position;
+layout(location = 0) in vec3 in_position;
+layout(location = 1) in vec3 in_normal;
+layout(location = 2) in vec2 in_tex_coord;
 
-layout(location = 0) out vec4 out_colour;
+layout(set = 0, binding = 1) uniform sampler2D texSampler;
 
-void main() { out_colour = vec4(in_normal, 1.0); }
\ No newline at end of file
+layout(location = 0) out vec4 out_color;
+
+void main() {
+  // out_color = vec4(1.0);
+  out_color = texture(texSampler, in_tex_coord);
+}
\ No newline at end of file