Changeset 9329

Timestamp:

Jul 22, 2012, 6:46:05 PM (12 years ago)

Author:

landauf

Message:

fixed collision bug in tetris which made stones overlap in some cases (especially with low fps or high game speed)

Location:

code/branches/presentation2012merge/src/modules/tetris

Files:

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

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

@@ -118 +118 @@
         {
             this->endGameCriteria_ += dt;
-            if(!this->isValidBrickPosition(this->activeBrick_, this->activeBrick_->getPosition()))
+            if(!this->isValidBrickPosition(this->activeBrick_))
             {
                 for (unsigned int i = 0; i < this->activeBrick_->getNumberOfStones(); i++)
@@ -195 +195 @@
         assert(stone);
 
-        // we use a reverse iterator because we have to check for collisions with the topmost stones first
-        for(std::list<SmartPtr<TetrisStone> >::const_reverse_iterator it = this->stones_.rbegin(); it != this->stones_.rend(); ++it)
+        // check for collisions with all stones
+        for(std::list<SmartPtr<TetrisStone> >::const_iterator it = this->stones_.begin(); it != this->stones_.end(); ++it)
         {
             //Vector3 currentStonePosition = rotateVector((*it)->getPosition(), this->activeBrick_->getRotationCount());
@@ -231 +231 @@
      *
      */
-    bool Tetris::isValidBrickPosition(TetrisBrick* brick, const Vector3& position)
+    bool Tetris::isValidBrickPosition(TetrisBrick* brick)
     {
         assert(brick);
 
+        const Vector3& brickPosition = this->activeBrick_->getPosition();
+
+        // check all stones in the brick
         for (unsigned int i = 0; i < brick->getNumberOfStones(); i++ )
         {
             TetrisStone* stone = brick->getStone(i);
-            Vector3 stonePosition = rotateVector(stone->getPosition(), brick->getRotationCount());
-            if(! this->isValidStonePosition(stone, position + stonePosition) )
+            const Vector3& stonePosition = rotateVector(stone->getPosition(), brick->getRotationCount());
+            if(! this->isValidStonePosition(stone, brickPosition + stonePosition) )
+            {
+                // recurse because all stones have to checked again after the brick was re-positioned
+                this->isValidBrickPosition(brick);
                 return false;
+            }
         }
         return true;

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

@@ -84 +84 @@
             void cleanup(void); //!< Cleans up the Gametype by destroying the ball and the bats.
             bool isValidStonePosition(TetrisStone* stone, const Vector3& position);
-            bool isValidBrickPosition(TetrisBrick* brick, const Vector3& position);
+            bool isValidBrickPosition(TetrisBrick* brick);
             void findFullRows(void);
             void clearRow(unsigned int row);