Changeset 12307 for code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc

Timestamp:

Apr 18, 2019, 3:00:44 PM (5 years ago)

Author:

ahuwyler

Message:

A Stone is in the game/ Templates are ajusted

File:

• code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified) (11 diffs)

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc

@@ -68 +68 @@
         this->center_ = nullptr;
         this->ball_ = nullptr;
-        this->bat_[0] = nullptr;
         this->futureWall_ = nullptr;
-
-        //this->setHUDTemplate("pongHUD");
+        this->player_ = nullptr;
+        
+
+        this->setHUDTemplate("OrxoBloxHUD");
         //Error when specified
 
@@ -78 +79 @@
         this->starttimer_.stopTimer();
 
-        // Set the type of Bots for this particular Gametype.
-        this->botclass_ = Class(OrxoBloxBat);
-
-        this->scoreLimit_ = 10;
-        this->setConfigValues();
+        
+
     }
 
@@ -95 +93 @@
     }
 
-    void OrxoBlox::setConfigValues()
-    {
-        SetConfigValue(scoreLimit_, 10).description("The player first reaching those points wins.");
-    }
-
     /**
     @brief
@@ -112 +105 @@
         }
 
-        // Destroy both bats, if present.
-        for (size_t i = 0; i < 2; ++i)
-        {
-            if (this->bat_[0] != nullptr)
-            {
-                this->bat_[0]->destroy();
-                this->bat_[0] = nullptr;
-            }
-        }
-
-    }
-
-    /**
-    @brief
+        if (this->futureWall_)
+            {
+                this->futureWall_->destroy();
+                this->futureWall_ = nullptr;
+            }
+
+        // Destroy 6 bWalls, if present.
+        for (size_t i = 0; i < 6; ++i)
+        {
+            if (this->activeWalls_[0] != nullptr)
+            {
+                this->activeWalls_[0]->destroy();
+                this->activeWalls_[0] = nullptr;
+            }
+            
+        }
+
+    }
+
+    /**
+    @brieftt    
         Starts the OrxoBlox minigame.
     */
@@ -141 +141 @@
             // Attach the ball to the centerpoint and set the parameters as specified in the centerpoint, the ball is attached to.
             this->center_->attach(this->ball_);
-            this->ball_->setPosition(0,0,50); //Startposition
+            this->ball_->setPosition(0, 0, 50);
             this->ball_->setFieldDimension(this->center_->getFieldDimension());
             this->ball_->setSpeed(0);
             this->ball_->setAccelerationFactor(this->center_->getBallAccelerationFactor());
             this->ball_->setBatLength(this->center_->getBatLength());
+
+
+
+
 
             // If one of the bats is missing, create it. Apply the template for the bats as specified in the centerpoint.
@@ -157 +161 @@
             }
 
-            // Attach the bats to the centerpoint and set the parameters as specified in the centerpoint, the bats are attached to.
-            this->center_->attach(this->bat_[0]);
-            this->center_->attach(this->bat_[1]);
-            this->bat_[0]->setPosition(-this->center_->getFieldDimension().x / 2, 0, 0);
-            this->bat_[0]->yaw(Degree(-90));
-            this->bat_[0]->setSpeed(this->center_->getBatSpeed());
-            this->bat_[0]->setFieldHeight(this->center_->getFieldDimension().y);
-            this->bat_[0]->setLength(this->center_->getBatLength());
-
-            // Set the bats for the ball.
-            this->ball_->setBats(this->bat_);
+
+            // Create the first Wall.
+            this->createWall();
+            orxout()<< "helloo"<< endl;
+
         }
         else // If no centerpoint was specified, an error is thrown and the level is exited.
@@ -188 +186 @@
         // Reset the variable.
         this->bForceSpawn_ = temp;
-
     }
 
@@ -220 +217 @@
     }
 
