Changeset 7346 in orxonox.OLD for trunk/src/world_entities/space_ships

Timestamp:

Apr 19, 2006, 1:17:46 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: extreme cleanup in Playable

Location:

trunk/src/world_entities/space_ships

Files:

• helicopter.h (modified) (1 diff)
• hover.h (modified) (1 diff)
• space_ship.cc (modified) (1 diff)
• space_ship.h (modified) (1 diff)
• turbine_hover.cc (modified) (2 diffs)
• turbine_hover.h (modified) (1 diff)

trunk/src/world_entities/space_ships/helicopter.h

@@ -22 +22 @@
 
     virtual void loadParams(const TiXmlElement* root);
-    virtual void setStartDirection(const Quaternion& rot){/* FIXME */};
+    virtual void setPlayDirection(const Quaternion& rot, float speed = 0.0f) {/* FIXME */};
 
     virtual void enter();

trunk/src/world_entities/space_ships/hover.h

@@ -19 +19 @@
 
     virtual void loadParams(const TiXmlElement* root);
-    virtual void setStartDirection(const Quaternion& rot) {/* FIXME */};
+    virtual void setPlayDirection(const Quaternion& rot, float speed = 0.0f) {/* FIXME */};
 
     virtual void enter();

trunk/src/world_entities/space_ships/space_ship.cc

@@ -248 +248 @@
 }
 
-void SpaceShip::setStartDirection(const Quaternion& quat)
+void SpaceShip::setPlayDirection(const Quaternion& quat, float speed)
 {
   this->mouseDir = quat;

trunk/src/world_entities/space_ships/space_ship.h

@@ -27 +27 @@
     virtual void loadParams(const TiXmlElement* root);
 
-    virtual void setStartDirection(const Quaternion& rot);
+    virtual void setPlayDirection(const Quaternion& rot, float speed = 0.0f);
 
     virtual void enter();

trunk/src/world_entities/space_ships/turbine_hover.cc

@@ -103 +103 @@
   this->setClassID(CL_TURBINE_HOVER, "TurbineHover");
 
-  this->setSupportedPlaymodes(Playable::Full3D | Playable::Horizontal);
+  this->setSupportedPlaymodes(Playable::Full3D | Playable::Horizontal | Playable::Vertical);
 
   this->loadModel("models/ships/hoverglider_wing.obj", 1.0f, 3);
@@ -393 +393 @@
       }
       break;
+
+    case Playable::Vertical:
+    {
+      accel.z = 0;
+      Vector accelerationDir = this->getAbsDir().apply(accel * this->acceleration);
+      accelerationDir.z=0;
+
+        // this is the air friction (necessary for a smooth control)
+      Vector damping = (this->velocity * this->airFriction);
+
+      this->velocity += (accelerationDir - damping)* dt;
+      this->shiftCoor (this->velocity * dt);
+
+      this->setRelDirSoft(this->direction * Quaternion(-cameraLook, Vector(0,0,1)), 5);
+
+      this->wingNodeLeft.setRelDirSoft(Quaternion(accel.z * .05 +this->rotation, Vector(1,0,0)), 5);
+      this->rotorNodeLeft.setRelDirSoft(Quaternion(-accel.x * .07+this->rotation + cameraLook, Vector(0,0,1)), 5);
+
+      this->wingNodeRight.setRelDirSoft(Quaternion(accel.z * .05 +this->rotation, Vector(1,0,0)), 5);
+      this->rotorNodeRight.setRelDirSoft(Quaternion(-accel.x*.07 -this->rotation + cameraLook, Vector(0,0,1)), 5);
+    }
+    break;
   }
 }

trunk/src/world_entities/space_ships/turbine_hover.h

@@ -22 +22 @@
 
     virtual void loadParams(const TiXmlElement* root);
-    virtual void setStartDirection(const Quaternion& rot) {/* FIXME */};
+    virtual void setPlayDirection(const Quaternion& rot, float speed = 0.0f) {/* FIXME */};
     virtual void enter();
     virtual void leave();