Changeset 12367 for code/branches/OrxoBlox_FS19/src

Timestamp:

May 16, 2019, 11:00:57 AM (6 years ago)

Author:

ahuwyler

Message:

We have a spaceship!

Location:

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox

Files:

• CMakeLists.txt (modified) (1 diff)
• OrxoBlox.cc (modified) (7 diffs)
• OrxoBlox.h (modified) (1 diff)
• OrxoBloxShip.cc (modified) (4 diffs)
• OrxoBloxShip.h (modified) (1 diff)

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt

@@ -7 +7 @@
   OrxoBloxStones.cc
   OrxoBloxScore.cc
-
+  OrxoBloxShip.cc
 
 )

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

@@ -129 +129 @@
     */
     void OrxoBlox::start()
+
     {
         if (this->center_ != nullptr) // There needs to be a OrxoBloxCenterpoint, i.e. the area the game takes place.
@@ -169 +170 @@
         // Set variable to temporarily force the player to spawn.
         // Set variable to temporarily force the player to spawn.
-        bool temp = this->bForceSpawn_;
+        //bool temp = this->bForceSpawn_;
         this->bForceSpawn_ = true;
 
@@ -176 +177 @@
 
         // Reset the variable.
-        this->bForceSpawn_ = temp;
+        //this->bForceSpawn_ = temp;
 
     }
@@ -206 +207 @@
     }
    
-    void OrxoBlox::spawnPlayer(PlayerInfo* player)
-    {
-        assert(player);
-
-        if(this->player_ == nullptr)
-        {
-            this->player_ = player;
-            this->players_[player].state_ = PlayerState::Alive;
-        }
-
-    }
+    // void OrxoBlox::spawnPlayer(PlayerInfo* player)
+    // {
+    //     assert(player);
+
+    //     if(this->player_ == nullptr)
+    //     {
+    //         this->player_ = player;
+    //         this->players_[player].state_ = PlayerState::Alive;
+    //     }
+
+    // }
 
     void OrxoBlox::LevelUp(){
@@ -287 +288 @@
     OrxoBloxStones* OrxoBlox::CheckForCollision(OrxoBloxBall* Ball) {
 
-        orxout() << "Checking for Collision" << endl;
+        //orxout() << "Checking for Collision" << endl;
         Vector3 BallPosition = Ball->getPosition();
         for(OrxoBloxStones* someStone : this->stones_)
@@ -295 +296 @@
                 continue;
             }
-            orxout() << "Checking a stone" << endl;
+            //orxout() << "Checking a stone" << endl;
             const Vector3& StonePosition = someStone->getPosition(); //!< Saves the position of the currentStone
             int size = someStone->getSize()/2;
@@ -307 +308 @@
         return nullptr;
     }
+
+    void OrxoBlox::playerPreSpawn(PlayerInfo* player)
+    {
+        this->player_ = player;
+    }
     
 }

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

@@ -74 +74 @@
 
             PlayerInfo* getPlayer();
-            void spawnPlayer(PlayerInfo* Player) override;
+            // void spawnPlayer(PlayerInfo* Player) override;
+            virtual void playerPreSpawn(PlayerInfo* player) override;
+
 
             void LevelUp();

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

@@ -34 +34 @@
 
 #include "OrxoBloxShip.h"
+#include "OrxoBlox.h"
 #include "core/CoreIncludes.h"
 
@@ -47 +48 @@
         this->width = 120;
         this->height = 100;
-        orxout() << "Spawned" << std::endl;
+        orxout() << "SPACESHIP Spawned" << std::endl;
 
         //timer.setTimer(3.5f, true, createExecutor(createFunctor(&OrxoBloxShip::showorientation, this)));
@@ -71 +72 @@
         Vector3 pos = this->getPosition();
 
-        //ensure that the ship stays in playing field
-        if(pos.x > width/2)   pos.x = -width/2;
-        if(pos.x < -width/2)  pos.x = width/2;
-
-        //2D movement, position should always = 0 on y-axis
-        if(pos.y!=0) pos.y = 0;
-        this->setPosition(pos);
-        if(pos.z!=50) pos.z = 50;
     }
 
@@ -97 +90 @@
     }
 }
+

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxShip.h

@@ -36 +36 @@
 
 
-#include "asteroids2D/Asteroids2DPrereqs.h"
+#include "OrxoBloxPrereqs.h"
 
 #include "worldentities/pawns/SpaceShip.h"