Changeset 6241 in orxonox.OLD for trunk/src/world_entities/space_ships

Timestamp:

Dec 21, 2005, 3:36:25 PM (19 years ago)

Author:

bensch

Message:

trunk: merged the spaceshipcontrol back to the trunk

File:

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

trunk/src/world_entities/space_ships/space_ship.cc

@@ -112 +112 @@
   PRINTF(4)("SPACESHIP INIT\n");
 
-//   EventHandler::getInstance()->grabEvents(true);
+  EventHandler::getInstance()->grabEvents(true);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;
@@ -193 +193 @@
 {
   dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
+  this->attachCamera();
 
 
@@ -200 +201 @@
 {
   dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
+  this->detachCamera();
 
 
@@ -284 +286 @@
 
   //orient the spaceship in direction of the mouse
-   rotQuat = Quaternion::quatSlerp( this->getAbsDir(),mouseDir,fabsf(time)*3);
-   if (this->getAbsDir().distance(rotQuat) > 0.001)
+   rotQuat = Quaternion::quatSlerp( this->getAbsDir(), mouseDir, fabsf(time)*3.0);
+   if (this->getAbsDir().distance(rotQuat) > 0.00000000000001)
     this->setAbsDir( rotQuat);
    //this->setAbsDirSoft(mouseDir,5);
@@ -440 +442 @@
     this->yMouse = event.yRel;
     mouseDir *= (Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0))*Quaternion(-M_PI/4*yMouse*mouseSensitivity, Vector(0,0,1)));
-    if( xMouse*xMouse + yMouse*yMouse < 0.9)
-     this->setAbsDir(mouseDir);
+   // if( xMouse*xMouse + yMouse*yMouse < 0.9)
+     //this->setAbsDir(mouseDir);
   }
 }