Changeset 9085 for code/branches/pCuts

Timestamp:

Apr 13, 2012, 5:44:29 PM (13 years ago)

Author:

jo

Message:

backup checkin - still the same bugs experiencable

Location:

code/branches/pCuts

Files:

• data/levels/tetris.oxw (modified) (1 diff)
• src/modules/tetris/Tetris.cc (modified) (6 diffs)
• src/modules/tetris/TetrisBrick.cc (modified) (2 diffs)
• src/modules/tetris/TetrisBrick.h (modified) (1 diff)
• src/modules/tetris/TetrisStone.cc (modified) (1 diff)

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

@@ -47 +47 @@
 <Template name=tetrisbrick>
   <TetrisBrick camerapositiontemplate=tetrisbrickcameras>
-    <attached>
-      <Model position="0,0,0" mesh="crate.mesh" scale=1 />
-    </attached>
   </TetrisBrick>
 </Template>

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

@@ -99 +99 @@
             {
                 this->activeBrick_->setVelocity(Vector3::ZERO);
+                this->activeBrick_->releaseStones(this->center_);
+                //delete this->activeBrick_; //releasing the memory
                 this->createBrick();
                 this->startBrick();
@@ -120 +122 @@
 
             const Vector3& currentStonePosition = (*it)->getPosition(); //!< Saves the position of the currentStone
+            orxout()<< "position.x: " << position.x << endl;
+            orxout()<< "currentStonePosition.x: " << currentStonePosition.x << endl;
+            if(position.x == currentStonePosition.x)
+                orxout()<< "NON Valid Move Candidate" <<endl;
 
             if((position.x == currentStonePosition.x) && abs(position.y-currentStonePosition.y) < this->center_->getStoneSize())
@@ -145 +151 @@
                 stonePosition = rotateVector(stone->getPosition(), brick->getRotationCount());
 
-            /*orxout()<< "stoneRelativePoistion: " << stonePosition << endl;
-            orxout()<< "stoneTotalPoistion   : " << position + stonePosition << endl;*/
-
             if(! this->isValidMove(stone, position + stonePosition )) // wrong position??
             {
@@ -168 +171 @@
             if(this->activeBrick_->contains(*it))
                 continue;
-//TODO: is this rotation correct ??
-            Vector3 currentStonePosition = rotateVector((*it)->getPosition(), this->activeBrick_->getRotationCount());
+            //Vector3 currentStonePosition = rotateVector((*it)->getPosition(), this->activeBrick_->getRotationCount());
+            const Vector3& currentStonePosition = (*it)->getPosition(); //!< Saves the position of the currentStone
             //!< Saves the position of the currentStone
+            if(position.x == currentStonePosition.x)
+            {
+                orxout()<< "candidate found" << endl;
+                orxout()<< "position.y: "<< position.y << endl;
+                orxout()<< "urrentStonePosition.y: " << currentStonePosition.y << endl;
+            }
 
             if((position.x == currentStonePosition.x) && (position.y < currentStonePosition.y + this->center_->getStoneSize()))
             {//TODO: Why are such events not detected ??
+             // Because currentStonePosition.x isn't calculated globally, but locally
                 orxout()<< "YEAY !!"<<endl;
                 this->activeBrick_->setPosition(Vector3(this->activeBrick_->getPosition().x, currentStonePosition.y+this->center_->getStoneSize(), this->activeBrick_->getPosition().z));
@@ -207 +217 @@
     /**
     @brief
-        Nasty function that allocates memory!! it rolls a vector 90° * amount
+        A Vector3 is rolled 90 * degrees * amount (anticlockwise rotation)
     */
     Vector3 Tetris::rotateVector(Vector3 position, unsigned int amount)
     {
-
         int temp = 0;
         for(unsigned int i = 0; i < amount; i++)
@@ -230 +239 @@
         if (this->center_ != NULL) // There needs to be a TetrisCenterpoint, i.e. the area the game takes place.
         {
-            // Create the first stone.
+            // Create the first brick.
             this->createBrick();
         }

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

@@ -53 +53 @@
         RegisterObject(TetrisBrick);
 
-        this->shapeIndex_ = 1; //<! TODO: random number between 0 and 7
+        this->shapeIndex_ = 4; //<! TODO: random number between 0 and 7
         this->stonesPerBrick_ = 4; //<! most tetris bricks is formed by 4 stones
         this->delay_ = false;
@@ -241 +241 @@
         this->setVelocity(0.0f, 0.0f, 0.0f);
     }
+    /**
+    @brief
+        Attaches stones to the Centerpoint.
+    */
+    void TetrisBrick::releaseStones(TetrisCenterpoint* center)
+    {
+        for(unsigned int i = 0; i < brickStones_.size(); i++)
+        {
+            //this->brickStones_[i]->detachFromParent();
+
+            //this->brickStones_[i]->detach(this);
+            //this->brickStones_[i]->attach(center);
+        }
+
+    }
 
 }

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

@@ -72 +72 @@
                 { return this->rotationCount_;}
 
+            void releaseStones(TetrisCenterpoint* center);
+
         protected:
             void createBrick(void); //!< Create a cluster of TetrisStones

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

@@ -72 +72 @@
         else if(!this->lockRotation_) //rotate when key up is pressed
         {
-            orxout() << "The object should be rolled soon." << endl;
             this->lockRotation_ = true; // multiple calls of this function have to be filtered out.
             this->rotationTimer_.setTimer(0.1f, false, createExecutor(createFunctor(&TetrisStone::unlockRotation, this)));