try getting glfw passthrough and egui to work

2 files changed, 12 insertions, 3 deletions

diff --git a/assets/shaders/terrain.frag b/assets/shaders/terrain.frag
index 739ff83..0cc76c8 100644
--- a/assets/shaders/terrain.frag
+++ b/assets/shaders/terrain.frag
@@ -3,7 +3,11 @@
 out vec4 FragColor;
 
 in vec4 Color;
+in vec2 TexCoord;
+
+uniform sampler2D TextureSlot1;
 
 void main() {
-    FragColor = Color;
+    vec4 tex_color = texture(TextureSlot1, TexCoord);
+    FragColor = Color * tex_color;
 }
\ No newline at end of file
diff --git a/assets/shaders/terrain.vert b/assets/shaders/terrain.vert
index d21cbe6..40f2b3e 100644
--- a/assets/shaders/terrain.vert
+++ b/assets/shaders/terrain.vert
@@ -1,6 +1,8 @@
 #version 410 core
 
 layout(location = 0) in vec3 inPosition;
+layout(location = 1) in vec3 inNormal;
+layout(location = 2) in vec2 inTexCoords;
 
 uniform Camera {
   mat4 view;
@@ -9,9 +11,12 @@ uniform Camera {
 } cam;
 
 out vec4 Color;
+out vec2 TexCoord;
 
 void main() {
-  gl_Position =  cam.proj * cam.view * vec4(inPosition, 1.0);
+  vec3 position = vec3(inPosition.x, inPosition.y / 2.0, inPosition.z);
+  gl_Position =  cam.proj * cam.view * vec4(position, 1.0);
 
-  Color = vec4(inPosition.y / 126.0);
+  Color = vec4(inPosition.y / 100.0);
+  TexCoord = inTexCoords;
 }
\ No newline at end of file