tweaked the particle demo a little bit

2013-11-08 23:21:01 -08:00
parent 768ea211a6
commit a6bc61ad1a
8 changed files with 77 additions and 76 deletions
--- a/btgui/OpenGLWindow/Shaders/pointSpritePS.glsl
+++ b/btgui/OpenGLWindow/Shaders/pointSpritePS.glsl
@@ -23,7 +23,7 @@ void main(void)
 	N.xy = gl_PointCoord.st*vec2(2.0, -2.0) + vec2(-1.0, 1.0);
    float mag = dot(N.xy, N.xy);
    if (mag > 1.0) discard; 
-    vec4 texel = vec4(1,0,0,1);//fragment.color*texture(Diffuse,vert.texcoord);//fragment.color;
+    vec4 texel = fragment.color;//vec4(1,0,0,1);//fragment.color*texture(Diffuse,vert.texcoord);//fragment.color;
 	vec3 ct;
 	float at,af;
 	af = 1.0;