Changeset 5921 in orxonox.OLD

Timestamp:

Dec 4, 2005, 11:22:50 PM (18 years ago)

Author:

bknecht

Message:

implemented mousecontrol for spaceship

Location:

branches/spaceshipcontrol/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (4 diffs)
• space_ships/space_ship.h (modified) (1 diff)
• weapons/crosshair.cc (modified) (1 diff)

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

@@ -30 +30 @@
 #include "factory.h"
 #include "key_mapper.h"
+#include "event_handler.h"
 
 using namespace std;
@@ -132 +133 @@
   registerEvent(SDLK_PAGEUP);
   registerEvent(SDLK_PAGEDOWN);
+  registerEvent(EV_MOUSE_MOTION);
 
   this->getWeaponManager()->setSlotCount(7);
@@ -261 +263 @@
   // this is the air friction (necessary for a smooth control)
   if(velocity.len() != 0) velocity -= velocity*0.005;
+  
+  this->shiftDir(Quaternion(-M_PI/4*xMouse*time, Vector(0,1,0))*Quaternion(-M_PI/4*yMouse*time, Vector(0,0,1)));
 
   this->shiftCoor (move);
@@ -369 +373 @@
   else if( event.type == SDLK_PAGEDOWN)
     this->bDescend = event.bPressed; //this->shiftCoor(0,-.1,0);
+  else if( event.type == EV_MOUSE_MOTION)
+  {
+    this->xMouse = event.x;
+    this->yMouse = event.y;
+  }
 }
 

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

@@ -55 +55 @@
     bool                  bDescend;           //!< descend button presses.
     bool                  bFire;              //!< fire button pressed.
+    
+    float                 xMouse;             //!< mouse moved in x-Direction
+    float                 yMouse;             //!< mouse moved in y-Direction
 
     Vector                velocity;           //!< the velocity of the player.

branches/spaceshipcontrol/src/world_entities/weapons/crosshair.cc

@@ -70 +70 @@
   this->material = new Material;
 
-  EventHandler::getInstance()->subscribe(this, ES_GAME, EV_MOUSE_MOTION);
+  //EventHandler::getInstance()->subscribe(this, ES_GAME, EV_MOUSE_MOTION);
 
   // center the mouse on the screen, and also hide the cursors