Changeset 6391 in orxonox.OLD

Timestamp:

Jan 3, 2006, 10:27:13 AM (18 years ago)

Author:

bknecht

Message:

Control: finetuning and corrections of helicopter and spaceship

Location:

branches/spaceshipcontrol/src/world_entities/space_ships

Files:

• helicopter.cc (modified) (3 diffs)
• space_ship.cc (modified) (1 diff)
• space_ship.h (modified) (1 diff)

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

@@ -27 +27 @@
 #include "key_mapper.h"
 #include "event_handler.h"
+#include "state.h"
 
 #include "graphics_engine.h"
@@ -175 +176 @@
 //   this->getWeaponManager()->setSlotPosition(9, Vector(-2.5, -0.3, 2.0));
 //   this->getWeaponManager()->setSlotDirection(9, Quaternion(+M_PI, Vector(1,0,0)));:
+     
+  this->getWeaponManager()->getFixedTarget()->setParent(this);
+  this->getWeaponManager()->getFixedTarget()->setRelCoor(100000,0,0);
+
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
 
 }
@@ -194 +200 @@
   dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
   this->attachCamera();
+
 
 }

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

@@ -299 +299 @@
 
   //readjust
- // if (this->getAbsDirZ().y > 0.1) this->shiftDir(Quaternion(time*0.3, Vector(1,0,0)));
+  
+  /*
+    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)));
 

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

@@ -69 +69 @@
     Vector                velocity;           //!< the velocity of the player.
     Quaternion            mouseDir;           //!< the direction where the player wants to fly
-    Quaternion rotQuat;
+    Quaternion            rotQuat;
     float                 travelSpeed;        //!< the current speed of the player (to make soft movement)
     float                 acceleration;       //!< the acceleration of the player.