Changeset 12370 for code/branches/OrxoBlox_FS19/src

Timestamp:

May 16, 2019, 1:13:21 PM (6 years ago)

Author:

ahuwyler

Message:

We have new template

Location:

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox

Files:

• OrxoBlox.cc (modified) (2 diffs)
• OrxoBlox.h (modified) (1 diff)
• OrxoBloxPrereqs.h (modified) (1 diff)
• OrxoBloxShip.cc (modified) (1 diff)
• OrxoBloxShip.h (modified) (2 diffs)

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

@@ -173 +173 @@
         // Set variable to temporarily force the player to spawn.
         //bool temp = this->bForceSpawn_;
-        this->bForceSpawn_ = true;
+        this->bForceSpawn_ = false;
 
         // Call start for the parent class.
@@ -307 +307 @@
             if((BallPosition.x - Ball->getRadius() >= StonePosition.x - size && BallPosition.x + Ball->getRadius() <= StonePosition.x + size) && 
                 (BallPosition.z - Ball->getRadius() >= StonePosition.z - size && BallPosition.z + Ball->getRadius() <= StonePosition.z + size)) {
-                orxout() << "FOUND ONE" << endl;
+                //orxout() << "FOUND ONE" << endl;
                 return someStone;
             }

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

@@ -90 +90 @@
                 { return this->center_; }
             OrxoBloxStones* CheckForCollision(OrxoBloxBall* Ball);
-
+            virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command
         protected:
         private:

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

@@ -74 +74 @@
     class OrxoBloxStones;
     class OrxoBloxScore;
+    class OrxoBloxShip;
 }
 

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

@@ -71 +71 @@
         SUPER(OrxoBloxShip, tick, dt);
         Vector3 pos = this->getPosition();
+        this->setPosition(pos);
+    }   
 
+    void OrxoBloxShip::boost(bool bBoost)
+    {
     }
 
-    OrxoBlox* OrxoBloxShip::getGame()
-    {
-        if (game == nullptr)
-        {
-            for (OrxoBlox* race : ObjectList<OrxoBlox>())
-            {
-                game = race;
-            }
-        }
-        return game;
-    }
-    void OrxoBloxShip::death()
-    {
-        SpaceShip::death();
-    }
 }
 

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

@@ -51 +51 @@
 
             //no rotation in x and z direction!
-            virtual void rotatePitch(const Vector2& value) override{}; // Rotate in pitch direction.
+            //virtual void rotatePitch(const Vector2& value) override{}; // Rotate in pitch direction.
+            //Yaw
             virtual void rotateRoll(const Vector2& value) override{}; // Rotate in roll direction.
+            virtual void boost(bool boost) override; //Override, so that the ship does not shake
             
             /*Functions that can be helpful while debugging.
@@ -68 +70 @@
 
         protected:
-            virtual void death() override;
         private:
             OrxoBlox* getGame();