summary refs log tree commit diff
path: root/src/shaders/triangle.frag.glsl
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/shaders/triangle.frag.glsl10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/shaders/triangle.frag.glsl b/src/shaders/triangle.frag.glsl
index b3dcd05..0285eb0 100644
--- a/src/shaders/triangle.frag.glsl
+++ b/src/shaders/triangle.frag.glsl
@@ -1,7 +1,13 @@
 #version 330 core
 out vec4 FragColor;
+  
 in vec3 ourColor;
+in vec2 TexCoord;
+
+uniform sampler2D texture1;
+uniform sampler2D texture2;
+
 void main()
 {
-    FragColor = vec4(ourColor, 1.0);
-} 
+    FragColor = mix(texture(texture1, TexCoord), texture(texture2, TexCoord), 0.2);
+}