X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=ld42_outofspace;a=blobdiff_plain;f=sdr%2Ffield.p.glsl;h=84d2321e2dbb5228458f4323f3781f0d1577cc8b;hp=e14ba6fe994708f2a97e7f4a39b03b9308edbeb6;hb=79148ed519ea06cb506b512ffd2718c4b03f6f11;hpb=061bf9f7e4836820fe3dd3a57d0ef19abb5c7e46

diff --git a/sdr/field.p.glsl b/sdr/field.p.glsl
index e14ba6f..84d2321 100644
--- a/sdr/field.p.glsl
+++ b/sdr/field.p.glsl
@@ -1,13 +1,16 @@
 #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;
+
+	vec3 amb = gl_LightModel.ambient.rgb;
+	gl_FragColor.rgb = amb + gridcol.rgb + vec3(0.0, foo, 0.0);
 	gl_FragColor.a = 1.0;
 }