Changeset 6537 in orxonox.OLD

Timestamp:

Jan 18, 2006, 1:36:27 PM (18 years ago)

Author:

bknecht

Message:

Control: Minimumspeed for SpaceShip

File:

• branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.cc (modified) (3 diffs)

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

@@ -291 +291 @@
 
   // this is the air friction (necessary for a smooth control)
-  if(travelSpeed != 0) velocity -= velocity.getNormalized()*travelSpeed*travelSpeed*0.0005;
+  if(travelSpeed >= 120) velocity -= velocity.getNormalized()*travelSpeed*travelSpeed*0.0001;
+  else velocity -= velocity.getNormalized()*travelSpeed*0.001;
   
   //other physics (gravity)
-  if((this->getAbsDirY()).y*travelSpeed < 60 && (this->getAbsDirY()).y>0)
-  move += Vector(0,-1,0)*120*time + Vector(0,2,0)*(this->getAbsDirY()).y*travelSpeed*time;
-  if((this->getAbsDirY()).y*travelSpeed < 60 && (this->getAbsDirY()).y<0)
-  move += Vector(0,-1,0)*120*time - Vector(0,2,0)*(this->getAbsDirY()).y*travelSpeed*time;
+  if((this->getAbsDirY()).y*travelSpeed < 120 && (this->getAbsDirY()).y>0)
+  move += Vector(0,-1,0)*60*time + Vector(0,1,0)*(this->getAbsDirY()).y*travelSpeed/2*time;
+  if((this->getAbsDirY()).y*travelSpeed < 120 && (this->getAbsDirY()).y<0)
+  move += Vector(0,-1,0)*60*time - Vector(0,1,0)*(this->getAbsDirY()).y*travelSpeed/2*time;
 
   //hoover effect
@@ -337 +338 @@
       //accel += (this->getAbsDirX())*2;
       
-      accel += (this->getAbsDirX())*3*acceleration;
+      accel += (this->getAbsDirX())*acceleration;
 
    }
@@ -345 +346 @@
      //this->shiftCoor((this->getAbsDirX())*-1);
      //accel -= (this->getAbsDirX())*2;
-     accel -= (this->getAbsDirX())*3*acceleration;
+     accel -= (this->getAbsDirX())*0.5*acceleration;
    }