Proper ball shadow removal in poser mode. Patch from Elviz.

[neverball] / ball / game.c

diff --git a/ball/game.c b/ball/game.c
index 24d66c1..e66021b 100644 (file)
--- a/ball/game.c
+++ b/ball/game.c
@@ -65,7 +65,8 @@ static float jump_dt;                   /* Jump duration                     */
 static float jump_p[3];                 /* Jump destination                  */
 static float fade_k = 0.0;              /* Fade in/out level                 */
 static float fade_d = 0.0;              /* Fade in/out direction             */
-static int   ball_b = 0;                /* Is the ball a bonus ball?         */
+
+/*---------------------------------------------------------------------------*/
 
 static int   grow = 0;                  /* Should the ball be changing size? */
 static float grow_orig = 0;             /* the original ball size            */
@@ -78,50 +79,63 @@ static int   got_orig = 0;              /* Do we know original ball size?    */
 #define GROW_BIG   1.5f                 /* large factor                      */
 #define GROW_SMALL 0.5f                 /* small factor                      */
 
-/*---------------------------------------------------------------------------*/
+static int   grow_state = 0;            /* Current state (values -1, 0, +1)  */
 
-static void grow_set(const struct s_file *fp, int type)
-{    
+static void grow_init(const struct s_file *fp, int type)
+{
     if (!got_orig)
     {
-        grow_orig = fp->uv->r;
-        grow_goal = grow_orig;
-        grow_strt = grow_orig;
-        got_orig  = 1;
+        grow_orig  = fp->uv->r;
+        grow_goal  = grow_orig;
+        grow_strt  = grow_orig;
+
+        grow_state = 0;
+
+        got_orig   = 1;
     }
 
     if (type == ITEM_SHRINK)
     {
         audio_play(AUD_SHRINK, 1.f);
 
-        if (grow_goal == grow_orig * GROW_SMALL)
-            return;
-        else if (grow_goal == grow_orig * GROW_BIG)
+        switch (grow_state)
         {
+        case -1:
+            break;
+
+        case  0:
+            grow_goal = grow_orig * GROW_SMALL;
+            grow_state = -1;
             grow = 1;
+            break;
+
+        case +1:
             grow_goal = grow_orig;
-        }
-        else
-        {
-            grow_goal = grow_orig * GROW_SMALL;
+            grow_state = 0;
             grow = 1;
+            break;
         }
     }
-    if (type == ITEM_GROW)
+    else if (type == ITEM_GROW)
     {
         audio_play(AUD_GROW, 1.f);
 
-        if (grow_goal == grow_orig * GROW_BIG)
-            return;
-        else if (grow_goal == grow_orig * GROW_SMALL)
+        switch (grow_state)
         {
-            grow = 1;
+        case -1:
             grow_goal = grow_orig;
-        }
-        else
-        {
+            grow_state = 0;
+            grow = 1;
+            break;
+
+        case  0:
             grow_goal = grow_orig * GROW_BIG;
+            grow_state = +1;
             grow = 1;
+            break;
+
+        case +1:
+            break;
         }
     }
 
@@ -132,10 +146,13 @@ static void grow_set(const struct s_file *fp, int type)
     }
 }
 
-static void grow_ball(const struct s_file *fp, float dt)
+static void grow_step(const struct s_file *fp, float dt)
 {
     float dr;
 
+    if (!grow)
+        return;
+
     /* Calculate new size based on how long since you touched the coin... */
 
     grow_t += dt;
@@ -153,6 +170,8 @@ static void grow_ball(const struct s_file *fp, float dt)
     fp->uv->r = dr;
 }
 
+/*---------------------------------------------------------------------------*/
+
 static void view_init(void)
 {
     view_a  = 0.f;
@@ -227,6 +246,7 @@ int game_init(const struct level *level, int t, int g)
     /* Initialize ball size tracking... */
 
     got_orig = 0;
+    grow = 0;
 
     return game_state;
 }
@@ -279,8 +299,7 @@ static void game_draw_balls(const struct s_file *fp)
                  fp->uv[0].r);
 
         glColor4fv(c);
-
-        ball_draw(ball_b);
+        ball_draw();
     }
     glPopMatrix();
 }
@@ -290,10 +309,9 @@ static void game_draw_items(const struct s_file *fp)
     float r = 360.f * SDL_GetTicks() / 1000.f;
     int hi;
 
-    /* FIXME:  Draw items of different types in one pass. */
+    /* FIXME:  Draw items of different types in one pass? */
 
