summaryrefslogtreecommitdiffhomepage
path: root/src/shaders/default.frag
diff options
context:
space:
mode:
Diffstat (limited to 'src/shaders/default.frag')
-rw-r--r--src/shaders/default.frag9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/shaders/default.frag b/src/shaders/default.frag
index 36ed030..17b84a0 100644
--- a/src/shaders/default.frag
+++ b/src/shaders/default.frag
@@ -1,9 +1,16 @@
#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);
+ vec2 texInvert = vec2(TexCoord.x, -TexCoord.y);
+ FragColor = mix(texture(texture1, texInvert), texture(texture2, texInvert), 0.2);
+ //FragColor = texture(ourTexture, TexCoord) * vec4(ourColor.xyz, 1.0);
}