X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=ld42_outofspace;a=blobdiff_plain;f=sdr%2Ffield.p.glsl;h=b021a55df96e8d8003c5cfb555e0becbe4577a55;hp=e14ba6fe994708f2a97e7f4a39b03b9308edbeb6;hb=31858c81e045e619d62d015058ad46cc2376c7b5;hpb=061bf9f7e4836820fe3dd3a57d0ef19abb5c7e46 diff --git a/sdr/field.p.glsl b/sdr/field.p.glsl index e14ba6f..b021a55 100644 --- a/sdr/field.p.glsl +++ b/sdr/field.p.glsl @@ -1,13 +1,15 @@ #version 410 compatibility -uniform sampler2D gvis_tex; +uniform sampler2D gvis_tex, field_tex; uniform float gvis_scale; void main() { - vec2 uv = gl_TexCoord[0].st * vec2(gvis_scale, gvis_scale); + 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; }