Changeset 9003 in orxonox.OLD for trunk/src/world_entities/creatures

Timestamp:

Jul 2, 2006, 1:36:13 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the single_player_map branche back
merged with command:
svn merge -r8896:HEAD ​https://svn.orxonox.net/orxonox/branches/single_player_map .
no conflicts

Location:

trunk/src/world_entities/creatures

Files:

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

trunk/src/world_entities/creatures/fps_player.cc

@@ -83 +83 @@
   this->bBackward = false;
   this->bJump = false;
+  this->bPosBut = false;
 
   this->xMouse = 0.0f;
@@ -90 +91 @@
   this->setHealth(80);
 
+  this->fallVelocity = 0.0f;
 
   this->cameraNode.setParent(this);
@@ -121 +123 @@
 
   this->getWeaponManager().setSlotCount(2);
-  this->getWeaponManager().setSlotPosition(0, Vector(0.0, 5.0, 0.0));
-  this->getWeaponManager().setSlotDirection(1, Quaternion(M_PI_4*.5, Vector(0,1,0)));
+  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(-0.5, .2, 1.9));
+  this->getWeaponManager().setSlotPosition(1, Vector(5.0, 0.0, 0.0));
   this->getWeaponManager().setSlotDirection(1, Quaternion(M_PI_4*.5, Vector(1,0,0)));
 
@@ -205 +207 @@
 void FPSPlayer::tick (float time)
 {
+  
+  if( this->bPosBut)
+  {
+    this->bPosBut = false;
+    printf("prisoner:walkTo( %f, height, %f)\n",this->getAbsCoorX(),this->getAbsCoorZ());
+  }
+  
   Playable::tick( time );
 
@@ -251 +260 @@
   }
 
+
   velocity *= 100;
 
+
+  // physical falling of the player
+  if( !this->isOnGround())
+  {
+    this->fallVelocity += 300.0f * time;
+    velocity -= Vector(0.0, 1.0, 0.0) * this->fallVelocity;
+  }
+  else
+  {
+    this->fallVelocity = 0.0f;
+  }
+
+
   this->shiftCoor( velocity*time );
+
+
+
 
 
@@ -321 +347 @@
   }
   else if( event.type == KeyMapper::PEV_JUMP)
-    this->getAbsCoor().debug();
-}
-
-
-
-
+    this->bPosBut = event.bPressed;
+}
+
+
+
+

trunk/src/world_entities/creatures/fps_player.h

@@ -42 +42 @@
     bool                  bBackward;
     bool                  bJump;              //!< jumping
+    bool                  bPosBut;             //!< position button
 
     float                 xMouse;             //!< mouse moved in x-Direction
@@ -51 +52 @@
 
     PNode                 cameraNode;
+
+    float                 fallVelocity;        //!< velocity for falling down
 };