Changeset 6058 in orxonox.OLD

Timestamp:

Dec 12, 2005, 1:04:24 PM (18 years ago)

Author:

bknecht

Message:

new helicopter control

File:

• branches/spaceshipcontrol/src/world_entities/space_ships/helicopter.cc (modified) (5 diffs)

branches/spaceshipcontrol/src/world_entities/space_ships/helicopter.cc

@@ -245 +245 @@
   Vector move = (velocity)*time;
 
-  //orient the velocity in the direction of the spaceship.
-  //travelSpeed = velocity.len();
-  //velocity += ((this->getAbsDirX())*travelSpeed-velocity)*airViscosity;
-  //velocity = (velocity.getNormalized())*travelSpeed;
-
   // this is the air friction (necessary for a smooth control)
-  if(velocity.len() != 0) velocity -= velocity*0.01;
+  if(velocity.len() != 0) velocity -= velocity*0.1;
   
-  if(this->getAbsDirX().y < -0.2) this->shiftDir(Quaternion(time, Vector(0,0,1)));
-  else if(this->getAbsDirX().y > 0.2) this->shiftDir(Quaternion(-time, Vector(0,0,1)));
 
   //hoover effect
@@ -289 +282 @@
      //this->shiftCoor(this->getAbsDirX());
      accel += Vector(this->getAbsDirX().x,0,this->getAbsDirX().z).getNormalized()*2;
-     rot += Vector (0,0,1);
-     rotVal -= .004;
+     if((this->getAbsDirX()).y > -.2)
+     {
+       rot += Vector (0,0,1);
+       rotVal -= .4;
+     }
+   }
+   else
+   {
+       if(this->getAbsDirX().y < -.02) this->shiftDir(Quaternion(time/5, Vector(0,0,1)));
    }
 
@@ -297 +297 @@
      //this->shiftCoor((this->getAbsDirX())*-1);
      accel -= Vector(this->getAbsDirX().x,0,this->getAbsDirX().z).getNormalized()*2;
-     rot += Vector (0,0,1);
-     rotVal += .004;
+     if((this->getAbsDirX()).y < .2)
+     {
+       rot += Vector (0,0,1);
+       rotVal += .4;
+     }
    }
+   else
+   {
+         if(this->getAbsDirX().y > 0.02) this->shiftDir(Quaternion(-time/5, Vector(0,0,1)));
+   }
 
   if( this->bLeft /* > -this->getRelCoor().z*2*/)
   {
     //this->shiftDir(Quaternion(time, Vector(0,1,0)));
-    accel -= (this->getAbsDirZ());
-    //velocityDir.normalize();
-    rot +=Vector(1,0,0);
-    rotVal -= .002;
+    accel -= Vector(this->getAbsDirZ().x,0,this->getAbsDirZ().z).getNormalized()*2;
+    //velocityDir.normalize();
+    if((this->getAbsDirZ()).y < .2)
+    {
+      rot +=Vector(1,0,0);
+      rotVal -= .06;
+    }
   }
   if( this->bRight /* > this->getRelCoor().z*2*/)
@@ -313 +323 @@
     //this->shiftDir(Quaternion(-time, Vector(0,1,0)));
 
-    accel += (this->getAbsDirZ());
-    //velocityDir.normalize();
-    rot += Vector(1,0,0);
-    rotVal += .002;
+    accel += Vector(this->getAbsDirZ().x,0,this->getAbsDirZ().z).getNormalized()*2;
+    //velocityDir.normalize();
+    if((this->getAbsDirZ()).y > -.2)
+    {
+      rot += Vector(1,0,0);
+      rotVal += .06;
+    }
   }
 
@@ -409 +422 @@
     this->xMouse = event.xRel;
     this->yMouse = event.yRel;
-    //this->shiftDir(Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0))*Quaternion(-M_PI/4*yMouse*mouseSensitivity, Vector(0,0,1)));
+    if(((this->getAbsDirX().y) <= .2 && yMouse > 0) || ((this->getAbsDirX().y) >= -.2 && yMouse < 0)) yMouse = 0;
+    this->shiftDir(Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0))*Quaternion(-M_PI/4*yMouse*mouseSensitivity, Vector(0,0,1)));
   }
 }