summaryrefslogtreecommitdiff
path: root/demo.fs
diff options
context:
space:
mode:
Diffstat (limited to 'demo.fs')
-rw-r--r--demo.fs8
1 files changed, 3 insertions, 5 deletions
diff --git a/demo.fs b/demo.fs
index 791149c..a9a0275 100644
--- a/demo.fs
+++ b/demo.fs
@@ -2,16 +2,14 @@
in vec2 texture_coordinate;
-uniform vec3 extra_color;
+uniform vec3 light_color;
uniform sampler2D box_texture;
uniform sampler2D happy_texture;
-out vec4 FragColor;
+out vec4 fragment_color;
void main()
{
- FragColor = mix(texture(box_texture, texture_coordinate),
- texture(happy_texture, texture_coordinate),
- 0.2);
+ fragment_color = texture(box_texture, texture_coordinate) * vec4(light_color.xyz, 1.0);
}