WebSVN – Games.Chess Giants – Diff – /scene.cpp

    int length;
    int threat_line;
    int threat_column;
    int minutes;
    int seconds;
-   float yaw;
+   float flaticons_yaw;
    float source_x;
    float source_y;
    float target_x;
    float target_y;
    float current_x;
    // get the current player (we'll need it), its opponent and see if we're online
    current_player = Player_GetCurrent ();
    opposite_player = Player_GetOpposite ();
    network_player = Player_FindByType (PLAYER_INTERNET);
+   // determine display yaw (for flat icons) according to camera angle
+   if ((current_yaw > 45.0f) && (current_yaw <= 135.0f))
+      flaticons_yaw = 180.0f;
+   else if ((current_yaw > -45.0f) && (current_yaw <= 45.0f))
+      flaticons_yaw = 90.0f;
+   else if ((current_yaw > -135.0f) && (current_yaw <= -45.0f))
+      flaticons_yaw = 0.0f;
+   else
+      flaticons_yaw = -90.0f;
    // get the current move
    currentmove = &board->moves[board->viewed_move]; // quick access to current move
    // fetch the background sprite from the theme
+            }
+         }
    } // end if (play mode)
    ////////////////////////////////////////////////////////////////////////////////////////////////
-   // and finally place the parts that are off-board (taken parts)
+   // now place the parts that are off-board (taken parts)
    // but only if we want them displayed
    if (options.want_takenparts)
+   {
       // draw the white player's taken parts, place the part off the board (watch out for the hack...)
       for (part_index = 0; part_index < currentmove->sides[COLOR_WHITE].takenpart_count; part_index++)
+      {
          takenpart_type = currentmove->sides[COLOR_WHITE].takenparts[part_index];
+         // do we want the 3D models or the flat icons ?
+         // we do when EITHER we don't want flat icons OR the current player is looking downstraight
+         if (!want_flaticons || (current_pitch < MAX_PITCH_FOR_FLAT_ICONS))
-         Scene_AddPart (scene, takenpart_type, COLOR_BLACK, (part_index < MAX_STACKABLE_PARTS ? 23.2f : 26.8f),
+            Scene_AddPart (scene, takenpart_type, COLOR_BLACK, (part_index < MAX_STACKABLE_PARTS ? 23.2f : 26.8f),
-                        (part_index % MAX_STACKABLE_PARTS == 0 ? 23.2f : scene->objects[scene->object_count - 1].y - (scene->objects[scene->object_count - 1].simpleshadow_size + simpleshadow_sizes[takenpart_type]) * 0.75f),
+                           (part_index % MAX_STACKABLE_PARTS == 0 ? 23.2f : scene->objects[scene->object_count - 1].y - (scene->objects[scene->object_count - 1].simpleshadow_size + simpleshadow_sizes[takenpart_type]) * 0.75f),
 .04f, (takenpart_type == PART_PAWN ? -90.0f : 100.0f), 0.0f); // rotate pawns 90°
+         else
+            Scene_AddTile (scene, theme->flattextures[COLOR_BLACK][takenpart_type], 1.25f, (part_index < MAX_STACKABLE_PARTS ? 23.2f : 26.8f),
+.0f - (part_index < MAX_STACKABLE_PARTS ? part_index : (part_index - MAX_STACKABLE_PARTS)) * 2.5f, 0.07f, flaticons_yaw);
+      }
       // now draw the black player's taken parts, place the part off the board (watch out for the hack...)
       for (part_index = 0; part_index < currentmove->sides[COLOR_BLACK].takenpart_count; part_index++)
+      {
          takenpart_type = currentmove->sides[COLOR_BLACK].takenparts[part_index];
+         // do we want the 3D models or the flat icons ?
+         // we do when EITHER we don't want flat icons OR the current player is looking downstraight
+         if (!want_flaticons || (current_pitch < MAX_PITCH_FOR_FLAT_ICONS))
-         Scene_AddPart (scene, takenpart_type, COLOR_WHITE, (part_index < MAX_STACKABLE_PARTS ? -23.2f : -26.8f),
+            Scene_AddPart (scene, takenpart_type, COLOR_WHITE, (part_index < MAX_STACKABLE_PARTS ? -23.2f : -26.8f),
-                        (part_index % MAX_STACKABLE_PARTS == 0 ? -23.2f : scene->objects[scene->object_count - 1].y + (scene->objects[scene->object_count - 1].simpleshadow_size + simpleshadow_sizes[takenpart_type]) * 0.75f),
+                           (part_index % MAX_STACKABLE_PARTS == 0 ? -23.2f : scene->objects[scene->object_count - 1].y + (scene->objects[scene->object_count - 1].simpleshadow_size + simpleshadow_sizes[takenpart_type]) * 0.75f),
 .04f, (takenpart_type == PART_PAWN ? -90.0f : 100.0f), 0.0f); // rotate pawns 90°
+         else
+            Scene_AddTile (scene, theme->flattextures[COLOR_WHITE][takenpart_type], 1.25f, (part_index < MAX_STACKABLE_PARTS ? -23.2f : -26.8f),
+                           -20.0f + (part_index < MAX_STACKABLE_PARTS ? part_index : (part_index - MAX_STACKABLE_PARTS)) * 2.5f, 0.07f, flaticons_yaw);
+      }
+   }
    ////////////////////////////////////////////////////////////////////////////////////////////////
    // now draw the textured slots
+      }
+   }
    ////////////////////////////////////////////////////////////////////////////////////////////////
    // now draw the 3D parts that are still in play
