Changeset 9105 in orxonox.OLD for branches/presentation

Timestamp:

Jul 4, 2006, 5:16:29 AM (19 years ago)

Author:

patrick

Message:

jumping works now too

Location:

branches/presentation/src/world_entities/creatures

Files:

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

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

@@ -97 +97 @@
 
   this->fallVelocity = 0.0f;
+  this->jumpForce = 0.0f;
 
   this->cameraNode.setParent(this);
@@ -273 +274 @@
   if( this->bJump && likely(this->getModel(0) != NULL))
   {
-    if( ((InteractiveModel*)this->getModel(0))->getAnimation() != JUMP)
-      ((InteractiveModel*)this->getModel(0))->setAnimation(JUMP);
+    if( this->jumpForce < 1.0f)
+    {
+      this->jumpForce = 300.0f;
+
+      if( ((InteractiveModel*)this->getModel(0))->getAnimation() != JUMP)
+        ((InteractiveModel*)this->getModel(0))->setAnimation(JUMP);
+    }
   }
   else if(velocity.len() != 0.0f)
@@ -287 +293 @@
   }
 
+
+  velocity.y += this->jumpForce;
+  if( this->jumpForce > 1.0f)
+    this->jumpForce *= 0.9f;
 
 

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

@@ -54 +54 @@
 
     float                 fallVelocity;        //!< velocity for falling down
+    float                 jumpForce;           //!< the jump force
 };