Merge branch 'master' of github.com:godrin/TowerDefense

godrin · Sep 28, 2012 · 02bf6c7 · 02bf6c7
2 parents c0a2501 + b83d620
commit 02bf6c7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/defend-android/assets/data/shaders/round_explosion.vert b/defend-android/assets/data/shaders/round_explosion.vert
@@ -12,8 +12,8 @@ void main()
 {                            
    v_Color=a_mycolor;
    v_Color.a*=u_opacity;
-   v_Color.g=sin(u_time*10);
-   v_Color.b=sin(u_time*10);
+   v_Color.g=sin(u_time*10.0f);
+   v_Color.b=sin(u_time*10.0f);
    vec4 a_position=u_position;
    float d=a_distance*u_time/1.0f; //(1.0f+sin(u_time+a_distance+a_angle)*0.1f)*a_distance;
    vec4 delta=vec4(sin(a_angle),cos(a_angle),0,0)*d*u_size;