Changeset 5912 in orxonox.OLD

Timestamp:

Dec 4, 2005, 2:39:35 PM (18 years ago)

Author:

bensch

Message:

controll: shiftdir instead of ABS-Dir

File:

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

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

@@ -258 +258 @@
 
   //orient the spaceship model in the direction of movement.
-  if( velocity.len() != 0 )
-   {
-     this->setAbsDir(Quaternion(velocity, Vector(0,1,0)) * Quaternion ( -M_PI_2, Vector(0,1,0)));
-   }
 
   this->shiftCoor (move);
@@ -279 +275 @@
   //Vector rot(0.0, 0.0, 0.0);
   //float rotVal = 0.0;
-
+  /* FIXME: calculating the direction and orthDirection every timeSlice is redundant! save it somewhere */
   /* calculate the direction in which the craft is heading  */
-  Vector forwardDirection = (this->getAbsDirX()).getNormalized(); //x
-   //direction = this->absDirection.apply (direction);
-  Vector rightDirection = (this->getAbsDirZ()).getNormalized(); //z
-   //orthDirection = orthDirection.cross (direction);
-   Vector upDirection = (this->getAbsDirY()).getNormalized(); //y
-
-
-
 
   if( this->bUp )
    {
-     accel += forwardDirection;
+     this->shiftCoor(this->getAbsDirX());
       //if(travelSpeed <= 5000)  travelSpeed += 10;
    }
@@ -298 +286 @@
   if( this->bDown )
    {
-     accel -=  forwardDirection;
+     this->shiftCoor(Vector()-this->getAbsDirX());
      //if(travelSpeed >= 10) travelSpeed -= 10;
    }
@@ -304 +292 @@
   if( this->bLeft /* > -this->getRelCoor().z*2*/)
   {
-    accel -= rightDirection;
+    this->shiftDir(Quaternion(time, Vector(0,1,0)));
+//    accel -= rightDirection;
     //velocityDir.normalize();
     //rot +=Vector(1,0,0);
@@ -311 +300 @@
   if( this->bRight /* > this->getRelCoor().z*2*/)
   {
-    accel += rightDirection;
+    this->shiftDir(Quaternion(-time, Vector(0,1,0)));
+
+    //    accel += rightDirection;
     //velocityDir.normalize();
     //rot += Vector(1,0,0);
@@ -318 +309 @@
   if (this->bAscend )
   {
-    accel += upDirection;
+    this->shiftDir(Quaternion(time, Vector(0,0,1)));
+
+//    accel += upDirection;
     //velocityDir.normalize();
     //rot += Vector(0,0,1);
@@ -325 +318 @@
   if (this->bDescend )
   {
-    accel -= upDirection;
+    this->shiftDir(Quaternion(-time, Vector(0,0,1)));
+
+    //    accel -= upDirection;
     //velocityDir.normalize();
     //rot += Vector(0,0,1);