implementing jewels fall and rollup

Author: dpinol

JewelBoard.cpp

@@ -30,19 +30,17 @@ JewelBoard::JewelBoard() : BoardObject(),
   createInitialJewelsBoard();
 }
 
+
 void JewelBoard::createInitialJewelsBoard()
 {
-  for (unsigned y = 0 ; y <= BoardPos::BoardPos::NUM_ROWS ; ++y)
-  {
-    for (unsigned x = 0 ; x < BoardPos::BoardPos::NUM_COLS ; ++x)
+   forAllPos([&](BoardPos const pos)
     {
-      Jewel &jewel = m_model.getJewel(BoardPos(x, y), true);
+      Jewel &jewel = m_model.getJewel(pos, true);
       JewelObject *jo = new JewelObject(jewel);
-      m_jewels[y][x] = jo;
-      jo->getPixel().setX(m_offset.getX() + jo->getWidth() * x);
-      jo->getPixel().setY(m_offset.getY() + jo->getHeight() * y);
-    }
-  }
+      m_jewels[pos.m_row][pos.m_col] = jo;
+      Vector2D pixel = getJewelPixel(pos);
+      jo->getPixel() = pixel;
+    }, true);
 }
 
 void JewelBoard::kill(BoardPos pos)
@@ -96,6 +94,12 @@ void JewelBoard::draw()
   });
 }
 
+Vector2D JewelBoard::getJewelPixel(BoardPos pos) const
+{
+  return Vector2D(m_offset.getX() + JewelObject::WIDTH * pos.m_col,
+                m_offset.getY() + JewelObject::HEIGHT * pos.m_row);
+}
+
 BoardPos JewelBoard::getJewelAt(Vector2D const &v) const
 {
   if (!v.isInside(m_offset, m_bottomDown))
@@ -111,6 +115,26 @@ bool JewelBoard::swap(BoardPos const pos1, BoardPos const pos2)
   return sw.run();
 }
 
+void JewelBoard::shiftDown(BoardPos pos)
+{
+  JewelObject &jo = getJewel(pos);
+  //it will be reset to falling if lower jewel is detected to be empty
+  jo.setFalling(false);
+  if (pos.m_row < BoardPos::NUM_ROWS)
+    getJewel(BoardPos(pos.m_col, pos.m_row + 1)).getModel() = jo.getModel();
+  else
+  {
+    BoardPos fallPos(pos.m_col, BoardPos::NUM_ROWS);
+    JewelObject &last = getJewel(fallPos);
+    while(fallPos.m_row > 0)
+    {
+      m_jewels[fallPos.m_row][fallPos.m_col] = m_jewels[fallPos.m_row - 1][fallPos.m_col];
+      fallPos.m_row--;
+    }
+    m_jewels[0][fallPos.m_col] = &last;
+    m_jewels[0][fallPos.m_col]->getModel().setColor(random() % Jewel::NUM_COLORS);
+  }
+}
 
 
 void JewelBoard::update()
@@ -125,11 +149,18 @@ void JewelBoard::update()
   forAllPos([&](BoardPos pos)
   {
     JewelObject &jo = getJewel(pos);
-    if ((jo.isFalling() || jo.isDead()) && pos.m_row < BoardPos::NUM_ROWS)
+    if(jo.getFallingStep() == 10)
+      shiftDown(pos);
+    if (jo.isFalling() || jo.isDead())
     {
-      getJewel(BoardPos(pos.m_col, pos.m_row + 1)).setFalling(true);
+      getJewel(BoardPos(pos.m_col, pos.m_row - 1)).setFalling(true);
     }
     jo.update();
+    if (jo.isFalling())
+    {
+      m_pixel.setY(m_pixel.getY() + m_height / 10.0); //jo.getFallingStep() *
+    }
+
   });
 }
 

JewelBoard.h

@@ -1,13 +1,13 @@
-//
-//  JewelBoard.h
-//  SDL Game Programming Book
-//
-//  Created by shaun mitchell on 26/03/2013.
-//  Copyright (c) 2013 shaun mitchell. All rights reserved.
-//
+/**************************************************************************
+** Qt Creator license header template
+**   Special keywords: dpinol 03/03/2014 2014
+**   Environment variables:
+**   To protect a percent sign, use '%'.
+**************************************************************************/
 
-#ifndef __SDL_Game_Programming_Book__JewelBoard__
-#define __SDL_Game_Programming_Book__JewelBoard__
+
+#ifndef JEWEL_BOARD
+#define JEWEL_BOARD
 
 #include <iostream>
 #include "model/BoardPos.h"
@@ -77,9 +77,11 @@ class JewelBoard : public BoardObject, BoardCallback
      * @return not valid board if not withn board
      */
     BoardPos getJewelAt(const Vector2D &pixel) const;
+    Vector2D getJewelPixel(BoardPos pos) const;
 
 private:
-
+    /** Move jewel to next row*/
+    void shiftDown(BoardPos pos);
 
     //extra row is for falling new jewels
     JewelObject* m_jewels[BoardPos::NUM_ROWS + 1][ BoardPos::NUM_COLS];
@@ -105,4 +107,4 @@ class JewelBoardCreator : public BaseCreator
     }
 };
 
-#endif /* defined(__SDL_Game_Programming_Book__JewelBoard__) */
+#endif /* JEWEL_BOARD */

JewelObject.cpp

