Minor tweaks to geom.c.

git-svn-id: https://s.snth.net/svn/neverball/branches/gles@3546 78b8d119-cf0a-0410-b17c-f493084dd1d7

diff --git a/ball/game_draw.c b/ball/game_draw.c
index 503b07b..a143841 100644 (file)
--- a/ball/game_draw.c
+++ b/ball/game_draw.c
@@ -160,7 +160,7 @@ static void game_draw_goals(const struct game_draw *gd,
                          gd->goal_k,
                          base->zv[zi].r);
 
-                goal_draw();
+                goal_draw(t);
             }
             glPopMatrix();
         }
@@ -198,7 +198,7 @@ static void game_draw_jumps(const struct game_draw *gd,
                      1.0f,
                      base->jv[ji].r);
 
-            jump_draw(!gd->jump_e);
+            jump_draw(t, !gd->jump_e);
         }
         glPopMatrix();
     }

diff --git a/putt/game.c b/putt/game.c
index d0e4f31..80652ee 100644 (file)
--- a/putt/game.c
+++ b/putt/game.c
@@ -262,6 +262,7 @@ static void game_draw_goals(const struct s_base *fp)
 
 static void game_draw_jumps(const struct s_base *fp)
 {
+    float t = 0.001f * SDL_GetTicks();
     int ji;
 
     for (ji = 0; ji < fp->jc; ji++)
@@ -273,7 +274,7 @@ static void game_draw_jumps(const struct s_base *fp)
                          fp->jv[ji].p[2]);
 
             glScalef(fp->jv[ji].r, 1.f, fp->jv[ji].r);
-            jump_draw(!jump_e);
+            jump_draw(t, !jump_e);
         }
         glPopMatrix();
     }

diff --git a/share/geom.c b/share/geom.c
index d5fcdf1..75757ba 100644 (file)
--- a/share/geom.c
+++ b/share/geom.c
@@ -91,23 +91,20 @@ static void jump_part_draw(GLfloat s, GLfloat a)
     glScalef(0.9f, 0.9f, 0.9f);
 }
 
-static void goal_part_draw(GLfloat s, GLfloat a)
+static void goal_part_draw(GLfloat s)
 {
     glMatrixMode(GL_TEXTURE);
     glTranslatef(0.0f, -s, 0.0f);
     glMatrixMode(GL_MODELVIEW);
 
-    glRotatef(a, 0.0f, 1.0f, 0.0f);
     sol_draw(&goal.draw, 1, 1);
-    glScalef(0.75f, 1.1f, 0.9f);
+    glScalef(0.8f, 1.1f, 0.8f);
 }
 
 /*---------------------------------------------------------------------------*/
 
-void goal_draw(void)
+void goal_draw(float t)
 {
-    const GLfloat t = SDL_GetTicks() * 0.001f;
-
     glPushMatrix();
     {
         glScalef(1.0f, 3.0f, 1.0f);
@@ -115,9 +112,10 @@ void goal_draw(void)
         glColor4f(1.0f, 1.0f, 0.0f, 0.5f);
         sol_draw(&beam.draw, 1, 1);
 
-        goal_part_draw(t * 0.1f, 20.0f);
-        goal_part_draw(t * 0.2f, 30.0f);
-        goal_part_draw(t * 0.3f, 70.0f);
+        goal_part_draw(t * 0.10f);
+        goal_part_draw(t * 0.10f);
+        goal_part_draw(t * 0.10f);
+        goal_part_draw(t * 0.10f);
 
         glMatrixMode(GL_TEXTURE);
         glLoadIdentity();
@@ -128,10 +126,8 @@ void goal_draw(void)
     glPopMatrix();
 }
 
-void jump_draw(int highlight)
+void jump_draw(float t, int highlight)
 {
-    const GLfloat t = SDL_GetTicks() * 0.001f;
-
     static GLfloat jump_colors[4][4] = {
         { 0.75f, 0.5f, 1.0f, 0.5f },
         { 0.75f, 0.5f, 1.0f, 0.8f },
@@ -144,9 +140,9 @@ void jump_draw(int highlight)
         glScalef(1.0f, 2.0f, 1.0f);
         sol_draw(&beam.draw, 1, 1);
 
-        jump_part_draw(t * 0.1f, t * 360.0f);
-        jump_part_draw(t * 0.2f, t * 360.0f);
-        jump_part_draw(t * 0.3f, t * 360.0f);
+        jump_part_draw(t * 0.15f, t * 360.0f);
+        jump_part_draw(t * 0.20f, t * 360.0f);
+        jump_part_draw(t * 0.25f, t * 360.0f);
 
         glMatrixMode(GL_TEXTURE);
         glLoadIdentity();

diff --git a/share/geom.h b/share/geom.h
index 320d621..d5fb664 100644 (file)
--- a/share/geom.h
+++ b/share/geom.h
@@ -17,8 +17,8 @@
 void geom_init(void);
 void geom_free(void);
 
-void goal_draw(void);
-void jump_draw(int);
+void goal_draw(float);
+void jump_draw(float, int);
 void swch_draw(int, int);
 void flag_draw(void);
 void mark_draw(void);