Changeset 6206 in orxonox.OLD

Timestamp:

Dec 21, 2005, 2:08:46 AM (18 years ago)

Author:

bensch

Message:

christmas: split control to X and Y

Location:

branches/christmas_branche/src/world_entities/creatures

Files:

• md2_creature.cc (modified) (4 diffs)
• md2_creature.h (modified) (1 diff)

branches/christmas_branche/src/world_entities/creatures/md2_creature.cc

@@ -99 +99 @@
   //this->getWeaponManager()->addWeapon(turret, 3, 0);
 
-  this->getWeaponManager()->changeWeaponConfig(1);
+  this->getWeaponManager()->changeWeaponConfig(0);
 }
 
@@ -125 +125 @@
   travelSpeed = 15.0;
   this->velocity = Vector(0.0,0.0,0.0);
-  this->mouseDir = this->getAbsDir();
 
 //   GLGuiButton* button = new GLGuiPushButton();
@@ -276 +275 @@
 
   //orient the MD2Creature in direction of the mouse
-  this->setAbsDir( /*rotQuat*/ mouseDir);
+  this->setAbsDir( /*rotQuat*/ mouseDirX);
 
   this->getWeaponManager()->tick(time);
@@ -377 +376 @@
     this->xMouse = event.xRel;
     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)));
+    this->mouseDirX *= Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0));
+    this->mouseDirY *= Quaternion(-M_PI/4*yMouse*mouseSensitivity, Vector(0,0,1));
 //     if( xMouse*xMouse < 0.9)
 //      this->setAbsDir(mouseDir);

branches/christmas_branche/src/world_entities/creatures/md2_creature.h

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