Changeset 9971 in orxonox.OLD for branches/playability/src/world_entities/space_ships

Timestamp:

Nov 29, 2006, 4:29:22 PM (18 years ago)

Author:

muellmic

Message:

blub

Location:

branches/playability/src/world_entities/space_ships

Files:

• playership.cc (added)
• playership.h (added)
• space_ship.h (modified) (3 diffs)
• spacecraft_2d.h (modified) (1 diff)
• spacecraft_2d_new.cc (deleted)
• spacecraft_2d_new.h (deleted)

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

@@ -30 +30 @@
 
     virtual void setPlayDirection(const Quaternion& rot, float speed = 0.0f);
+    void setTravelSpeed(float travelSpeed);
+    void setTravelHeight(float travelHeight);
+    void setTravelDistance(const Vector2D& distance);
+    void setTravelDistance(float x, float y);
+
+    void setAirFriction(float friction) { this->airFriction = friction; };
 
     virtual void enter();
@@ -62 +68 @@
     //damage handler
     virtual void damage(float pDamage, float eDamage);  //!< pDamage physical damage, eDamage electronic damage
+
+    virtual void enterPlaymode(Playable::Playmode playmode);
+    virtual void movement (float dt);
 
   private:
@@ -132 +141 @@
     Vector                velocity;           //!< the velocity of the player.
     Vector                oldVelocity;        //!< the velocity the player had last synced
+
+// 2D-traveling
+    PNode*                travelNode;
+    float                 travelSpeed;        //!< the current speed of the Ship (to make soft movement)
+
+// Camera
+    PNode                 cameraNode;
+    float                 cameraLook;
+    float                 rotation;
+
+    /*
     Quaternion            mouseDir;           //!< the direction where the player wants to fly
     Quaternion            oldMouseDir;        //!< the direction where the player wanted to fly
     float                 shipInertia;        //!< the inertia of the ship(how fast the ship reacts to a mouse input)
+
     Quaternion            rotQuat;
     Quaternion            pitchDir;
-    float                 travelSpeed;        //!< the current speed of the player (to make soft movement)
-    float                 acceleration;       //!< the acceleration of the player.
+    float                 dogdeSpeed;        //!< the dogde Speed of the ship.
+    */
 
+    Quaternion            direction;          //!< the direction of the ship.
+    float                 acceleration;       //!< the acceleration of the ship.
+    float                 airFriction;        //!< AirFriction.
     float                 airViscosity;
 

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

@@ -66 +66 @@
     float                 acceleration;       //!< the acceleration of the Spacecraft2D.
     float                 airFriction;        //!< AirFriction.
-
     float                 airViscosity;