Changeset 11620 for code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.h

Timestamp:

Dec 3, 2017, 9:22:33 PM (8 years ago)

Author:

pascscha

Message:

XML Port

File:

• code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.h (modified) (3 diffs)

code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.h

@@ -39 +39 @@
 #include "weapons/WeaponsPrereqs.h"
 #include "worldentities/pawns/SpaceShip.h"
+#include "graphics/ParticleSpawner.h"
+#include "FlappyOrx.h"
+
 
 namespace orxonox
@@ -49 +52 @@
             virtual void tick(float dt) override;
 
-            
             // Starts or stops fireing
             virtual void boost(bool bBoost) override;
 
-            //no rotation!
-            virtual void rotateYaw(const Vector2& value) override{}; 
-            virtual void rotatePitch(const Vector2& value) override{};
             //return to main menu if game has ended.
-            //virtual void rotateRoll(const Vector2& value) override;
+            virtual void rotateRoll(const Vector2& value) override;
             
-            inline void setSpeed( float speed ){   
-                orxout()<< speed<< endl;
-                this->speed = speed; }
-            inline float getSpeed( )
-                { return this->speed; }
-            inline void setGravity( float gravity )
-                { this->gravity = gravity; }
-            inline float getGravity()
-                { return this->gravity; }
-            inline void setUpwardThrust( float UpwardThrust )
-                { this->UpwardThrust = UpwardThrust; }
-            inline float getUpwardThrust()
-                { return this->UpwardThrust; }
+            inline void  setSpeedBase(int speedBase){ getGame()->setSpeedBase(speedBase);}
+            inline float getSpeedBase(){ return getGame()->getSpeedBase();}
+            inline void  setSpeedIncrease(int speedIncrease){ getGame()->setSpeedIncrease(speedIncrease);}
+            inline float getSpeedIncrease(){ return getGame()->getSpeedIncrease();}
+
+            inline void setTubeDistanceBase(int tubeDistanceBase){ getGame()->setTubeDistanceBase(tubeDistanceBase);}
+            inline int  getTubeDistanceBase(){ return getGame()->getTubeDistanceBase();}
+            inline void setTubeDistanceIncrease(int tubeDistanceIncrease){ getGame()->setTubeDistanceIncrease(tubeDistanceIncrease);}
+            inline int  getTubeDistanceIncrease(){ return getGame()->getTubeDistanceIncrease();}
+
+            inline void  setUpwardthrust( float upwardThrust ){ this->upwardThrust = upwardThrust; }
+            inline float getUpwardthrust(){ return this->upwardThrust; }
+            inline void  setGravity( float gravity ){ this->gravity = gravity; }
+            inline float getGravity(){ return this->gravity; }
+
+            inline void setSpeed( float speed ){ orxout() << "speed set: " << speed << endl; this->speed = speed; }
+            inline float getSpeed( ){ return this->speed; }
+            
    
             virtual int timeUntilRespawn();
             
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+
 
         protected:
@@ -83 +88 @@
             WeakPtr<FlappyOrx> game;
             Camera* camera;
+            ParticleSpawner* particlespawner_;
             bool isFlapping;
             bool isDead;
-            float speed, UpwardThrust, gravity;
+            float speed, upwardThrust, gravity;
+            float particleAge, particleLifespan;
             long deathTime;
             struct Velocity