From e0a047ac1e2cf18c3b0f23f31f869eeda767503e Mon Sep 17 00:00:00 2001 From: omniscient <17525998+omnisci3nce@users.noreply.github.com> Date: Fri, 26 Jul 2024 13:40:31 +1000 Subject: try getting glfw passthrough and egui to work --- assets/shaders/terrain.frag | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'assets/shaders/terrain.frag') 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 -- cgit v1.2.3-70-g09d2