Changeset 11613 for code/branches/Asteroid_HS17/src/modules

Timestamp:

Nov 30, 2017, 6:34:56 PM (7 years ago)

Author:

vyang

Message:

Geschwindigkeit im Level angepasst, Raumschiff kann das Spielfeld nicht mehr verlassen. TO DO: Rausfinden wie Rotation funktioniert → in Asteroid2DShip Funktionen Yaw, Pitch, Roll ueberladen oder im Levelfile anpassen.

Location:

code/branches/Asteroid_HS17/src/modules/asteroids2D

Files:

• Asteroids2D.cc (modified) (1 diff)
• Asteroids2D.h (modified) (1 diff)
• Asteroids2DCenterPoint.cc (modified) (1 diff)
• Asteroids2DShip.cc (modified) (3 diffs)
• Asteroids2DShip.h (modified) (5 diffs)

code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.cc

@@ -55 +55 @@
         pattern = 1;
         lastPosition = 0;
-        // spawn enemy every 3.5 seconds
-        //enemySpawnTimer.setTimer(3.5f, true, createExecutor(createFunctor(&Asteroids2D::spawnEnemy, this)));
         this->numberOfBots_ = 0; //sets number of default bots temporarly to 0
         this->center_ = nullptr;
         this->setHUDTemplate("Asteroids2DHUD");
     }
+
+
 
     void Asteroids2D::levelUp()

code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.h

@@ -89 +89 @@
             void costLife();
 
+
             bool bEndGame;
             bool bShowLevel;

code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DCenterPoint.cc

@@ -48 +48 @@
 
         this->checkGametype();
-        this->width_ = 200;
-        this->height_ = 120;
+        this->width_ = 1043;
+        this->height_ = 646;
     }
     /**

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

@@ -46 +46 @@
         isFireing = false;
         damping = 10;
+        this->width = 1043;
+        this->height = 646;
 
         // not sure if has to be zero?
@@ -51 +53 @@
         lastTimeLeft = 0;
         lastTime = 0;
+        timer.setTimer(3.5f, true, createExecutor(createFunctor(&Asteroids2DShip::showposition, this)));
+    }
+
+    //Use this function to display your position on the field -> to determine field width and height
+    void Asteroids2DShip::showposition()
+    {
+        Vector3 pos = this->getPosition();
+        orxout() << "x = "<< pos.x << " y = " << pos.y << " z = "<< pos.z << endl; 
     }
 
@@ -56 +66 @@
     {
         SUPER(Asteroids2DShip, tick, dt);
+        Vector3 pos = this->getPosition();
+
+        //haelt ship innerhalb des Kamerafensters, kommt oben bzw seitlich wieder raus. Man spawnt in (0,0)
+        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);
+
+        //update level
+
+        //shoot?
     }
 

code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DShip.h

@@ -45 +45 @@
 //#include "Asteroids2DCenterPoint.h"
 
+#include "tools/Timer.h"
+
+
 namespace orxonox
 {
@@ -61 +64 @@
             virtual void boost(bool bBoost) override;
 
-            //no rotation!
-            virtual void rotateYaw(const Vector2& value) override{};
-            virtual void rotatePitch(const Vector2& value) override{};
+            //no rotation in x and z direction!
+            virtual void rotateYaw(const Vector2& value) override{}; // Rotate in yaw direction.
+            virtual void rotatePitch(const Vector2& value) override{}; // Rotate in pitch direction.
+            virtual void rotateRoll(const Vector2& value) override{}; // Rotate in roll direction.
 
-            //return to main menu if game has ended.
-            virtual void rotateRoll(const Vector2& value) override{if (getGame()) if (getGame()->bEndGame) getGame()->end();};
+
 
             virtual void updateLevel();
@@ -74 +77 @@
             float speed, damping, posforeward;
             bool isFireing;
+            void showposition();
 
         protected:
@@ -80 +84 @@
         private:
             Asteroids2D* getGame();
+            float width, height;
             WeakPtr<Asteroids2D> game;
             WeakPtr<WorldEntity> lastEntity;
@@ -89 +94 @@
             } velocity, desiredVelocity;
 
+            Timer timer;
     };
 }