Rolling updates + Score change

Added state
Added dice + roll button
Updated blank tile graphic

1 files changed, 166 insertions, 37 deletions

diff --git a/ur.cpp b/ur.cpp
index c8ea723..1162c0b 100644
--- a/ur.cpp
+++ b/ur.cpp
@@ -1,58 +1,157 @@
+#include "helper.h"
 #include <SFML/Graphics.hpp>
 #include <iostream>
 #include <string>
-#include "helper.h"
 
-const float SCR_W = 800.f;
-const float SCR_H = 600.f;
-const char* TITLE = "Royal Game of Ur";
 const char* TEXTURE_PATH = "./res/ur.png";
-const int P1_PIECE = 6; 
-const int P2_PIECE = 5;
-const int P1_BOARD_TILES[2] = { 0, 1 };
-const int P2_BOARD_TILES[2] = { 2, 3 };
-const int STAR_TILE = 4;
-const int BLANK_TILE = 9;
-const int DIE_0 = 8;
-const int DIE_1 = 7;
-const float ZOOM = 0.5f;
 const float PAD = 32.f;
 const float PIECE_PAD = 8.f;
 const float TEXT_OFFSET = 8.f;
 const sf::Color BG_COLOR = sf::Color(66, 47, 81, 255);
+const sf::Color GREY = sf::Color(255, 255, 255, 128);
+
+GameState state = GameState::WAITING;
+GameState prev_state = GameState::WAITING;
+
+inline void
+change_state(GameState next)
+{
+  std::cout << "GameState == " << next << std::endl;
+  prev_state = state;
+  state = next;
+}
+
+// p1 = false, p2 = true
+bool turn_tracker = true;
+
+inline void
+next_turn()
+{
+  turn_tracker = !turn_tracker;
+}
+
+inline bool
+p1_turn()
+{
+  return !turn_tracker;
+}
+
+inline bool
+p2_turn()
+{
+  return turn_tracker;
+}
+
+inline void
+render_dice(
+  sf::RenderWindow* window,
+  std::shared_ptr<std::vector<struct dice_t>> dice,
+  std::shared_ptr<std::vector<std::shared_ptr<sf::Sprite>>> roll_sprites)
+{
+
+  // draw dice
+  int dice_r, dice_c, roll_r, roll_c;
+  if (p1_turn()) {
+    dice_r = 6;
+    dice_c = 11;
+    roll_r = dice_r + 2;
+    roll_c = dice_c;
+  } else {
+    dice_r = 1;
+    dice_c = 11;
+    roll_r = dice_r - 1;
+    roll_c = dice_c;
+  }
+  if (state == GameState::PLACING) {
+    int result = 0;
+    // draw roll result
+    int r = dice_r, c = dice_c;
+    for (int i = 0; i < 8; i++) {
+      auto die = (*dice)[i];
+      if (die.show) {
+        die.sprite.setPosition(pos(c, r));
+        result += die.value;
+        window->draw(die.sprite);
+
+        if (i % 2 == 0) {
+          c += 1;
+          // reset if we've already bumped it once
+          if (c % 2 == 0) {
+            c = dice_c;
+          }
+        } else {
+          r += 1;
+        }
+      }
+    }
+  }
+  /*
+  else if (state == GameState::ROLLING)
+  {
+    // animate the dice. This is attached to a timer
+    // which will move between rolling and placing
+  }
+  */
+  else {
+    // draw initial values
+    // draw the 0s
+    int c = dice_c, r = dice_r;
+    for (int i = 0; i < 8; i += 2) {
+      auto die = (*dice)[i];
+      die.sprite.setPosition(pos(c++, r));
+      window->draw(die.sprite);
+      if (i == 2) {
+        c = dice_c;
+        r += 1;
+      }
+    }
+    // draw roll text
+    c = roll_c;
+    r = roll_r;
+    for (auto s : (*roll_sprites)) {
+      s->setPosition(pos(c++, r));
+      window->draw(*s);
+    }
+  }
+}
 
 int
 main()
 {
   const std::shared_ptr<std::vector<sf::Texture>> textures =
     loadTextures(TEXTURE_PATH);
-  
+
+  const std::shared_ptr<std::vector<sf::Sprite>> board = createBoard(textures);
+
   const std::shared_ptr<struct player_t> p1 =
     createPlayer((*textures)[P1_PIECE]);
 
   const std::shared_ptr<struct player_t> p2 =
     createPlayer((*textures)[P2_PIECE]);
 
-  sf::Font font = loadFont();
-  sf::RenderWindow window(sf::VideoMode(SCR_W, SCR_H), TITLE);
+  const std::shared_ptr<std::vector<std::shared_ptr<sf::Sprite>>> roll_sprites =
+    createRollSprites((*textures)[ROLL_TILES[0]], (*textures)[ROLL_TILES[1]]);
 
-  sf::Text p1ScoreMsg(std::to_string(p1->score), font, 36);
-  p1ScoreMsg.setPosition(TEXT_OFFSET, SCR_H - p1ScoreMsg.getGlobalBounds().height - (TEXT_OFFSET * 2));
-  auto p1HudY = SCR_H - p1ScoreMsg.getGlobalBounds().height - TEXT_OFFSET - SPRITE_SIZE;
-  auto p1PieceOffset =  p1ScoreMsg.getGlobalBounds().width + PAD;
+  const std::shared_ptr<std::vector<struct dice_t>> dice =
+    createAllDice((*textures)[DIE_0], (*textures)[DIE_1]);
 
-  sf::Text p2ScoreMsg(std::to_string(p2->score), font, 36);
-  p2ScoreMsg.setPosition(TEXT_OFFSET, (SPRITE_SIZE / ZOOM / 2.f) - (p2ScoreMsg.getGlobalBounds().height / 2.f));
-  auto p2PieceOffset = p2ScoreMsg.getGlobalBounds().width + PAD;
-  auto p2HudY = TEXT_OFFSET / 2.f + SPRITE_SIZE;
+  sf::Sprite p1Score;
+  p1Score.setPosition(pos(0, SPRITE_ROWS - 1));
+  makeNum(&p1Score, 0, textures);
+
+  sf::Sprite p2Score;
+  p2Score.setPosition(pos(0, 0));
+  makeNum(&p2Score, 0, textures);
+
+  sf::RenderWindow window(sf::VideoMode(SCR_W, SCR_H), TITLE);
+  window.setFramerateLimit(60);
+  window.setVerticalSyncEnabled(true);
 
   sf::View view(window.getDefaultView());
   view.zoom(ZOOM);
   view.setSize(view.getSize() * ZOOM);
   view.setCenter(view.getSize() / 2.f);
 
-  sf::Sprite s((*textures)[0]);
-  s.setPosition(0, 0);
   while (window.isOpen()) {
 
     sf::Event event;
@@ -61,25 +160,55 @@ main()
           sf::Keyboard::isKeyPressed(sf::Keyboard::Q)) {
         window.close();
       }
+
+      if (sf::Mouse::isButtonPressed(sf::Mouse::Button::Left)) {
+        if (state == GameState::WAITING) {
+          window.setView(view);
+          auto mPos = window.mapPixelToCoords(sf::Mouse::getPosition(window));
+          std::cout << "Pressed!: " << mPos.x << ", " << mPos.y << std::endl;
+          for (auto s : (*roll_sprites)) {
+            // zoom sprite bounds
+            if (s->getGlobalBounds().contains(mPos)) {
+              change_state(GameState::ROLLING);
+              break;
+            }
+          }
+          if (state == GameState::ROLLING) {
+            for (auto s : (*roll_sprites)) {
+              s->setColor(GREY);
+            }
+          }
+
+          window.setView(window.getDefaultView());
+        }
+      }
     }
 
     window.clear(BG_COLOR);
     window.setView(view);
