Changeset 8488 for code/branches/tetris

Timestamp:

May 16, 2011, 3:13:56 PM (14 years ago)

Author:

youngk

Message:

Created a skeleton for the position validation of a stone.

Location:

code/branches/tetris/src/modules/tetris

Files:

• Tetris.cc (modified) (2 diffs)
• Tetris.h (modified) (1 diff)

code/branches/tetris/src/modules/tetris/Tetris.cc

@@ -90 +90 @@
         if(stone != NULL)
         {
+            // Get the current position of the active stone
             Vector3 position = stone->getPosition();
-            if(position.x < this->center_->getStoneSize()/2.0)
+            
+            if(position.x < this->center_->getStoneSize()/2.0)  //!< If the stone touches the left edge of the level
                 position.x = this->center_->getStoneSize()/2.0;
-            else if(position.x > (this->center_->getWidth()-0.5)*this->center_->getStoneSize())
+            else if(position.x > (this->center_->getWidth()-0.5)*this->center_->getStoneSize()) //!< If the stone touches the right edge of the level
                 position.x = (this->center_->getWidth()-0.5)*this->center_->getStoneSize();
-            
-            if(position.y < this->center_->getStoneSize()/2.0)
+
+            if(!this->correctStonePos(stone)) //!< If the stone touches another stone
+            {
+                stone->setVelocity(Vector3::ZERO);
+                this->createStone();
+                this->startStone();
+            }
+
+            if(position.y < this->center_->getStoneSize()/2.0) //!< If the stone has reached the bottom of the level
             {
                 position.y = this->center_->getStoneSize()/2.0;
@@ -222 +231 @@
     /**
     @brief
+        Validate the stone position.
+    @return
+        Returns whether the supplied stone is in the correct position.
+    */
+    bool Tetris::correctStonePos(TetrisStone* stone)
+    {
+        for(std::vector<TetrisStone*>::const_iterator it = this->stones_.begin(); it != this->stones_.end(); ++it)
+        {
+            TetrisStone* currentStone = it->_Ptr(); //!< Gives access to the current stone in the list
+            Vector3 currentStonePosition = it->_Ptr()->getPosition(); //!< Saves the position of the currentStone
+            Vector3 stonePosition = stone->getPosition(); //!< Saves the position of the supplied stone
+            
+            // @TODO:   Use the TetrisStone member functions to check both stones for an overlap.
+            //          Also make sure to correct the stone position accordingly.
+            //
+            // This case applies if the stones overlap completely
+            //if((stonePosition.x == currentStonePosition.x) && (stonePosition.y == currentStonePosition.y))
+            // This case applies if the stones overlap partially vertically
+            //if(stonePosition.y - stone->getHeight()/2 < currentStonePosition.y + currentStone->getHeight()/2)
+
+            
+        }
+    }
+
+    /**
+    @brief
         Get the player.
     @return

code/branches/tetris/src/modules/tetris/Tetris.h

@@ -80 +80 @@
             void createStone(void);
             void cleanup(void); //!< Cleans up the Gametype by destroying the ball and the bats.
+            bool correctStonePos(TetrisStone* stone); //!< Check whether the supplied stone is in an allowed position
             
             PlayerInfo* player_;