Changeset 10118 for code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.h

Timestamp:

Nov 12, 2014, 3:58:59 PM (11 years ago)

Author:

sriedel

Message:

Working atm. including function after function.

File:

• code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.h (modified) (3 diffs)

code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.h

@@ -38 +38 @@
 #include "dodgerace2/DodgeRacePrereqs.h"
 
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 #include "worldentities/pawns/SpaceShip.h"
 #include "graphics/Camera.h"
 #include "weapons/projectiles/Projectile.h"
-//#include "DodgeRace.h"
+
+#include "DodgeRace.h" // Is necessary for getGame function
 //#include "DodgeRaceCenterPoint.h"
 
 namespace orxonox
 {
-    class DodgeRaceShip : public SpaceShip
+    class _DodgeRaceExport DodgeRaceShip : public SpaceShip
     {
         public:
@@ -54 +57 @@
 
             // overwrite for 2d movement
-            virtual void moveFrontBack(const Vector2& value);
-            virtual void moveRightLeft(const Vector2& value);
+                    virtual void moveFrontBack(const Vector2& value);
+                    virtual void moveRightLeft(const Vector2& value);
 
-            // Starts or stops fireing
-            virtual void boost(bool bBoost);
+                    // Starts or stops fireing
+                    virtual void boost(bool bBoost);
 
-            //no rotation!
-            virtual void rotateYaw(const Vector2& value){};
-            virtual void rotatePitch(const Vector2& value){};
-            //return to main menu if game has ended.
-            virtual void rotateRoll(const Vector2& value){if (getGame()) if (getGame()->bEndGame) getGame()->end();};
+                    //no rotation!
+                    virtual void rotateYaw(const Vector2& value){};
+                    virtual void rotatePitch(const Vector2& value){};
 
-            virtual void updateLevel();
+                    //return to main menu if game has ended.
+                    virtual void rotateRoll(const Vector2& value){if (getGame()) if (getGame()->bEndGame) getGame()->end();};
+
+                    virtual void updateLevel();
+
+            float speed, damping, posforeward;
+            bool isFireing;
+
+        private:
+            WeakPtr<DodgeRace> getGame();
+            WeakPtr<DodgeRace> game;
+            Camera* camera;
+            float lastTimeFront, lastTimeLeft, lastTime;
+            struct Velocity
+            {
+                           float x;
+                           float y;
+            } velocity, desiredVelocity;
+
+
+
+
+/*
+
 
             //virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
@@ -74 +98 @@
 
         private:
-            WeakPtr<DodgeRace> getGame();
-            WeakPtr<DodgeRace> game;
-            Camera* camera;
-            bool isFireing;
-            float speed, damping, posforeward;
-            float lastTimeFront, lastTimeLeft, lastTime;
-            struct Velocity
-            {
-                float x;
-                float y;
-            } velocity, desiredVelocity;
+
+
+
+
+
+
 
            // WeakPtr<DodgeRaceEnemy> lastEnemy;
-            WeakPtr<Projectile> lastShot;
+            WeakPtr<Projectile> lastShot;*/
 
     };