Changeset 9084

Timestamp:

Apr 12, 2012, 7:05:57 PM (13 years ago)

Author:

jo

Message:

Rotating bricks works. Next step: repairing the collision detection.

Location:

code/branches/pCuts

Files:

• data/levels/tetris.oxw (modified) (2 diffs)
• src/modules/tetris/Tetris.cc (modified) (5 diffs)
• src/modules/tetris/Tetris.h (modified) (2 diffs)
• src/modules/tetris/TetrisBrick.cc (modified) (5 diffs)
• src/modules/tetris/TetrisBrick.h (modified) (3 diffs)
• src/orxonox/worldentities/ControllableEntity.cc (modified) (2 diffs)

code/branches/pCuts/data/levels/tetris.oxw

@@ -27 +27 @@
       <Model position="0,0,0" mesh="crate.mesh" scale=1 />
     </attached>
+    <!--collisionShapes>
+      <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
+    </collisionShapes-->
   </TetrisStone>
 </Template>
@@ -77 +80 @@
             <Model position="111,76,0" mesh="cube.mesh" scale3D="1,76,1" />
         </attached>
+        <!--collisionShapes>
+            <BoxCollisionShape position="55,-1,0"  halfExtents="57,1,11" />
+            <BoxCollisionShape position="-1,76,0"  halfExtents="1,76,1" />
+            <BoxCollisionShape position="111,76,0" halfExtents="1,76,1" />
+        </collisionShapes-->
     </TetrisCenterpoint>
 

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

