Changeset 9801 for code/trunk/src

Timestamp:

Nov 21, 2013, 9:26:33 PM (11 years ago)

Author:

jo

Message:

Eridicating a Tetris Bug, related to the positioning of a TetrisBrick in case of a brick-bottom-collision.

Location:

code/trunk/src/modules/tetris

Files:

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

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

@@ -50 +50 @@
 #include "TetrisBrick.h"
 #include "infos/PlayerInfo.h"
+#include <cmath>
 
 namespace orxonox
@@ -210 +211 @@
         if(position.y < this->center_->getStoneSize()/2.0f) //!< If the stone has reached the bottom of the level
         {
-            float yOffset = stone->getPosition().y + this->center_->getStoneSize()/2.0f;//calculate offset
+            float baseOffset = abs(stone->getPosition().y);
+            if (this->activeBrick_->getRotationCount() == 1 || this->activeBrick_->getRotationCount() == 3)
+                baseOffset = abs(stone->getPosition().x);
+            float yOffset = baseOffset + this->center_->getStoneSize()/2.0f;//calculate offset
             if(yOffset < 0) //catch brake-throughs
                 yOffset = 0;
@@ -388 +392 @@
         float xPos = (this->center_->getWidth()*1.6f + ((this->center_->getWidth() % 2)*2-1)/2.0f)*this->center_->getStoneSize();
         float yPos = (this->center_->getHeight()-5.1f)*this->center_->getStoneSize();
+        
         this->futureBrick_->setPosition(xPos, yPos, 0.0f);
         this->futureBrick_->setGame(this);

code/trunk/src/modules/tetris/TetrisBrick.cc

@@ -107 +107 @@
         {
             stone->setPosition(0.0f, 0.0f, 0.0f);
+            stone->setName("Base");
         }
         else if(i == 1)
         {
             stone->setPosition(0.0f, size_, 0.0f);
+            stone->setName("Y");
         }
         else if(i == 2)
@@ -117 +119 @@
             {
                 stone->setPosition(0.0f, 2*size_, 0.0f);
+                stone->setName("2Y");
             }
             else if(this->shapeIndex_ == 3 || this->shapeIndex_ == 4|| this->shapeIndex_ == 5)
             {
                 stone->setPosition(size_, 0, 0.0f);
+                stone->setName("X");
             }
             else if(this->shapeIndex_ == 2)
             {
                 stone->setPosition(-size_, 0, 0.0f);
+                stone->setName("-X");
             }
         }
@@ -132 +137 @@
             {
                 stone->setPosition(size_, size_, 0.0f);
+                stone->setName("XY");
             }
             else if(this->shapeIndex_ == 1)
             {
                 stone->setPosition(0, 3*size_, 0.0f);
+                stone->setName("3Y");
             }
             else if(this->shapeIndex_ == 3 || this->shapeIndex_ == 7)
             {
                 stone->setPosition(-size_, 0, 0.0f);
+                stone->setName("-X");
             }
             else if(this->shapeIndex_ == 4)
             {
                 stone->setPosition(-size_, size_, 0.0f);
+                stone->setName("-XY");
             }
             else if(this->shapeIndex_ == 6)
             {
                 stone->setPosition(size_, 0, 0.0f);
+                stone->setName("X");
             }
         }

code/trunk/src/modules/tetris/TetrisScore.h

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Johannes Ritz
  *   Co-authors:
  *      ...