@@ -13,7 +13,7 @@
 
 JewelObject::JewelObject(Jewel &jewel) :
   m_model(&jewel),
-  m_isFalling(false)
+  m_fallingStep(0)
 {
     m_pixel = Vector2D(0,0);
     m_currentRow = 0;
@@ -89,11 +89,19 @@ void JewelObject::doDyingAnimation()
 
 bool JewelObject::isFalling() const
 {
-  return m_isFalling;
+  return m_fallingStep != 0;
+}
+
+short JewelObject::getFallingStep() const
+{
+  return m_fallingStep;
 }
 
 void JewelObject::setFalling(bool falling)
 {
-  m_isFalling = falling;
+  if (falling)
+    m_fallingStep = 1;
+  else
+    m_fallingStep = 0;
 }
 

JewelObject.h

@@ -1,13 +1,13 @@
-//
-//  SDLGameObject.h
-//  SDL Game Programming Book
-//
-//  Created by shaun mitchell on 19/01/2013.
-//  Copyright (c) 2013 shaun mitchell. All rights reserved.
-//
+/**************************************************************************
+** Qt Creator license header template
+**   Special keywords: dpinol 03/03/2014 2014
+**   Environment variables:
+**   To protect a percent sign, use '%'.
+**************************************************************************/
 
-#ifndef __SDL_Game_Programming_Book__SDLGameObject__
-#define __SDL_Game_Programming_Book__SDLGameObject__
+
+#ifndef JEWEL_OBJECT_H
+#define JEWEL_OBJECT_H
 
 #include <SDL.h>
 #include "BoardObject.h"
@@ -41,7 +41,7 @@ class JewelObject : public BoardObject
   virtual void doDyingAnimation() override;
   bool isFalling() const;
   void setFalling(bool falling);
-
+  short getFallingStep() const;
 
 
   static constexpr short WIDTH = 35;
@@ -51,7 +51,7 @@ class JewelObject : public BoardObject
 
   //friend class JewelBoard;
   Jewel *m_model;
-  bool m_isFalling;
+  short m_fallingStep;
 
 };
-#endif /* defined(__SDL_Game_Programming_Book__SDLGameObject__) */
+#endif /* JEWEL_OBJECT_H */

main.cpp

@@ -1,5 +1,6 @@
 #include "Game.h"
 #include <utils/init.h>
+#include <utils/log.h>
 //#include "windows.h"
 #include <iostream>
 #include <stdlib.h>
@@ -10,41 +11,45 @@ const int DELAY_TIME = 1000.0f / FPS;
 int main(int argc, char const **argv)
 {
   dani::init::init(argc, argv);
-    if (argc > 1 && strcmp(argv[1], "--randomize") == 0)
-      srandom(time(NULL));
-
-//	AllocConsole();
+  if (argc > 1 && strcmp(argv[1], "--randomize") == 0)
+  {
+    time_t t = time(NULL);
+    //useful in case we want to repeat a given board
+    LOG_ERROR("Randomizing with value " << t);
+    srandom(t);
+  }
+  //	AllocConsole();
   //freopen("CON", "w", stdout);
-    Uint32 frameStart, frameTime;
+  Uint32 frameStart, frameTime;
 
-    std::cout << "game init attempt...\n";
-    if(TheGame::Instance()->init("SDL_test", 100, 100, 755, 600, false))
-    {
-        std::cout << "game init success!\n";
-        while(TheGame::Instance()->running())
-        {
-            frameStart = SDL_GetTicks();
-
-            TheGame::Instance()->handleEvents();
-            TheGame::Instance()->update();
-            TheGame::Instance()->render();
-
-            frameTime = SDL_GetTicks() - frameStart;
-
-            if(frameTime < DELAY_TIME)
-            {
-                SDL_Delay((int)(DELAY_TIME - frameTime));
-            }
-        }
-    }
-    else
+  std::cout << "game init attempt...\n";
+  if(TheGame::Instance()->init("SDL_test", 100, 100, 755, 600, false))
+  {
+    std::cout << "game init success!\n";
+    while(TheGame::Instance()->running())
     {
-        std::cout << "game init failure - " << SDL_GetError() << "\n";
-        return -1;
+      frameStart = SDL_GetTicks();
+
+      TheGame::Instance()->handleEvents();
+      TheGame::Instance()->update();
+      TheGame::Instance()->render();
+
+      frameTime = SDL_GetTicks() - frameStart;
+
+      if(frameTime < DELAY_TIME)
+      {
+        SDL_Delay((int)(DELAY_TIME - frameTime));
+      }
     }
+  }
+  else
+  {
+    std::cout << "game init failure - " << SDL_GetError() << "\n";
+    return -1;
+  }
 
-    std::cout << "game closing...\n";
-    TheGame::Instance()->clean();
+  std::cout << "game closing...\n";
+  TheGame::Instance()->clean();
 
-    return 0;
+  return 0;
 }

model/JewelSwap.cpp

@@ -46,8 +46,8 @@ bool JewelSwap::isValid() const
         m_valid = true;
   }
   m_validated = true;
-  if (!m_valid)
-    LOG_DEBUG("Swap " << m_positions[0] << "-" << m_positions[1] <<" not valid because it would not form a strike");
+  //if (!m_valid)
+  //  LOG_DEBUG("Swap " << m_positions[0] << "-" << m_positions[1] <<" not valid because it would not form a strike");
   return m_valid;
 }