summaryrefslogtreecommitdiff
path: root/demo.fs
diff options
context:
space:
mode:
authorsanine-a <sanine.not@pm.me>2020-05-23 11:50:54 -0500
committersanine-a <sanine.not@pm.me>2020-05-23 11:50:54 -0500
commita247c0adac7b3e50c72fde9b197ef6eabfd38b0b (patch)
treeea0c49821dca6bcc7829051724f5ad7df6f26020 /demo.fs
parent86568ae07c04da1bfc2edbd029c677a73328c099 (diff)
add honey_shader_set_vec3()
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);
}