Changeset 11613 for code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DShip.h

Timestamp:

Nov 30, 2017, 6:34:56 PM (6 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.

File:

• code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DShip.h (modified) (5 diffs)

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;
     };
 }