Changeset 10714 in orxonox.OLD for branches/presentation/src/world_entities/space_ships

Timestamp:

Jun 18, 2007, 3:19:15 PM (18 years ago)

Author:

nicolasc

Message:

initial upload form mouse aiming in VS

Location:

branches/presentation/src/world_entities/space_ships

Files:

• space_ship.cc (modified) (6 diffs)
• space_ship.h (modified) (2 diffs)

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

@@ -274 +274 @@
   registerVar( new SynchronizeableBool( &bFire, &bFire, "bSecFire", PERMISSION_OWNER));
   registerVar( new SynchronizeableVector( &velocity, &velocity, "velocity", PERMISSION_MASTER_SERVER ) );
+//   registerVar( new SynchronizeableQuaternion( &mouseDir, &mouseDir, "mousedir", PERMISSION_OWNER ) );
 
   //this->airFriction = 0.5f;
@@ -554 +555 @@
 void SpaceShip::process(const Event &event)
 {
-  //Playable::process(event);
+//   Playable::process(event);
 
   if( event.type == KeyMapper::PEV_LEFT)
@@ -572 +573 @@
   else if( event.type == KeyMapper::PEV_FIRE2)
     this->bSecFire = event.bPressed;
-  else if( event.type == KeyMapper::PEV_FIRE1)
+  else if( event.type == KeyMapper::PEV_FIRE1){
+    printf("fireing primary");
     this->bFire = event.bPressed;
+  }
   else if( event.type == KeyMapper::PEV_NEXT_WEAPON && event.bPressed)
   {
@@ -580 +583 @@
   else if ( event.type == KeyMapper::PEV_PREVIOUS_WEAPON && event.bPressed)
     this->previousWeaponConfig();
-
-  if (!(State::getCamera()->getEventHandling()))
+  else if( event.type == EV_MOUSE_MOTION)
+  {
+//     printf("Spaceship Mouse Motion Event\n");
+//     dynamic_cast<Crosshair*>(this->weaponMan.getFixedTarget())->process(event);
+//     this->weaponMan.process(event);
+    this->xMouse += event.xRel;
+    this->yMouse += event.yRel;
+//     printf("Mouse Coord: %f, %f\n", this->xMouse, this->yMouse);
+    this->weaponMan.getFixedTarget()->setRelCoor(10000, 4*xMouse, 4*yMouse);
+  }
+  else if (!(State::getCamera()->getEventHandling()))
   {
     //PRINTF(0)("\n\n\n\n\n\n\n\nSETCAMERA %x\n\n\n\n\n\n\n", State::getCamera());
@@ -622 +634 @@
   }
 
-
-  /*
-  else if( event.type == EV_MOUSE_MOTION)
-  {
-
-    this->xMouse += event.xRel;
-    this->yMouse += event.yRel;
-  }
-  */
 }
 
@@ -821 +824 @@
         State::getCamera()->setEventHandling(false);
 
-        PRINTF(0)("\n\n\n\n\n\n\n\nSETCAMERA %x\n\n\n\n\n\n\n", State::getCamera());
+        PRINTF(0)("SETCAMERA %x\n", State::getCamera());
         State::getCamera()->setViewMode(Camera::ViewNormal);
         State::getCameraTargetNode()->setParent(this);

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

@@ -168 +168 @@
     bool                  bInit;              //!< set true, if MP have been loaded
 
-    /*
+
     float                 xMouse;             //!< mouse moved in x-Direction
     float                 yMouse;             //!< mouse moved in y-Direction
     float                 mouseSensitivity;   //!< the mouse sensitivity
-    int                   yInvert;
-    int                   controlVelocityX;
-    int                   controlVelocityY;
-    */
+//     int                   yInvert;
+//     int                   controlVelocityX;
+//     int                   controlVelocityY;
+
 
     Vector                velocity;           //!< the velocity of the player.
@@ -199 +199 @@
     void                  setCameraFovy(float fovy);
 
-    /*
+
     Quaternion            mouseDir;           //!< the direction where the player wants to fly
-    Quaternion            oldMouseDir;        //!< the direction where the player wanted to fly
+    /*Quaternion            oldMouseDir;        //!< the direction where the player wanted to fly
     float                 shipInertia;        //!< the inertia of the ship(how fast the ship reacts to a mouse input)
     Quaternion            rotQuat;