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

Timestamp:

Jun 18, 2007, 7:40:40 PM (18 years ago)

Author:

nicolasc

Message:

bump, minor fixes

Location:

branches/presentation/src/world_entities/space_ships

Files:

• space_ship.cc (modified) (6 diffs)
• space_ship.h (modified) (1 diff)

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

@@ -205 +205 @@
 
   this->mouseSensitivity = 4;
+  this->xMouse = this->yMouse = 0;
+
 
   this->weaponMan.changeWeaponConfig(0);
@@ -222 +224 @@
   loadEngine(15);
 
-//   this->loadModel("models/spaceships/fighter_redesign9.obj");
-  //this->setVisibiliy(false);
-
   bForward = bBackward = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = bFire = bSecFire = false;
-
-//   this->setHealthMax(shieldMax);
-//   this->setHealth(shieldCur);
 
   this->travelNode = new PNode();
@@ -261 +257 @@
 
   this->secWeaponMan.getFixedTarget()->setParent(this);
-  this->secWeaponMan.getFixedTarget()->setRelCoor(100000,0,0);
+  this->secWeaponMan.getFixedTarget()->setRelCoor(50000,0,0);
   this->secWeaponMan.setRotationSpeed(0);
 
@@ -289 +285 @@
   //this->airFriction = 0.0f;
 
-  srand(time(0));  //initaialize RNG
+//   srand(time(0));  //initaialize RNG
 
   this->travelNode->debugDraw();
@@ -377 +373 @@
   this->resetElectronic();
   this->velocity = Vector(0.0, 0.0, 0.0);
+  this->xMouse = this->yMouse = 0;
 }
 
@@ -593 +590 @@
 //     printf("Mouse Coord: %f, %f\n", this->xMouse, this->yMouse);
     this->weaponMan.getFixedTarget()->setRelCoor(100000, -100 * this->mouseSensitivity * yMouse, 100 * this->mouseSensitivity * xMouse);
-    this->secWeaponMan.getFixedTarget()->setRelCoor(100000, -100 * this->mouseSensitivity * yMouse, 100 * this->mouseSensitivity * xMouse);
+    this->secWeaponMan.getFixedTarget()->setRelCoor(50000, -50 * this->mouseSensitivity * yMouse, 50 * this->mouseSensitivity * xMouse);
   }
   else if (!(State::getCamera()->getEventHandling()))

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

@@ -202 +202 @@
 
 
-    Quaternion            mouseDir;           //!< the direction where the player wants to fly
+    //Quaternion            mouseDir;           //!< the direction where the player wants 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)