Changeset 6232 in orxonox.OLD

Timestamp:

Dec 21, 2005, 3:06:29 PM (18 years ago)

Author:

bknecht

Message:

Control: more realistic helicopter-control

File:

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

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

@@ -137 +137 @@
   registerEvent(SDLK_q);
   registerEvent(SDLK_e);
+  registerEvent(SDLK_c);
   registerEvent(KeyMapper::PEV_FIRE1);
   registerEvent(KeyMapper::PEV_NEXT_WEAPON);
@@ -266 +267 @@
   if(velocity.len() != 0) velocity -= velocity*0.1;
 
+  //physics: Gravity
+  this->shiftCoor(Vector(0,-0.05,0));
 
   //hoover effect
@@ -300 +303 @@
      //this->shiftCoor(this->getAbsDirX());
 
-     accel += Vector(this->getAbsDirX().x,0,this->getAbsDirX().z).getNormalized()*2;
-     if((this->getAbsDirX()).y > -.2)
-     {
-       rot += Vector (0,0,1);
-       rotVal -= time/5;
-     }
+     accel += this->getAbsDirX()*2;
+     rot += Vector (0,0,1);
+     rotVal -= time/8;
    }
    else
    {
-       if(this->getAbsDirX().y < -.02) this->shiftDir(Quaternion(time/5, Vector(0,0,1)));
+       if(this->getAbsDirX().y < -.02) this->shiftDir(Quaternion(time/8, Vector(0,0,1)));
    }
 
@@ -315 +315 @@
    {
      //this->shiftCoor((this->getAbsDirX())*-1);
-     accel -= Vector(this->getAbsDirX().x,0,this->getAbsDirX().z).getNormalized()*2;
-     if((this->getAbsDirX()).y < .2)
-     {
-       rot += Vector (0,0,1);
-       rotVal += time/5;
-     }
+     accel -= this->getAbsDirX()*2;
+     rot += Vector (0,0,1);
+     rotVal += time/8;
    }
    else
    {
-         if(this->getAbsDirZ().y > 0.02) this->shiftDir(Quaternion(-time/5, Vector(0,0,1)));
+         if(this->getAbsDirX().y > 0.02) this->shiftDir(Quaternion(-time/8, Vector(0,0,1)));
    }
 
@@ -330 +327 @@
   {
     //this->shiftDir(Quaternion(time, Vector(0,1,0)));
-    accel -= Vector(this->getAbsDirZ().x,0,this->getAbsDirZ().z).getNormalized()*2;
-    //velocityDir.normalize();
-    if((this->getAbsDirZ()).y < .2)
-    {
-      rot +=Vector(1,0,0);
-      rotVal -= time/5;
-    }
+    accel -= this->getAbsDirZ()*2;
+    //velocityDir.normalize();
+    rot += Vector(1,0,0);
+    rotVal -= time/8;
   }
   else
@@ -346 +340 @@
   {
     //this->shiftDir(Quaternion(-time, Vector(0,1,0)));
-
-    accel += Vector(this->getAbsDirZ().x,0,this->getAbsDirZ().z).getNormalized()*2;
-    //velocityDir.normalize();
-    if((this->getAbsDirZ()).y > -.2)
-    {
-      rot += Vector(1,0,0);
-      rotVal += time/5;
-    }
+    accel += this->getAbsDirZ()*2;
+    //velocityDir.normalize();
+    rot += Vector(1,0,0);
+    rotVal += time/5;
   }
   else
@@ -381 +371 @@
     //this->shiftDir(Quaternion(time, Vector(0,0,1)));
 
-    accel += (this->getAbsDirY())*2;
+    accel += (this->getAbsDirY())*3;
     //velocityDir.normalize();
     //rot += Vector(0,0,1);
@@ -390 +380 @@
     //this->shiftDir(Quaternion(-time, Vector(0,0,1)));
 
-    accel -= (this->getAbsDirY())*2;
+    accel -= (this->getAbsDirY())*3;
     //velocityDir.normalize();
     //rot += Vector(0,0,1);