+
     /**
     @brief
@@ -228 +226 @@
     void OrxoBlox::spawnPlayer(PlayerInfo* player)
     {
-        assert(player);
-
-        // If the first (left) bat has no player.
-        if (this->bat_[0]->getPlayer() == nullptr)
-        {
-            player->startControl(this->bat_[0]);
+         assert(player);
+
+        if(this->player_ == nullptr)
+        {
+            this->player_ = player;
             this->players_[player].state_ = PlayerState::Alive;
         }
-        else
-            return;
     }
 
@@ -244 +239 @@
         Is called when the player scored.
     */
-    void OrxoBlox::playerScored(PlayerInfo* player, int score)
-    {
-        Deathmatch::playerScored(player, score);
-
-        if (this->center_ != nullptr) // If there is a centerpoint.
-        {
-            // Fire an event for the player that has scored, to be able to react to it in the level, e.g. by displaying fireworks.
-            
-            if (player == this->getLeftPlayer())
-                this->center_->fireEvent(FireEventName(OrxoBloxCenterpoint, left));
-
-            // Also announce, that the player has scored.
-            if (player != nullptr)
-                this->gtinfo_->sendAnnounceMessage(player->getName() + " scored");
-        }
-
-        // If there is a ball present, reset its position, velocity and acceleration.
-        if (this->ball_ != nullptr)
-        {
-            this->ball_->setPosition(Vector3::ZERO);
-            this->ball_->setVelocity(Vector3::ZERO);
-            this->ball_->setAcceleration(Vector3::ZERO);
-            this->ball_->setSpeed(0);
-        }
-
-        // If there are bats reset them to the middle position.
-        if (this->bat_[0] != nullptr && this->bat_[1] != nullptr)
-        {
-            this->bat_[0]->setPosition(-this->center_->getFieldDimension().x / 2, 0, 0);
-            
-        }
-
-
-        // Restart the timer to start the ball.
-        this->starttimer_.startTimer();
-    }
-
-    /*void OrxoBlox::createStonewall(void){
-        this->futureWall_ = new OrxoBolxWall(this->center_->getContext());
-    }
-
-    /*void Tetris::createBrick(void)             //TODO: random rotation offset between 0 and 3 (times 90°)
-    {
-        // create new futureBrick_
-        this->futureBrick_ = new TetrisBrick(this->center_->getContext());
-
-
+    
+    //void startWall(void);
+    
+
+
+    void OrxoBlox::createWall(void){
+        this->futureWall_ = new OrxoBloxWall(this->center_->getContext());
         // Apply the stone template to the stone.
-        this->futureBrick_->addTemplate(this->center_->getBrickTemplate());
+        this->futureWall_->addTemplate(this->center_->getWallTemplate());
 
         // Attach the brick to the Centerpoint and set the position of the brick to be at the left side.
-        this->center_->attach(this->futureBrick_);
-        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);
-    }
-
-    }*/
+        this->center_->attach(this->futureWall_);
+        
+        
+        this->futureWall_->setPosition(10, 10, 0.0f);
+        this->futureWall_->setGame(this);
+    }
+
+    // void OrxoBlox::createWall(void)             //TODO: random rotation offset between 0 and 3 (times 90°)
+    // {
+    //     // create new futureBrick_
+    //     this->futureWall_ = new TetrisBrick(this->center_->getContext());
+
+
+    //     // Apply the stone template to the stone.
+    //     this->futureBrick_->addTemplate(this->center_->getBrickTemplate());
+
+    //     // Attach the brick to the Centerpoint and set the position of the brick to be at the left side.
+    //     this->center_->attach(this->futureBrick_);
+    //     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);
+    // }
 
     /**
@@ -315 +285 @@
     }
 
-    /**
-    @brief
-        Get the left player.
-    @return
-        Returns a pointer to the player playing on the left. If there is no left player, nullptr is returned.
-    */
-    PlayerInfo* OrxoBlox::getLeftPlayer() const
-    {
-        if (this->bat_[0] != nullptr)
-            return this->bat_[0]->getPlayer();
-        else
-            return nullptr;
-    }
-
+    
     
 }