-   // determine display yaw (for flat icons) according to camera angle
-   if ((current_yaw > 45.0f) && (current_yaw <= 135.0f))
-      yaw = 180.0f;
-   else if ((current_yaw > -45.0f) && (current_yaw <= 45.0f))
-      yaw = 90.0f;
-   else if ((current_yaw > -135.0f) && (current_yaw <= -45.0f))
-      yaw = 0.0f;
-   else
-      yaw = -90.0f;
    // cycle through all the grid and place all static parts
    for (line = 0; line < 8; line++)
+   {
       for (column = 0; column < 8; column++)
          if ((board->viewed_move == 0)
              || (((line != currentmove->target[0]) || (column != currentmove->target[1]))
                  && ((towupper (currentmove->pgntext[0]) != L'O')
                      || (line != (currentmove->color == COLOR_WHITE ? 0 : 7)) || (column != (currentmove->target[1] == 2 ? 3 : 5)))))
+         {
-            // do we want animations AND is it still not time to rotate the board ?
-            if (options.want_animations && (animation_endtime + 1.0f > current_time))
-            {
-               // do we want the 3D models or the flat icons ?
+            // do we want the 3D models or the flat icons ?
-               // we do when EITHER we don't want flat icons OR the player playing the current move is looking downstraight
+            // we do when EITHER we don't want flat icons OR the player playing the current move is looking downstraight
-               if (!want_flaticons || (opposite_player->view_pitch < MAX_PITCH_FOR_FLAT_ICONS))
+            if (!want_flaticons || (current_pitch < MAX_PITCH_FOR_FLAT_ICONS))
-                  Scene_AddPart (scene, boardslot->part, boardslot->color, 17.5f - (7 - column) * 5.0f, 17.5f - line * 5.0f, 0.04f, 0.0f, 0.0f);
+               Scene_AddPart (scene, boardslot->part, boardslot->color, 17.5f - (7 - column) * 5.0f, 17.5f - line * 5.0f, 0.04f, 0.0f, 0.0f);
-               else
-                  Scene_AddTile (scene, theme->flattextures[boardslot->color][boardslot->part], 2.5f, 17.5f - (7 - column) * 5.0f, 17.5f - line * 5.0f, 0.05f, yaw);
-            }
             else
-            {
-               // else we are not currently playing an animation - do we want the 3D models or the flat icons ?
-               // we do when EITHER we don't want flat icons OR the current player is looking downstraight
-               if (!want_flaticons || (current_player->view_pitch < MAX_PITCH_FOR_FLAT_ICONS))
-                  Scene_AddPart (scene, boardslot->part, boardslot->color, 17.5f - (7 - column) * 5.0f, 17.5f - line * 5.0f, 0.04f, 0.0f, 0.0f);
-               else
-                  Scene_AddTile (scene, theme->flattextures[boardslot->color][boardslot->part], 2.5f, 17.5f - (7 - column) * 5.0f, 17.5f - line * 5.0f, 0.05f, yaw);
+               Scene_AddTile (scene, theme->flattextures[boardslot->color][boardslot->part], 2.5f, 17.5f - (7 - column) * 5.0f, 17.5f - line * 5.0f, 0.05f, flaticons_yaw);
-            }
+         }
       } // end for (column = 0; column < 8; column++)
    } // end for (line = 0; line < 8; line++)
    // now do another pass and draw the part(s) that are currently moving
                current_x = source_x + (target_x - source_x) * movement_ratio;
                current_y = source_y + (target_y - source_y) * movement_ratio;
                // do we want the 3D models or the flat icons ?
                // we do when EITHER we don't want flat icons OR the player playing the current move is looking downstraight
