summaryrefslogtreecommitdiffhomepage
path: root/src/shaders
diff options
context:
space:
mode:
authorrealtradam <[email protected]>2022-11-21 19:12:51 -0500
committerrealtradam <[email protected]>2022-11-21 19:12:51 -0500
commitf0f30c12fe919862ade380513c02c9845598ac46 (patch)
treed742b6a932ec9f7e7edc00372316429d19ef6da1 /src/shaders
parent35d550df84ede11e7e2cd07c491944222491cd0e (diff)
downloadOgle-f0f30c12fe919862ade380513c02c9845598ac46.tar.gz
Ogle-f0f30c12fe919862ade380513c02c9845598ac46.zip
abstracted textures
Diffstat (limited to 'src/shaders')
-rw-r--r--src/shaders/default.frag4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shaders/default.frag b/src/shaders/default.frag
index 17b84a0..241369e 100644
--- a/src/shaders/default.frag
+++ b/src/shaders/default.frag
@@ -5,12 +5,12 @@ in vec3 ourColor;
in vec2 TexCoord;
uniform sampler2D texture1;
-uniform sampler2D texture2;
+//uniform sampler2D texture2;
void main()
{
vec2 texInvert = vec2(TexCoord.x, -TexCoord.y);
- FragColor = mix(texture(texture1, texInvert), texture(texture2, texInvert), 0.2);
+ FragColor = texture(texture1, texInvert);// * ourColor;
//FragColor = texture(ourTexture, TexCoord) * vec4(ourColor.xyz, 1.0);
}