Changeset 6722 in orxonox.OLD for branches

Timestamp:

Jan 25, 2006, 5:24:34 PM (19 years ago)

Author:

bknecht

Message:

Control: minor changes on helicopter crosshair

Location:

branches/spaceshipcontrol/src/world_entities

Files:

• space_ships/helicopter.cc (modified) (2 diffs)
• weapons/turret.cc (modified) (2 diffs)

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

@@ -142 +142 @@
   
   this->loadModel("models/ships/rotor.obj",1.0,3);
-  this->loadModel("models/ships/rotor.obj",0.15,4);
+  this->loadModel("models/ships/rotor.obj",0.2,4);
 
 
@@ -521 +521 @@
 
     
-    if ((this->cameraNode.getAbsDirY()).y < 0.8)
+    if ((this->cameraNode.getAbsDirY()).y < 0.5)
     {
      if((this->cameraNode.getAbsDirX()).y > 0)
      {
-        if(yMouse > 0) this->cameraNode.shiftDir(yDir);;
+        if(yMouse > 0) this->cameraNode.shiftDir(yDir);
      }
      else
      {
-         if(yMouse < 0) this->cameraNode.shiftDir(yDir);;
+         if(yMouse < 0) this->cameraNode.shiftDir(yDir);
      }
     }

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

@@ -116 +116 @@
 void Turret::tick(float dt)
 {
-/*
+
   Quaternion quat;
-  Vector direction = this->getAbsCoor();/*this->getWeaponManager()->getFixedTarget()->getAbsCoor() - this->getAbsCoor();
+  Vector direction = this->getAbsCoor();/*this->getWeaponManager()->getFixedTarget()->getAbsCoor() - this->getAbsCoor();*/
 
   direction.normalize();
@@ -127 +127 @@
     quat = Quaternion(direction, Vector(0,1,0)) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
 
-  this->setAbsDirSoft(quat, 5);*/
+  this->setAbsDirSoft(quat, 5);
 }