-               if (!want_flaticons || (opposite_player->view_pitch < MAX_PITCH_FOR_FLAT_ICONS))
+               if (!want_flaticons || (current_pitch < MAX_PITCH_FOR_FLAT_ICONS))
+               {
                   // height is a sine positive, max height is proportional to travelled distance
                   movement_diffco = abs (currentmove->target[1] - currentmove->source[1]);
                   movement_diffli = abs (currentmove->target[0] - currentmove->source[0]);
                   movement_maxheight = 0.5f + (float) movement_diffco + (float) movement_diffli;
                   // make this part move realistically
                   Scene_AddPart (scene, boardslot->part, boardslot->color, current_x, current_y, current_z, 0.0f, (boardslot->color == COLOR_BLACK ? -1 : 1) * min (current_z * 3.0f, 10.0f));
+               }
                else
-                  Scene_AddTile (scene, theme->flattextures[boardslot->color][boardslot->part], 2.5f, current_x, current_y, 0.07f, yaw);
+                  Scene_AddTile (scene, theme->flattextures[boardslot->color][boardslot->part], 2.5f, current_x, current_y, 0.07f, flaticons_yaw);
+            }
             else
+            {
-               // we are not playing an animation, but have we JUST FINISHED playing one ?
-               if (options.want_animations && (animation_endtime + 1.0f > current_time))
-               {
-                  // we've just finished playing an animation - do we want the 3D models or the flat icons ?
+               // do we want the 3D models or the flat icons ?
-                  // we do when EITHER we don't want flat icons OR the player playing the current move is looking downstraight
+               // we do when EITHER we don't want flat icons OR the current player is looking downstraight
-                  if (!want_flaticons || (opposite_player->view_pitch < MAX_PITCH_FOR_FLAT_ICONS))
+               if (!want_flaticons || (current_pitch < MAX_PITCH_FOR_FLAT_ICONS))
-                     Scene_AddPart (scene, boardslot->part, boardslot->color, 17.5f - (7 - column) * 5.0f, 17.5f - line * 5.0f, 0.04f, 0.0f, 0.0f);
+                  Scene_AddPart (scene, boardslot->part, boardslot->color, 17.5f - (7 - column) * 5.0f, 17.5f - line * 5.0f, 0.04f, 0.0f, 0.0f);
-                  else
-                     Scene_AddTile (scene, theme->flattextures[boardslot->color][boardslot->part], 2.5f, 17.5f - (7 - column) * 5.0f, 17.5f - line * 5.0f, 0.05f, yaw);
-               }
                else
-               {
-                  // else we are not currently playing an animation - do we want the 3D models or the flat icons ?
-                  // we do when EITHER we don't want flat icons OR the current player is looking downstraight
-                  if (!want_flaticons || (current_player->view_pitch < MAX_PITCH_FOR_FLAT_ICONS))
-                     Scene_AddPart (scene, boardslot->part, boardslot->color, 17.5f - (7 - column) * 5.0f, 17.5f - line * 5.0f, 0.04f, 0.0f, 0.0f);
-                  else
-                     Scene_AddTile (scene, theme->flattextures[boardslot->color][boardslot->part], 2.5f, 17.5f - (7 - column) * 5.0f, 17.5f - line * 5.0f, 0.05f, yaw);
+                  Scene_AddTile (scene, theme->flattextures[boardslot->color][boardslot->part], 2.5f, 17.5f - (7 - column) * 5.0f, 17.5f - line * 5.0f, 0.05f, flaticons_yaw);
-               }
+            }
             // is it time to play a move sound ?
             if ((sound_playtime != 0) && (sound_playtime < current_time))
