summaryrefslogtreecommitdiff
path: root/demo.fs
diff options
context:
space:
mode:
Diffstat (limited to 'demo.fs')
-rw-r--r--demo.fs2
1 files changed, 1 insertions, 1 deletions
diff --git a/demo.fs b/demo.fs
index ebdf3f8..ddfc235 100644
--- a/demo.fs
+++ b/demo.fs
@@ -10,5 +10,5 @@ uniform sampler2D happyTexture;
void main()
{
- FragColor = vec4(outColor.xyz, 1.0); //mix(texture(boxTexture, outTexCoord), texture(happyTexture, outTexCoord), 0.2);
+ FragColor = mix(texture(boxTexture, outTexCoord), texture(happyTexture, outTexCoord), 0.1);
}