Changeset 12391 for code/branches/OrxoBlox_FS19/src

Timestamp:

May 16, 2019, 4:57:28 PM (6 years ago)

Author:

jeromela

Message:

Zielvisier eingefuegt

Location:

code/branches/OrxoBlox_FS19/src/modules

Files:

• OrxoBlox/OrxoBlox.cc (modified) (1 diff)
• OrxoBlox/OrxoBlox.h (modified) (1 diff)
• OrxoBlox/OrxoBloxShip.cc (modified) (1 diff)
• OrxoBlox/OrxoBloxShip.h (modified) (2 diffs)
• asteroids2D/Asteroids2DShip.cc (modified) (1 diff)

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

@@ -332 +332 @@
     }
     
+    void OrxoBlox::tick(float dt)
+    {        
+        SUPER(OrxoBlox, tick, dt);
+    }
 /*
     bool OrxoBlox::Intersect(int XpositionBall, int XPositionBlock, int YPositionBall, int YPositionBlock, int radiusBall, int sizeBlock) {

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

@@ -76 +76 @@
             // void spawnPlayer(PlayerInfo* Player) override;
             virtual void playerPreSpawn(PlayerInfo* player) override;
-
+            virtual void tick(float dt) override;
 
             void LevelUp();

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

@@ -69 +69 @@
     void OrxoBloxShip::tick(float dt)
     {
-        SUPER(OrxoBloxShip, tick, dt);
         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;
+        if(pos.z > height/2)  pos.z = -height/2;
+        if(pos.z < -height/2) pos.z = height/2;
+
+        //2D movement, position should always = 0 on y-axis
+        if(pos.y!=0) pos.y = 0;
         this->setPosition(pos);
+
+
+        //if you hit an asteroid, the ship will turn -> you need to reorientate the ship 
+        Quaternion ort = this->getOrientation();
+        ort.x = 0;
+        ort.z = 0;
+        this->setOrientation(ort);
     }   
 

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

@@ -53 +53 @@
             //virtual void rotatePitch(const Vector2& value) override{}; // Rotate in pitch direction.
             //Yaw
+            virtual void rotatePitch(const Vector2& value) override{}; // Rotate in pitch direction.
             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.
@@ -69 +71 @@
             }
 
-        protected:
+        //protected:
         private:
             OrxoBlox* getGame();

code/branches/OrxoBlox_FS19/src/modules/asteroids2D/Asteroids2DShip.cc

@@ -69 +69 @@
     void Asteroids2DShip::tick(float dt)
     {
-        SUPER(Asteroids2DShip, tick, dt);
+        //SUPER(Asteroids2DShip, tick, dt);
         Vector3 pos = this->getPosition();