From ee735611611bf7b27bccbca808e5d72da45b9937 Mon Sep 17 00:00:00 2001 From: iurii plugatarov Date: Sun, 11 Aug 2024 01:17:42 +0300 Subject: textures --- src/shaders/triangle.frag.glsl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/shaders/triangle.frag.glsl') 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); +} -- cgit 1.4.1-2-gfad0