Changeset 10599 in orxonox.OLD for branches/cleanup/src/world_entities/creatures

Timestamp:

Feb 24, 2007, 12:25:48 PM (18 years ago)

Author:

bottac

Message:

1st part of the collision bug fix.

BTW, if shouldn't have amarok (what a pity), try to
suspend/'wake up' orxonox (CTRL-Z / fg).

File:

• branches/cleanup/src/world_entities/creatures/fps_player.cc (modified) (2 diffs)

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

@@ -381 +381 @@
   if( !this->isOnGround())
   {
-    this->fallVelocity += 300.0f * time;
+    if(this->fallVelocity + 300.0F*time < 10000.0f)this->fallVelocity += 300.0f * time;
     velocity -= Vector(0.0, 1.0, 0.0) * this->fallVelocity;
 
@@ -390 +390 @@
     this->fallVelocity = 0.0f;
   }
-
-  this->shiftCoor( velocity*time );
-
-
+  if((velocity *time).len() < 10.0f) this->shiftCoor( velocity*time );
+  else{  
+         velocity.normalize();
+         velocity *= 10.0f;
+         this->shiftCoor( velocity );
+       }