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

Timestamp:

Jul 4, 2006, 4:41:23 AM (19 years ago)

Author:

patrick

Message:

weapon position fixed also

File:

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

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

@@ -129 +129 @@
   this->getWeaponManager().setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
   this->getWeaponManager().setSlotDirection(1, Quaternion(M_PI_4*.5, Vector(1,0,0)));
-
-
-  AABB* box = this->getModelAABB();
-  if( box != NULL)
-  {
-    this->getWeaponManager().setSlotPosition(0, Vector(1.5, box->halfLength[1] * 2.0f - 0.7, 1.1));
-    this->getWeaponManager().setSlotPosition(1, Vector(5.0, box->halfLength[1] * 2.0f, 0.0));
-  }
-  else
-  {
-    this->getWeaponManager().setSlotPosition(0, Vector(1.5, -0.7, 1.1));
-    this->getWeaponManager().setSlotPosition(1, Vector(5.0, 0.0, 0.0));
-  }
+  this->getWeaponManager().setSlotPosition(0, Vector(1.5, -0.7, 1.1));
+  this->getWeaponManager().setSlotPosition(1, Vector(5.0, 0.0, 0.0));
 
 
@@ -210 +199 @@
     State::getCameraNode()->setRelCoor(0, box->halfLength[1] * 2.0f, 0);
     State::getCameraTargetNode()->setRelCoor(10, box->halfLength[1] * 2.0f, 0);
+
+    this->getWeaponManager().setSlotPosition(0, Vector(1.5, box->halfLength[1] * 2.0f - 0.7, 1.1));
+    this->getWeaponManager().setSlotPosition(1, Vector(5.0, box->halfLength[1] * 2.0f, 0.0));
   }
 }