projects
/
ld42_outofspace
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
crappy emitters, half-assed sim update
[ld42_outofspace]
/
sdr
/
field.p.glsl
diff --git
a/sdr/field.p.glsl
b/sdr/field.p.glsl
index
b8888c9
..
e14ba6f
100644
(file)
--- a/
sdr/field.p.glsl
+++ b/
sdr/field.p.glsl
@@
-1,12
+1,13
@@
#version 410 compatibility
#version 410 compatibility
-uniform sampler2D gvis_tex, field_tex;
+uniform sampler2D gvis_tex;
+uniform float gvis_scale;
void main()
{
void main()
{
- vec4 gridcol = texture2D(gvis_tex, gl_TexCoord[0].st);
- float field = -texture2D(field_tex, gl_TexCoord[1].st).x;
+ vec2 uv = gl_TexCoord[0].st * vec2(gvis_scale, gvis_scale);
+ vec3 gridcol = texture2D(gvis_tex, uv).rgb;
- gl_FragColor.rgb = gridcol.rgb + vec3(field, field, field);
+ gl_FragColor.rgb = gridcol.rgb;
gl_FragColor.a = 1.0;
}
gl_FragColor.a = 1.0;
}