Changeset 10566 in orxonox.OLD for trunk

Timestamp:

Feb 4, 2007, 11:35:51 AM (18 years ago)

Author:

snellen

Message:

renamed jumpForce to jumpAcclereration (that is what tihs variable means physically)

Location:

trunk/src/world_entities/creatures

Files:

• fps_player.cc (modified) (3 diffs)
• fps_player.h (modified) (1 diff)

trunk/src/world_entities/creatures/fps_player.cc

@@ -103 +103 @@
 
   this->fallVelocity = 0.0f;
-  this->jumpForce = 0.0f;
+  this->jumpAcceleration = 0.0f;
 
   this->cameraNode.setParent(this);
@@ -352 +352 @@
     if( this->bJump)
     {
-      if( this->jumpForce < 1.0f)
+      if( this->jumpAcceleration < 1.0f)
       {
-        this->jumpForce = 300.0f;
+        this->jumpAcceleration = 300.0f;
 
         if( ((InteractiveModel*)this->getModel(0))->getAnimation() != JUMP)
@@ -373 +373 @@
 
 
-  velocity.y += this->jumpForce;
-  if( this->jumpForce > 1.0f)
-    this->jumpForce *= 0.9f;
+  velocity.y += this->jumpAcceleration;
+  if( this->jumpAcceleration > 1.0f)
+    this->jumpAcceleration *= 0.9f;
 
 

trunk/src/world_entities/creatures/fps_player.h

@@ -61 +61 @@
 
     float                 fallVelocity;        //!< velocity for falling down
-    float                 jumpForce;           //!< the jump force
+    float                 jumpAcceleration;    //!< the jump acceleration 
 
     bool                  initWeapon;