summaryrefslogtreecommitdiff
path: root/demo.fs
diff options
context:
space:
mode:
Diffstat (limited to 'demo.fs')
-rw-r--r--demo.fs4
1 files changed, 3 insertions, 1 deletions
diff --git a/demo.fs b/demo.fs
index 03159de..af6e190 100644
--- a/demo.fs
+++ b/demo.fs
@@ -2,6 +2,8 @@
in vec2 texture_coordinate;
+uniform vec3 extra_color;
+
uniform sampler2D box_texture;
uniform sampler2D happy_texture;
@@ -10,6 +12,6 @@ out vec4 FragColor;
void main()
{
FragColor = mix(texture(box_texture, texture_coordinate),
- vec4(texture(happy_texture, texture_coordinate).xyz, 1.0),
+ vec4(extra_color.xyz, 1.0),
0.2);
}