@@ -130 +130 @@
     /**
     @brief
-        Check for each stone in a brick wether it is moved the right way.
-    */
-    bool Tetris::isValidMove(TetrisBrick* brick, const Vector3& position)
+        Check for each stone in a brick if it is moved the right way.
+    */
+    bool Tetris::isValidMove(TetrisBrick* brick, const Vector3& position, bool isRotation = false)
     {
         assert(brick);
@@ -139 +139 @@
         {
             TetrisStone* stone = brick->getStone(i);
-            if(! this->isValidMove(stone, position + stone->getPosition())) // wrong position??
+            Vector3 stonePosition;
+            if(isRotation)
+                stonePosition = rotateVector(stone->getPosition(), brick->getRotationCount()+1);
+            else
+                stonePosition = rotateVector(stone->getPosition(), brick->getRotationCount());
+
+            /*orxout()<< "stoneRelativePoistion: " << stonePosition << endl;
+            orxout()<< "stoneTotalPoistion   : " << position + stonePosition << endl;*/
+
+            if(! this->isValidMove(stone, position + stonePosition )) // wrong position??
+            {
                 return false;
-            orxout()<< "stoneRelativePoistion: " << stone->getPosition() << endl;
-            orxout()<< "stoneTotalPoistion: " << position + stone->getPosition() << endl;
+            }
         }
         return true;
@@ -159 +168 @@
             if(this->activeBrick_->contains(*it))
                 continue;
-
-            const Vector3& currentStonePosition = (*it)->getPosition(); //!< Saves the position of the currentStone
+//TODO: is this rotation correct ??
+            Vector3 currentStonePosition = rotateVector((*it)->getPosition(), this->activeBrick_->getRotationCount());
+            //!< Saves the position of the currentStone
 
             if((position.x == currentStonePosition.x) && (position.y < currentStonePosition.y + this->center_->getStoneSize()))
-            {
+            {//TODO: Why are such events not detected ??
+                orxout()<< "YEAY !!"<<endl;
                 this->activeBrick_->setPosition(Vector3(this->activeBrick_->getPosition().x, currentStonePosition.y+this->center_->getStoneSize(), this->activeBrick_->getPosition().z));
                 return false;
@@ -171 +182 @@
         // after we checked for collision with all stones, we also check for collision with the bottom
         if(position.y < this->center_->getStoneSize()/2.0f) //!< If the stone has reached the bottom of the level
-        {//TODO: correct positioning !!
-                this->activeBrick_->setPosition(Vector3(this->activeBrick_->getPosition().x, this->center_->getStoneSize()/2.0f, this->activeBrick_->getPosition().z));
+        {
+                int yOffset = stone->getPosition().y;//calculate offset
+                this->activeBrick_->setPosition(Vector3(this->activeBrick_->getPosition().x, this->center_->getStoneSize()/2.0f+yOffset, this->activeBrick_->getPosition().z));
             return false;
         }
@@ -186 +198 @@
         {
             TetrisStone* stone = brick->getStone(i);
-            if(! this->isValidStonePosition(stone, position + stone->getPosition()) ) // wrong position??
+            Vector3 stonePosition = rotateVector(stone->getPosition(), brick->getRotationCount());
+            if(! this->isValidStonePosition(stone, position + stonePosition) )
                 return false;
         }
         return true;
-
+    }
+
+    /**
+    @brief
+        Nasty function that allocates memory!! it rolls a vector 90° * amount
+    */
+    Vector3 Tetris::rotateVector(Vector3 position, unsigned int amount)
+    {
+
+        int temp = 0;
+        for(unsigned int i = 0; i < amount; i++)
+        {
+            temp = position.x;
+            position.x = -position.y;
+            position.y = temp;
+        }
+        return position;
     }
 

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

@@ -72 +72 @@
 
             bool isValidMove(TetrisStone* stone, const Vector3& position);
-            bool isValidMove(TetrisBrick* brick, const Vector3& position);
+            bool isValidMove(TetrisBrick* brick, const Vector3& position, bool isRotation);
 
         protected:
             virtual void spawnPlayersIfRequested(); //!< Spawns player.
+
 
         private:
@@ -83 +84 @@
             bool isValidStonePosition(TetrisStone* stone, const Vector3& position);
             bool isValidBrickPosition(TetrisBrick* brick, const Vector3& position);
+            Vector3 rotateVector(Vector3 position, unsigned int amount);
             
             PlayerInfo* player_;

code/branches/pCuts/src/modules/tetris/TetrisBrick.cc

@@ -53 +53 @@
         RegisterObject(TetrisBrick);
 
-        this->shapeIndex_ = 3; //<! TODO: random number between 0 and 7
+        this->shapeIndex_ = 1; //<! TODO: random number between 0 and 7
         this->stonesPerBrick_ = 4; //<! most tetris bricks is formed by 4 stones
         this->delay_ = false;
@@ -60 +60 @@
         this->tetris_ = this->getTetris();
         this->size_ = 10.0f; //TODO: fix this via this->tetris_->center_->getStoneSize();
-
-
+        this->rotationCount_ = 0;
         this->createBrick(); //<! create a whole new Brick;
     }
@@ -79 +78 @@
             // Create a new stone and add it to the brick.
             TetrisStone* stone = new TetrisStone(this);
-            stone->setHealth(1.0f); //TODO: is this value low enough ?
+            stone->setHealth(1.0f);
             this->brickStones_.push_back(stone);
             this->attach(stone);
@@ -156 +155 @@
     }
 
-    bool TetrisBrick::isValidMove(Vector3& position)
-    {
-
-        for(unsigned int i = 0; i < this->stonesPerBrick_ ; i++)
-        {//TODO: check if isValidMove works with this function,
-            if(this->tetris_->isValidMove(this->brickStones_[i], position))
-                continue;
-            else
-                return false;
-        }
-        return true;
+    bool TetrisBrick::isValidMove(const Vector3& position, bool isRotation = false)
+    {
+        return this->tetris_->isValidMove(this,position, isRotation);
     }
 
@@ -211 +202 @@
         else if(!this->lockRotation_) //rotate when key up is pressed
         {
-            orxout() << "The object should be rolled soon." << endl;
+                if(!isValidMove(this->getPosition(), true)) //catch illegal rotations
+                    return;
             this->lockRotation_ = true; // multiple calls of this function have to be filtered out.
             this->rotationTimer_.setTimer(0.1f, false, createExecutor(createFunctor(&TetrisBrick::unlockRotation, this)));
             Quaternion q(Degree(90), Vector3::UNIT_Z);
             this->setOrientation(this->getOrientation()*q); //rotation: roll 90°
-
+            this->rotationCount_ = (this->rotationCount_ + 1) % 4;
         }
     }

code/branches/pCuts/src/modules/tetris/TetrisBrick.h

@@ -61 +61 @@
             virtual void changedPlayer(); //!< Is called when the player changed.
 
-            bool isValidMove(Vector3& position);
+            bool isValidMove(const Vector3& position, bool isRotation);
             unsigned int getNumberOfStones(void) const
                 { return this->brickStones_.size(); }
@@ -69 +69 @@
             void setGame(Tetris* tetris)
                 { assert(tetris); tetris_ = tetris; }
+            unsigned int getRotationCount(void)
+                { return this->rotationCount_;}
 
         protected:
@@ -93 +95 @@
             bool lockRotation_;
 
+            unsigned int rotationCount_; //!< Stores the bricks orientation
             Timer delayTimer_;
             Timer rotationTimer_; ///!< This timer is used to filter out multiple rotation inputs.

code/branches/pCuts/src/orxonox/worldentities/ControllableEntity.cc

@@ -177 +177 @@
     {
         if (this->cameraPositions_.size() <= 0)
-            {orxout()<< "camareapositions_size == 0"<<endl ; return 0;}
+            return 0;
 
         unsigned int counter = 0;
@@ -196 +196 @@
         if(this->camera_ != NULL && this->cameraPositions_.size() > 0)
         {
-        orxout()<< "Cameraposition is set."<<endl;
             if(index >= this->cameraPositions_.size())
                 index = 0;