Changeset 9211 in orxonox.OLD for branches/presentation/src

Timestamp:

Jul 5, 2006, 11:33:15 AM (18 years ago)

Author:

patrick

Message:

weapons placed correctly

File:

• branches/presentation/src/world_entities/creatures/fps_player.cc (modified) (3 diffs)

branches/presentation/src/world_entities/creatures/fps_player.cc

@@ -246 +246 @@
     this->aimingSystem->setParent(&this->cameraNode);
 //     this->aimingSystem->setParentMode(PNODE_ROTATE_AND_MOVE);
-    this->aimingSystem->setRelDir(Quaternion(M_PI_4*-0.55f, Vector(0,0,1)));
+    this->aimingSystem->setRelDir(Quaternion(M_PI_4*-0.58f, Vector(0,0,1)));
     this->aimingSystem->setRelCoor(0, -1, -1);
 
@@ -255 +255 @@
       float f = 1.0;
       this->cameraNode.setRelCoor(0, box->halfLength[1] * f, 0);
-      this->cameraNode.setRelCoor(10, box->halfLength[1] * f, 0);
-
-      this->getWeaponManager().setSlotPosition(0, Vector(-8.0, box->halfLength[1] * f - 1.5, 1.1));
-      this->getWeaponManager().setSlotPosition(1, Vector(5.0, box->halfLength[1] * f, 0.0));
+//       this->cameraNode.setRelCoor(10, box->halfLength[1] * f, 0);
+
+      float v = 0.1f;
+      this->getWeaponManager().setSlotPosition(0, Vector(-8.0, box->halfLength[1] * v, 1.1));
+      this->getWeaponManager().setSlotPosition(1, Vector(5.0, box->halfLength[1] * v, 0.0));
     }
   }
@@ -364 +365 @@
     this->fallVelocity += 300.0f * time;
     velocity -= Vector(0.0, 1.0, 0.0) * this->fallVelocity;
+
+    PRINTF(0)("vel %f\n", velocity);
   }
   else