Changeset 9139 in orxonox.OLD

Timestamp:

Jul 4, 2006, 3:05:59 PM (18 years ago)

Author:

rennerc

Message:

fpsplayer weapon position, jump sync

Location:

branches/presentation/src/world_entities/creatures

Files:

• fps_player.cc (modified) (5 diffs)
• fps_player.h (modified) (2 diffs)

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

@@ -148 +148 @@
   registerVar( new SynchronizeableBool( &bForward, &bForward, "bForward", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableBool( &bBackward, &bBackward, "bBackward", PERMISSION_OWNER ) );
+  registerVar( new SynchronizeableBool( &bJump, &bJump, "bJump", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableFloat( &heading, &heading, "heading", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableFloat( &attitude, &attitude, "attitude", PERMISSION_OWNER ) );
@@ -153 +154 @@
     //subscribe to collision reaction
   this->subscribeReaction(CREngine::CR_PHYSICS_FULL_WALK, CL_BSP_ENTITY);
+  
+  this->initWeapon = false;
 }
 
@@ -215 +218 @@
 void FPSPlayer::tick (float time)
 {
+  if ( !this->initWeapon )
+  {
+    this->initWeapon = true;
+    
+    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));
+    }
+  }
 
   if( this->bJump)
@@ -382 +400 @@
 }
 
+/*
 void FPSPlayer::respawn( )
 {
@@ -397 +416 @@
   }
 }
-
-
-
-
+*/
+
+
+

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

@@ -27 +27 @@
     virtual void reset();
     
-    virtual void respawn();
+    //virtual void respawn();
 
     virtual void tick(float time);
@@ -56 +56 @@
     float                 fallVelocity;        //!< velocity for falling down
     float                 jumpForce;           //!< the jump force
+    
+    bool                  initWeapon;
 };