Changeset 6679 in orxonox.OLD for trunk/src/world_entities/space_ships

Timestamp:

Jan 24, 2006, 10:56:46 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: WeaponManager seems to work, better than before.

File:

• trunk/src/world_entities/space_ships/space_ship.cc (modified) (4 diffs)

trunk/src/world_entities/space_ships/space_ship.cc

@@ -110 +110 @@
   this->addWeapon(wpRight,1 ,1);
   this->addWeapon(cannon, 0, 6);
-
-  //this->addWeapon(turret, 3, 0);
 
   this->getWeaponManager()->changeWeaponConfig(1);
@@ -291 +289 @@
     if (yMouse > controlVelocityY) yMouse = controlVelocityY;
     else if (yMouse < -controlVelocityY) yMouse = -controlVelocityY;
-    
+
     pitchDir = (Quaternion(xMouse*mouseSensitivity*0.5, Vector(1,0,0)));
-    
+
     mouseDir *= (Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0))*Quaternion(-M_PI/4*yMouse*mouseSensitivity*yInvert, Vector(0,0,1))*pitchDir);
     xMouse = yMouse = 0;
@@ -306 +304 @@
 
   Vector move = velocity*time;
-  
+
   //orient the velocity in the direction of the spaceship.
   travelSpeed = velocity.len();
@@ -321 +319 @@
   if(travelSpeed >= 120) velocity -= velocity.getNormalized()*travelSpeed*travelSpeed*0.0001;
   else if (travelSpeed <= 80) velocity -= velocity.getNormalized()*travelSpeed*0.001;
-  
+
   //other physics (gravity)
   if(travelSpeed < 120)
   move += Vector(0,-1,0)*60*time + Vector(0,1,0)*travelSpeed/2*time;
-   
+
   //hoover effect
   //cycle += time;