Changeset 6879 in orxonox.OLD for trunk

Timestamp:

Jan 31, 2006, 2:04:29 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: smoother control of the Hover

File:

• trunk/src/world_entities/space_ships/hover.cc (modified) (5 diffs)

trunk/src/world_entities/space_ships/hover.cc

@@ -39 +39 @@
  */
 Hover::~Hover ()
-{
-
-}
+{}
 
 /**
@@ -112 +110 @@
   this->cameraLook = 0.0f;
   this->rotation = 0.0f;
+  this->acceleration = 1.0;
 
   // camera - issue
@@ -241 +240 @@
   this->movement(dt);
   this->rotorCycle += this->rotorSpeed * dt;
-
-  Vector move = (velocity)*dt;
-
-  // this is the air friction (necessary for a smooth control)
-  if(velocity.len() != 0)
-    velocity -= velocity*0.1;
-  this->shiftCoor (move);
-
-  this->rotation = 0.0f;
 }
 
@@ -259 +249 @@
 {
   Vector accel(0.0, 0.0, 0.0);
-  float rotVal = .3;
+  float rotSpeed = .3;
 
   if( this->bForward )
   {
-    accel += Vector(rotVal, 0, 0);
+    accel += Vector(this->acceleration, 0, 0);
   }
 
   if( this->bBackward )
   {
-    accel -= Vector(rotVal,0,0);
+    accel -= Vector(this->acceleration, 0, 0);
   }
   if( this->bLeft)
   {
-    accel -= Vector(0,0,rotVal);
+    accel -= Vector(0, 0, this->acceleration);
   }
 
   if( this->bRight)
   {
-    accel += Vector(0,0,rotVal);
+    accel += Vector(0, 0, this->acceleration);
   }
 
   if (this->bAscend )
   {
-    accel += Vector(0,rotVal,0);
+    accel += Vector(0, this->acceleration, 0);
   }
   if (this->bDescend )
   {
-    accel -= Vector(0,rotVal,0);
-  }
-
-  Vector tmp = this->getAbsDir().apply(accel * 30.0);
-  tmp.y = accel.y * 1000.0 * dt;
-  velocity += tmp;
-
-
+    accel -= Vector(0, this->acceleration, 0);
+  }
+
+  Vector tmp = this->getAbsDir().apply(accel * 500.0);
+  tmp.y = accel.y * 500.0 ;
+  velocity += tmp * dt;
+
+  accel -= velocity * .0005;
+
+  // this is the air friction (necessary for a smooth control)
+  this->velocity *= 0.95;
+  this->shiftCoor (velocity * dt);
+  this->rotation = 0.0f;
+
+  accel *=.5;
   this->setRelDirSoft(this->direction * Quaternion(-accel.x, Vector(0,0,1)) * Quaternion(accel.z, Vector(1,0,0)), 5);
 
-  this->wingNodeLeft.setRelDirSoft(Quaternion(accel.z+this->rotation, Vector(1,0,0)), 10);
-  this->rotorNodeLeft.setRelDirSoft(Quaternion(-2.0*accel.x+this->rotation, Vector(0,0,1)), 10);
-
-  this->wingNodeRight.setRelDirSoft(Quaternion(accel.z+this->rotation, Vector(1,0,0)), 10);
-  this->rotorNodeRight.setRelDirSoft(Quaternion(-2.0*accel.x-this->rotation, Vector(0,0,1)), 10);
+  this->wingNodeLeft.setRelDirSoft(Quaternion(accel.z+this->rotation, Vector(1,0,0)), 5);
+  this->rotorNodeLeft.setRelDirSoft(Quaternion(-2.0*accel.x+this->rotation, 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, Vector(0,0,1)), 5);
 }
 
@@ -391 +388 @@
     else if (cameraLook < -M_PI_2)
       cameraLook = -M_PI_2;
-    this->cameraNode.setRelDirSoft(Quaternion(-cameraLook, Vector(0,0,1)),5);
-  }
-}
+    this->cameraNode.setRelDirSoft(Quaternion(-cameraLook, Vector(0,0,1)),10);
+  }
+}