Changeset 9971 in orxonox.OLD

Timestamp:

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

Author:

muellmic

Message:

blub

Location:

branches/playability/src

Files:

• util/state.h (modified) (1 diff)
• world_entities/WorldEntities.am (modified) (2 diffs)
• world_entities/player.cc (modified) (2 diffs)
• world_entities/player.h (modified) (3 diffs)
• world_entities/space_ships/playership.cc (added)
• world_entities/space_ships/playership.h (added)
• world_entities/space_ships/space_ship.h (modified) (3 diffs)
• world_entities/space_ships/spacecraft_2d.h (modified) (1 diff)
• world_entities/space_ships/spacecraft_2d_new.cc (deleted)
• world_entities/space_ships/spacecraft_2d_new.h (deleted)

branches/playability/src/util/state.h

@@ -110 +110 @@
 
 
-
  private:
   State();

branches/playability/src/world_entities/WorldEntities.am

@@ -54 +54 @@
                 \
                 world_entities/space_ships/space_ship.cc \
+                world_entities/space_ships/playership.cc \
                 world_entities/space_ships/helicopter.cc \
                 world_entities/space_ships/hover.cc \
@@ -161 +162 @@
                 \
                 space_ships/space_ship.h \
+                space_ships/playership.h \
                 space_ships/helicopter.h \
                 space_ships/hover.h \

branches/playability/src/world_entities/player.cc

@@ -23 +23 @@
 
 #include "debug.h"
+
+#include "world_entities/space_ships/playership.h"
 
 ObjectListDefinition(Player);
@@ -128 +130 @@
 }
 
+PlayerShip* Player::getPlayerShip()
+{
+  return this->playership;
+}
+
+void Player::setPlayerShip(PlayerShip* playership)
+{
+  this->playership = playership;
+}
+
+

branches/playability/src/world_entities/player.h

@@ -10 +10 @@
 
 #include "util/hud.h"
+#include "world_entities/space_ships/playership.h"
 
 /* Forward Declaration */
@@ -31 +32 @@
     bool              setPlayable(Playable* controllalble);
     bool              eject();
+    void              setPlayerShip(PlayerShip playership);
+    PlayerShip*       getPlayerShip();
     inline Playable*  getPlayable() const  { return this->playable; };
 
@@ -46 +49 @@
   private:
     Playable*         playable;                 //!< The one we controll or NULL if none
-    Hud               _hud;                      //!< The HUD to be displayed for this Player.
+    Hud               _hud;                     //!< The HUD to be displayed for this Player.
+    PlayerShip        playership;
 };
 

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;