projects
/
ld42_outofspace
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
the universe is fucked
[ld42_outofspace]
/
sdr
/
field.p.glsl
diff --git
a/sdr/field.p.glsl
b/sdr/field.p.glsl
index
1969702
..
b021a55
100644
(file)
--- a/
sdr/field.p.glsl
+++ b/
sdr/field.p.glsl
@@
-1,13
+1,15
@@
#version 410 compatibility
#version 410 compatibility
-uniform sampler2D gvis_tex;
+uniform sampler2D gvis_tex, field_tex;
uniform float gvis_scale;
void main()
{
uniform float gvis_scale;
void main()
{
- vec2 uv = gl_TexCoord[0].st * vec2(gvis_scale, gvis_scale);
- vec4 gridcol = texture2D(gvis_tex, uv);
+ vec2 uv = gl_TexCoord[0].st * vec2(gvis_scale, gvis_scale) * 10.0;
+ vec3 gridcol = texture2D(gvis_tex, uv).rgb;
- gl_FragColor.rgb = gridcol.rgb;
+ float foo = texture2D(field_tex, gl_TexCoord[0].st).x;
+
+ gl_FragColor.rgb = gridcol.rgb + vec3(0.0, foo, 0.0);
gl_FragColor.a = 1.0;
}
gl_FragColor.a = 1.0;
}