Changeset 5906 in orxonox.OLD for branches/spaceshipcontrol

Timestamp:

Dec 3, 2005, 9:30:54 PM (19 years ago)

Author:

snellen

Message:

space_ship.cc updated

File:

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

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

@@ -256 +256 @@
   Vector move = (velocity)*time;
 
-  /*if( velocity.len() != 0 )
+  //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 +280 @@
   /* FIXME: calculating the direction and orthDirection every timeSlice is redundant! save it somewhere */
   /* calculate the direction in which the craft is heading  */
-  Vector direction (1.0, 0.0, 0.0);
-  //direction = this->absDirection.apply (direction);
-   Vector orthDirection (0.0, 0.0, 1.0);
-  //orthDirection = orthDirection.cross (direction);
+   Vector forwardDirection (1.0, 0.0, 0.0);
+   //direction = this->absDirection.apply (direction);
+   Vector rightDirection (0.0, 0.0, 1.0);
+   //orthDirection = orthDirection.cross (direction);
+   Vector upDirection (0.0, 1.0, 0.0);
 
 
@@ -288 +290 @@
    {
     //if(velocity.len() == 0)
-      accel += direction;//((this->getAbsDir()).getSpacialAxis().getNormalized());
+     accel += forwardDirection;
     //else
       //travelSpeed++;
@@ -296 +298 @@
    {
     //if(velocity.len() == 0)
-      accel -= direction;//((this->getAbsDir()).getSpacialAxis().getNormalized());
+     accel -= forwardDirection;
    // else
      //travelSpeed--;
@@ -303 +305 @@
   if( this->bLeft /* > -this->getRelCoor().z*2*/)
   {
-    accel -=(orthDirection);
+    accel -= rightDirection;
     //rot +=Vector(1,0,0);
     //rotVal -= .4;
@@ -309 +311 @@
   if( this->bRight /* > this->getRelCoor().z*2*/)
   {
-    accel += orthDirection;
+    accel += rightDirection;
     //rot += Vector(1,0,0);
     //rotVal += .4;
@@ -315 +317 @@
   if (this->bAscend )
   {
-    accel += Vector(0,1,0);
+    accel += upDirection;
     //rot += Vector(0,0,1);
     //rotVal += .4;
@@ -321 +323 @@
   if (this->bDescend )
   {
-    accel -= Vector(0,1,0);
+    accel -= upDirection;
     //rot += Vector(0,0,1);
     //rotVal -= .4;