Changeset 10032 in orxonox.OLD for branches/playability/src/world_entities/space_ships/space_ship.h

Timestamp:

Dec 6, 2006, 7:07:24 PM (19 years ago)

Author:

muellmic

Message:

changed roll- handling at left/right translation

File:

• branches/playability/src/world_entities/space_ships/space_ship.h (modified) (5 diffs)

branches/playability/src/world_entities/space_ships/space_ship.h

@@ -72 +72 @@
 
     virtual void enterPlaymode(Playable::Playmode playmode);
+    void setPlaymodeXML(const std::string& playmode);
     virtual void movement (float dt);
 
@@ -77 +78 @@
     void init();
 
-    void calculateVelocity(float time);
+    //void calculateVelocity(float time);
 
     void regen(float time);  //!< handler for shield and electronic regeneration
@@ -131 +132 @@
     bool                  bAscend;            //!< ascend button pressed.
     bool                  bDescend;           //!< descend button presses.
-//    bool                  bFire;              //!< fire button pressed.(moved to playable)
     bool                  bRollL;             //!< rolling button pressed (left)
     bool                  bRollR;             //!< rolling button pressed (right)
@@ -144 +144 @@
     int                   controlVelocityY;
     */
-//   float                 cycle;              //!< hovercycle
 
-
-    Vector                velocity;           //!< the velocity of the player.
-    //Vector                oldVelocity;        //!< the velocity the player had last synced
-
-
+Vector                velocity;           //!< the velocity of the player.
 
 // 2D-traveling
@@ -173 +168 @@
     */
 
-    Quaternion            direction;          //!< the direction of the ship.
+    //Quaternion            direction;          //!< the direction of the ship.
     float                 acceleration;       //!< the acceleration of the ship.
     //float                 airFriction;        //!< AirFriction.