Changeset 6880 in orxonox.OLD

Timestamp:

Jan 31, 2006, 2:27:02 AM (18 years ago)

Author:

bensch

Message:

trunk: in 3d

File:

• trunk/src/world_entities/space_ships/hover.cc (modified) (5 diffs)

trunk/src/world_entities/space_ships/hover.cc

@@ -115 +115 @@
   this->cameraNode.addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
   this->cameraNode.addNodeFlags(PNODE_PROHIBIT_CHILD_DELETE);
+  //this->cameraNode.setParentMode(PNODE_ROTATE_MOVEMENT);
   this->cameraNode.setParent(this);
 
@@ -142 +143 @@
   registerEvent(KeyMapper::PEV_LEFT);
   registerEvent(KeyMapper::PEV_RIGHT);
-  //registerEvent(SDLK_q);
-  registerEvent(SDLK_e);
-  registerEvent(SDLK_c);
+  registerEvent(SDLK_e); /// FIXME
+  registerEvent(SDLK_c); /// FIXME
   registerEvent(KeyMapper::PEV_FIRE1);
   registerEvent(KeyMapper::PEV_NEXT_WEAPON);
   registerEvent(KeyMapper::PEV_PREVIOUS_WEAPON);
-  //registerEvent(SDLK_PAGEUP);
-  //registerEvent(SDLK_PAGEDOWN);
   registerEvent(EV_MOUSE_MOTION);
 
@@ -280 +278 @@
 
   Vector tmp = this->getAbsDir().apply(accel * 500.0);
-  tmp.y = accel.y * 500.0 ;
+  //tmp.y = accel.y * 500.0 ;
   velocity += tmp * dt;
 
@@ -290 +288 @@
   this->rotation = 0.0f;
 
-  accel *=.5;
-  this->setRelDirSoft(this->direction * Quaternion(-accel.x, Vector(0,0,1)) * Quaternion(accel.z, Vector(1,0,0)), 5);
+  this->setRelDirSoft(this->direction * Quaternion(-cameraLook, Vector(0,0,1)), 5);
 
   this->wingNodeLeft.setRelDirSoft(Quaternion(accel.z+this->rotation, Vector(1,0,0)), 5);
-  this->rotorNodeLeft.setRelDirSoft(Quaternion(-2.0*accel.x+this->rotation, Vector(0,0,1)), 5);
+  this->rotorNodeLeft.setRelDirSoft(Quaternion(-2.0*accel.x+this->rotation + cameraLook, Vector(0,0,1)), 5);
 
   this->wingNodeRight.setRelDirSoft(Quaternion(accel.z+this->rotation, Vector(1,0,0)), 5);
-  this->rotorNodeRight.setRelDirSoft(Quaternion(-2.0*accel.x-this->rotation, Vector(0,0,1)), 5);
+  this->rotorNodeRight.setRelDirSoft(Quaternion(-2.0*accel.x-this->rotation + cameraLook, Vector(0,0,1)), 5);
 }
 
@@ -386 +383 @@
     if (cameraLook > M_PI_4)
       cameraLook = M_PI_4;
-    else if (cameraLook < -M_PI_2)
-      cameraLook = -M_PI_2;
-    this->cameraNode.setRelDirSoft(Quaternion(-cameraLook, Vector(0,0,1)),10);
-  }
-}
+    else if (cameraLook < -M_PI_4)
+      cameraLook = -M_PI_4;
+    //this->cameraNode.setRelDirSoft(this->direction,10);
+  }
+}