+            {
                movement_maxheight = 1.0f; // castling rook will barely hover above the ground
                current_z = 0.04f + sin (MATH_PI * movement_ratio) * movement_maxheight;
                // make this part move realistically - do we want the 3D models or the flat icons ?
                // we do when EITHER we don't want flat icons OR the player playing the current move is looking downstraight
-               if (!want_flaticons || (opposite_player->view_pitch < MAX_PITCH_FOR_FLAT_ICONS))
+               if (!want_flaticons || (current_pitch < MAX_PITCH_FOR_FLAT_ICONS))
                   Scene_AddPart (scene, boardslot->part, boardslot->color, current_x, current_y, current_z, 0.0f, (boardslot->color == COLOR_BLACK ? -1 : 1) * min (current_z * 3.0f, 10.0f));
                else
-                  Scene_AddTile (scene, theme->flattextures[boardslot->color][boardslot->part], 2.5f, current_x, current_y, 0.09f, yaw);
+                  Scene_AddTile (scene, theme->flattextures[boardslot->color][boardslot->part], 2.5f, current_x, current_y, 0.09f, flaticons_yaw);
                if (movement_ratio < 0.9f)
                   rooksound_played = false; // if the rook is still moving, reset the "sound played" flag
                else if (!rooksound_played)
+               {
                   rooksound_played = true; // remember this is no longer to be done
+               }
+            }
             else
+            {
-               // do we want animations AND is it still not time to rotate the board ?
-               if (options.want_animations && (animation_endtime + 1.0f > current_time))
-               {
-                  // do we want the 3D models or the flat icons ?
+               // do we want the 3D models or the flat icons ?
-                  // we do when EITHER we don't want flat icons OR the player playing the current move is looking downstraight
+               // we do when EITHER we don't want flat icons OR the current player is looking downstraight
-                  if (!want_flaticons || (opposite_player->view_pitch < MAX_PITCH_FOR_FLAT_ICONS))
+               if (!want_flaticons || (current_pitch < MAX_PITCH_FOR_FLAT_ICONS))
-                     Scene_AddPart (scene, boardslot->part, boardslot->color, 17.5f - (7 - column) * 5.0f, 17.5f - line * 5.0f, 0.04f, 0.0f, 0.0f);
+                  Scene_AddPart (scene, boardslot->part, boardslot->color, 17.5f - (7 - column) * 5.0f, 17.5f - line * 5.0f, 0.04f, 0.0f, 0.0f);
-                  else
-                     Scene_AddTile (scene, theme->flattextures[boardslot->color][boardslot->part], 2.5f, 17.5f - (7 - column) * 5.0f, 17.5f - line * 5.0f, 0.05f, yaw);
-               }
                else
-               {
-                  // else we are not currently playing an animation - do we want the 3D models or the flat icons ?
-                  // we do when EITHER we don't want flat icons OR the current player is looking downstraight
-                  if (!want_flaticons || (current_player->view_pitch < MAX_PITCH_FOR_FLAT_ICONS))
-                     Scene_AddPart (scene, boardslot->part, boardslot->color, 17.5f - (7 - column) * 5.0f, 17.5f - line * 5.0f, 0.04f, 0.0f, 0.0f);
-                  else
-                     Scene_AddTile (scene, theme->flattextures[boardslot->color][boardslot->part], 2.5f, 17.5f - (7 - column) * 5.0f, 17.5f - line * 5.0f, 0.05f, yaw);
+                  Scene_AddTile (scene, theme->flattextures[boardslot->color][boardslot->part], 2.5f, 17.5f - (7 - column) * 5.0f, 17.5f - line * 5.0f, 0.05f, flaticons_yaw);
-               }
+            }
+         }
       } // end for (column = 0; column < 8; column++)
    } // end for (line = 0; line < 8; line++)

Subversion Repositories Games.Chess Giants

Games.Chess Giants/scene.cpp – Rev 24 → 25