graphics

commit 8e85617d863ac8194c8ccd01bc078ce33c3e3138
parent 1340a6b56e8e44bff3b8dc83749dbb3e617c0e26
Author: Brian Swetland <swetland@frotz.net>
Date:   Thu, 12 Sep 2013 18:26:53 -0700

textgrid: appease the nvidia glsl compiler

Diffstat:
M
common/assets/textgrid.glsl
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/assets/textgrid.glsl b/common/assets/textgrid.glsl
@@ -14,7 +14,7 @@ void main() {
 	ivec2 cell = uTextGrid.xy;
 	ivec2 dims = uTextGrid.zw;
 	vec4 pos = vec4(aPosition,0,1);
-	uint id = gl_InstanceID;
+	int id = gl_InstanceID;
 
 	// translate cell to destination 
 	pos.xy += vec2(id % dims.x, id / dims.x) * cell;
@@ -24,7 +24,7 @@ void main() {
 
 	// translate texture coordinates to character position
 	vTexCoord = aTexCoord + tadj + vec2(1.0/256.0,1.0/256.0); 
-	vColor = aCharacter.yzw / 255.0;
+	vColor = vec3(aCharacter.yzw) / 255.0;
 	pos = uOrtho * pos;
 
 	// discard via clipping