-    int p_num = 0;
-    for (auto p : *(p1->pieces))
-    {
-      p->sprite.setPosition(SPRITE_SIZE + PIECE_PAD + (p_num++ * SPRITE_SIZE), view.getSize().y - SPRITE_SIZE);
+
+    for (auto s : *(board)) {
+      window.draw(s);
+    }
+
+    // draw unused pieces
+    int p_num = (SPRITE_COLS / 2) - (p1->pieces->size() / 2) - 1;
+    for (auto p : *(p1->pieces)) {
+      p->sprite.setPosition(pos(p_num++, SPRITE_ROWS - 1));
       window.draw(p->sprite);
     }
-    for (int i = 0; i < 7; i++)
-    {
-      sf::Sprite s((*textures)[P2_PIECE]);
-      s.setPosition(SPRITE_SIZE + PIECE_PAD + (i * SPRITE_SIZE), 0.f);
-      window.draw(s);
+
+    p_num = (SPRITE_COLS / 2) - (p2->pieces->size() / 2) - 1;
+    for (auto p : *(p2->pieces)) {
+      p->sprite.setPosition(pos(p_num++, 0));
+      window.draw(p->sprite);
     }
+
+    render_dice(&window, dice, roll_sprites);
+
+    window.draw(p1Score);
+    window.draw(p2Score);
     window.setView(window.getDefaultView());
-    window.draw(p1ScoreMsg);
-    window.draw(p2ScoreMsg);
     window.display();
   }