Changeset 6999 in orxonox.OLD for trunk

Timestamp:

Feb 3, 2006, 1:03:41 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Hover should be Time Independant

Location:

trunk/src/world_entities

Files:

• camera.cc (modified) (1 diff)
• camera.h (modified) (1 diff)
• space_ships/hover.cc (modified) (2 diffs)
• space_ships/hover.h (modified) (1 diff)

trunk/src/world_entities/camera.cc

@@ -175 +175 @@
   Vector up = this->getAbsDirV();
   Vector delay = Vector(0, 0, 0);
-  if( currentMode != VIEW_FRONT) delay = (this->target->getVelocity()) / 25.0f;
+  //if( currentMode != VIEW_FRONT) delay = (this->target->getVelocity()) / 25.0f;
 
    // Setting the Camera Eye, lookAt and up Vectors

trunk/src/world_entities/camera.h

@@ -58 +58 @@
   float             toFovy;          //!< The fovy-mode to iterate to.
   ViewMode          currentMode;     //!< The ViewMode the camera is in
+
+  Vector            delay;
 };
 

trunk/src/world_entities/space_ships/hover.cc

@@ -112 +112 @@
   this->cameraLook = 0.0f;
   this->rotation = 0.0f;
-  this->acceleration = 1.0;
+  this->acceleration = 25.0f;
+  this->airFriction = 3.0f;
 
   // camera - issue
@@ -278 +279 @@
     accel -= Vector(0, this->acceleration, 0);
   }
-  Vector tmp = this->getAbsDir().apply(accel * 200.0);
-  //tmp.y = accel.y * 500.0 ;
-  velocity += tmp * dt;
-
-  accel -= this->getAbsDir().inverse().apply(velocity * .005);
+
+  Vector accelerationDir = this->getAbsDir().apply(accel * this->acceleration);
 
   // this is the air friction (necessary for a smooth control)
-  this->velocity *= 0.99;
-  this->shiftCoor (velocity * dt);
+  Vector damping = (this->velocity * this->airFriction);
+
+
+  this->velocity += (accelerationDir - damping)* dt;
+
+  this->shiftCoor (this->velocity * dt);
   this->rotation = 0.0f;
 
   this->setRelDirSoft(this->direction * Quaternion(-cameraLook, Vector(0,0,1)), 5);
 
-  this->wingNodeLeft.setRelDirSoft(Quaternion(accel.z+this->rotation, Vector(1,0,0)), 5);
-  this->rotorNodeLeft.setRelDirSoft(Quaternion(-2.0*accel.x+this->rotation + cameraLook, Vector(0,0,1)), 5);
-
-  this->wingNodeRight.setRelDirSoft(Quaternion(accel.z+this->rotation, Vector(1,0,0)), 5);
-  this->rotorNodeRight.setRelDirSoft(Quaternion(-2.0*accel.x-this->rotation + cameraLook, Vector(0,0,1)), 5);
+  this->wingNodeLeft.setRelDirSoft(Quaternion(accel.z * .03 +this->rotation, Vector(1,0,0)), 5);
+  this->rotorNodeLeft.setRelDirSoft(Quaternion(-accel.x * .05+this->rotation + cameraLook, Vector(0,0,1)), 5);
+
+  this->wingNodeRight.setRelDirSoft(Quaternion(accel.z * .03 +this->rotation, Vector(1,0,0)), 5);
+  this->rotorNodeRight.setRelDirSoft(Quaternion(-accel.x*.05 -this->rotation + cameraLook, Vector(0,0,1)), 5);
 }
 

trunk/src/world_entities/space_ships/hover.h

@@ -60 +60 @@
     float                 travelSpeed;        //!< the current speed of the Hove (to make soft movement)
     float                 acceleration;       //!< the acceleration of the Hover.
+    float                 airFriction;        //!< AirFriction.
 
     float                 rotorSpeed;         //!< the speed of the rotor.