Changeset 9101 in orxonox.OLD for branches/presentation/src/world_entities/creatures

Timestamp:

Jul 4, 2006, 4:38:53 AM (19 years ago)

Author:

patrick

Message:

bigger fps player (right height from model), collision reaction refinement. still there is a possibility to go through walls because of interference in the cr system. not 1st prio but later on fixed

File:

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

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

@@ -27 +27 @@
 #include "weapons/cannon.h"
 #include "weapons/fps_sniper_rifle.h"
+
+#include "aabb.h"
 
 #include "key_mapper.h"
@@ -124 +126 @@
 
   this->getWeaponManager().setSlotCount(2);
-  this->getWeaponManager().setSlotPosition(0, Vector(1.5, -0.7, 1.1));
 //   this->getWeaponManager().setSlotDirection(0, Quaternion(M_PI_2, Vector(0,1,0)));
   this->getWeaponManager().setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-  this->getWeaponManager().setSlotPosition(1, Vector(5.0, 0.0, 0.0));
   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().setParentNode(&this->cameraNode);
@@ -191 +205 @@
 
 
-  State::getCameraNode()->setRelCoor(0,0,0);
-  State::getCameraTargetNode()->setRelCoor(10,0,0);
+  AABB* box = this->getModelAABB();
+  if( box != NULL)
+  {
+    State::getCameraNode()->setRelCoor(0, box->halfLength[1] * 2.0f, 0);
+    State::getCameraTargetNode()->setRelCoor(10, box->halfLength[1] * 2.0f, 0);
+  }
 }
 
@@ -209 +227 @@
 void FPSPlayer::tick (float time)
 {
-  
+
   if( this->bPosBut)
   {
@@ -215 +233 @@
     printf("mechanic:walkTo( %f, mheight, %f)\n",this->getAbsCoorX(),this->getAbsCoorZ());
   }
-  
+
   Playable::tick( time );