Changeset 8940 in orxonox.OLD

Timestamp:

Jun 30, 2006, 2:44:43 AM (18 years ago)

Author:

patrick

Message:

falling down fps player

Location:

branches/single_player_map/src

Files:

• lib/collision_reaction/cr_physics_ground_walk.cc (modified) (2 diffs)
• world_entities/creatures/fps_player.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)

branches/single_player_map/src/lib/collision_reaction/cr_physics_ground_walk.cc

@@ -121 +121 @@
         {
           entity->shiftCoor(Vector(0.0f, -height, 0.0f));
+//           entity->setOnGround(true);
         }
         // object is already in the wall
@@ -126 +127 @@
         {
           entity->setAbsCoor(entity->getLastAbsCoor());
+        }
+        else
+        {
+          // entity is not on ground
+//           entity->setOnGround(false);
         }
         break;

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

@@ -252 +252 @@
   }
 
+
+  velocity *= 100;
+
+
   // physical falling of the player
-
-
-//   this->fallVelocity += 10.0f * time + this->fallVelocity;
-
-
-  velocity *= 100;
+  if( !this->isOnGround())
+  {
+    this->fallVelocity += 10.0f * time;
+    velocity -= Vector(0.0, 1.0, 0.0) * this->fallVelocity;
+  }
+  else
+  {
+    this->fallVelocity = 0.0f;
+  }
+
 
   this->shiftCoor( velocity*time );

branches/single_player_map/src/world_entities/world_entity.cc

@@ -82 +82 @@
     this->collisionHandles[i] = NULL;
   this->bReactive = false;
+  this->bOnGround = false;
 
   // registering default reactions: