Changeset 6505 in orxonox.OLD

Timestamp:

Jan 12, 2006, 9:04:23 AM (18 years ago)

Author:

bknecht

Message:

Control: Helicopter and SpaceShip Control

Location:

branches/spaceshipcontrol/src/world_entities/space_ships

Files:

• helicopter.cc (modified) (1 diff)
• space_ship.cc (modified) (7 diffs)

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

@@ -410 +410 @@
   }
 
-  velocity += accel;
-  if((this->getAbsDirX()).y <= 0.2 && (this->getAbsDirX()).y >= -0.2) this->shiftDir(Quaternion(rotValZ, Vector(0,0,1)));
-  if((this->getAbsDirZ()).y <= 0.2 && (this->getAbsDirZ()).y >= -0.2) this->shiftDir(Quaternion(rotValX, Vector(1,0,0)));
+  velocity += accel*3;
+  if((this->getAbsDirX()).y <= 0.3 && (this->getAbsDirX()).y >= -0.3) this->shiftDir(Quaternion(rotValZ, Vector(0,0,1)));
+  if((this->getAbsDirZ()).y <= 0.3 && (this->getAbsDirZ()).y >= -0.3) this->shiftDir(Quaternion(rotValX, Vector(1,0,0)));
 }
 

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

@@ -136 +136 @@
 
   travelSpeed = 15.0;
-  this->velocity = Vector(0.0,0.0,0.0);
+  acceleration = 5.0;
+  this->velocity = this->getAbsDirX()*travelSpeed;
   this->mouseDir = this->getAbsDir();
 
@@ -275 +276 @@
   this->calculateVelocity(time);
 
-  Vector move = (velocity)*time;
+  Vector move = velocity.getNormalized()*travelSpeed;
 
   //orient the velocity in the direction of the spaceship.
@@ -296 +297 @@
 
   //readjust
-
-  /*
-    In the game "Yager" the spaceship gets readjusted when the player moves the mouse.
-    I (bknecht) go and check it out how they do it, we could probably use this also in Orxonox.
-  */
-  //if (xMouse != 0 && yMouse != 0)
-
   //if (this->getAbsDirZ().y > 0.1) this->shiftDir(Quaternion(time*0.3, Vector(1,0,0)));
   //else if (this->getAbsDirZ().y < -0.1) this->shiftDir(Quaternion(-time*0.3, Vector(1,0,0)));
@@ -321 +315 @@
 void SpaceShip::calculateVelocity (float time)
 {
-  Vector accel(0.0, 0.0, 0.0);
+  //Vector accel(0.0, 0.0, 0.0);
   /*
   Vector rot(0.0, 0.0, 0.0); // wird benötigt für Helicopter
@@ -334 +328 @@
    {
      //this->shiftCoor(this->getAbsDirX());
-      accel += (this->getAbsDirX())*2;
+      //accel += (this->getAbsDirX())*2;
+      if(travelSpeed < 30) travelSpeed += acceleration*time;
 
       /* Heli-Steuerung
@@ -345 +340 @@
    {
      //this->shiftCoor((this->getAbsDirX())*-1);
-     accel -= (this->getAbsDirX())*2;
+     //accel -= (this->getAbsDirX())*2;
+     if(travelSpeed >= 0) travelSpeed -= acceleration*time;
    }
 
@@ -403 +399 @@
   }
 
-  velocity += accel;
+  //velocity += accel;
   //rot.normalize();
   //this->setRelDirSoft(Quaternion(rotVal, rot), 5);