Changeset 9122 in orxonox.OLD

Timestamp:

Jul 4, 2006, 2:08:14 PM (18 years ago)

Author:

rennerc

Message:

move weapon

Location:

branches/presentation/src/world_entities

Files:

• creatures/fps_player.cc (modified) (2 diffs)
• creatures/fps_player.h (modified) (1 diff)
• world_entity.cc (modified) (1 diff)

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

@@ -191 +191 @@
   this->getWeaponManager().getFixedTarget()->setParent(State::getCameraTargetNode());
   this->getWeaponManager().getFixedTarget()->setRelCoor(0,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);
-
-    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));
-  }
 }
 
@@ -387 +376 @@
 }
 
-
-
-
+void FPSPlayer::respawn( )
+{
+  Playable::respawn();
+  
+  AABB* box = this->getModelAABB();
+  if( box != NULL)
+  {
+    float f = 1.3f;
+    State::getCameraNode()->setRelCoor(0, box->halfLength[1] * f, 0);
+    State::getCameraTargetNode()->setRelCoor(10, box->halfLength[1] * f, 0);
+
+    this->getWeaponManager().setSlotPosition(0, Vector(1.5, box->halfLength[1] * f - 0.7, 1.1));
+    this->getWeaponManager().setSlotPosition(1, Vector(5.0, box->halfLength[1] * f, 0.0));
+  }
+}
+
+
+
+

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

@@ -26 +26 @@
 
     virtual void reset();
-
+    
+    virtual void respawn();
 
     virtual void tick(float time);

branches/presentation/src/world_entities/world_entity.cc

@@ -156 +156 @@
   this->modelLODName = fileName;
   this->scaling = scaling;
-  
-  if ( isA( CL_FPS_PLAYER ) )
-    PRINTF(0)("\n\n\n\n\n\n\n\n\n\n%f\n\n\n\n\n\n\n\n\n\n", scaling);
 
   std::string name = fileName;