-    item_push();
-    item_push_text(ITEM_COIN);
+    item_push(ITEM_COIN);
     {
         for (hi = 0; hi < fp->hc; hi++)
 
@@ -312,8 +330,7 @@ static void game_draw_items(const struct s_file *fp)
     }
     item_pull();
 
-    item_push();
-    item_push_text(ITEM_SHRINK);
+    item_push(ITEM_SHRINK);
     {
         for (hi = 0; hi < fp->hc; hi++)
 
@@ -332,8 +349,7 @@ static void game_draw_items(const struct s_file *fp)
     }
     item_pull();
 
-    item_push();
-    item_push_text(ITEM_GROW);
+    item_push(ITEM_GROW);
     {
         for (hi = 0; hi < fp->hc; hi++)
 
@@ -366,7 +382,7 @@ static void game_draw_goals(const struct s_file *fp, float rx, float ry)
                              fp->zv[zi].p[1],
                              fp->zv[zi].p[2]);
 
-                part_draw_goal(rx, ry, fp->zv[zi].r, goal_k, fp->zv[zi].c);
+                part_draw_goal(rx, ry, fp->zv[zi].r, goal_k);
 
                 glScalef(fp->zv[zi].r, goal_k, fp->zv[zi].r);
                 goal_draw();
@@ -402,6 +418,7 @@ static void game_draw_swchs(const struct s_file *fp)
     {
         if (fp->xv[xi].i)
             continue;
+
         glPushMatrix();
         {
             glTranslatef(fp->xv[xi].p[0],
@@ -442,8 +459,8 @@ static void game_refl_all(int s)
 static void game_draw_light(void)
 {
     const float light_p[2][4] = {
-        { -8.0f, +32.0f, -8.0f, 1.0f },
-        { +8.0f, +32.0f, +8.0f, 1.0f },
+        { -8.0f, +32.0f, -8.0f, 0.0f },
+        { +8.0f, +32.0f, +8.0f, 0.0f },
     };
     const float light_c[2][4] = {
         { 1.0f, 0.8f, 0.8f, 1.0f },
@@ -529,7 +546,7 @@ static void game_draw_fore(int pose, float rx, float ry, int d, const float p[3]
 
             sol_draw(&file);
 
-            if (config_get_d(CONFIG_SHADOW))
+            if (pose == 0 && config_get_d(CONFIG_SHADOW))
             {
                 shad_draw_set(ball_p, ball_r);
                 sol_shad(&file);
@@ -756,7 +773,7 @@ static void game_update_time(float dt, int b)
     }
 }
 
-static int game_update_state(int *state_value)
+static int game_update_state(int bt)
 {
     struct s_file *fp = &file;
     struct s_goal *zp;
@@ -765,8 +782,6 @@ static int game_update_state(int *state_value)
     float p[3];
     float c[3];
 
-    int bt = state_value != NULL;
-
     /* Test for an item. */
     if (bt && (hp = sol_item_test(fp, p, COIN_RADIUS)))
     {
@@ -775,7 +790,7 @@ static int game_update_state(int *state_value)
         item_color(hp, c);
         part_burst(p, c);
 
-        grow_set(fp, hp->t);
+        grow_init(fp, hp->t);
 
         if (hp->t == ITEM_COIN)
         {
@@ -819,9 +834,8 @@ static int game_update_state(int *state_value)
 
     if (bt && goal_c == 0 && (zp = sol_goal_test(fp, p, 0)))
     {
-        *state_value = zp->s;
         audio_play(AUD_GOAL, 1.0f);
-        return zp->c ? GAME_SPEC : GAME_GOAL;
+        return GAME_GOAL;
     }
 
     /* Test for time-out. */
@@ -858,7 +872,7 @@ static int game_update_state(int *state_value)
  * graphics frame rate.
  */
 
-int game_step(const float g[3], float dt, int *state_value)
+int game_step(const float g[3], float dt, int bt)
 {
     struct s_file *fp = &file;
 
@@ -885,8 +899,7 @@ int game_step(const float g[3], float dt, int *state_value)
             game_rz = game_iz;
         }
 
-        if (grow)
-            grow_ball(fp, dt);
+        grow_step(fp, dt);
 
         game_update_grav(h, g);
         part_step(h, t);
@@ -938,9 +951,9 @@ int game_step(const float g[3], float dt, int *state_value)
 
         game_step_fade(dt);
         game_update_view(dt);
-        game_update_time(dt, state_value != NULL);
+        game_update_time(dt, bt);
 
-        return game_update_state(state_value);
+        return game_update_state(bt);
     }
     return GAME_NONE;
 }