Changeset 8852 in orxonox.OLD for branches/single_player_map/src

Timestamp:

Jun 28, 2006, 2:31:15 PM (18 years ago)

Author:

patrick

Message:

collision interface extended

Location:

branches/single_player_map/src

Files:

• lib/collision_reaction/cr_physics_ground_walk.cc (modified) (4 diffs)
• story_entities/game_world.cc (modified) (1 diff)
• world_entities/world_entity.h (modified) (1 diff)

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

@@ -66 +66 @@
   //   collision->getEntityB()->getAbsCoor().debug();
 
-  Vector height;
+  float height;
   AABB* box = collision->getEntityB()->getModelAABB();
   WorldEntity* entity = collision->getEntityB();
-/*
+
   float CR_MAX_WALK_HEIGHT = 2.0f;
 
@@ -88 +88 @@
 
 
-  }*/
+  }
 
 
@@ -94 +94 @@
 
 
-//#if 0
+#if 0
   if( box != NULL)
     height = ( ce->getCollisionPosition() - collision->getEntityB()->getAbsCoor() )*(-1.0f) ;
@@ -151 +151 @@
 
   }// if(box!= NULL)
-//#endif
+#endif
   /*
   PRINTF(0)("Collision with Ground: \n");

branches/single_player_map/src/story_entities/game_world.cc

@@ -308 +308 @@
     /* update the state */
     //this->update (); /// LESS REDUNDANCY.
-    PNode::getNullParent()->updateNode(this->dtS);
+//     PNode::getNullParent()->updateNode(this->dtS);
 
 

branches/single_player_map/src/world_entities/world_entity.h

@@ -88 +88 @@
 
   bool registerCollision(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB);
-  bool registerCollision(WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position);
+  bool registerCollision(WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position, bool bInWall = false);
   /** @return true if there is at least on collision reaction subscribed */
   inline bool isReactive() const { return this->bReactive; }