Changeset 8864 in orxonox.OLD for branches/single_player_map/src/lib/collision_reaction

Timestamp:

Jun 28, 2006, 3:51:36 PM (19 years ago)

Author:

patrick

Message:

new collision registration functions

Location:

branches/single_player_map/src/lib/collision_reaction

Files:

• collision_event.h (modified) (4 diffs)
• cr_defs.h (modified) (1 diff)
• cr_physics_ground_walk.cc (modified) (4 diffs)

branches/single_player_map/src/lib/collision_reaction/collision_event.h

@@ -9 +9 @@
 #include "vector.h"
 
+#include "cr_defs.h"
+
+
 class WorldEntity;
 class BoundingVolume;
 class Plane;
+
 
 
@@ -22 +26 @@
 
   /** collides two WorldEntities @param entityA world entity A, @param entityB world entity B, @param bvA volume A @param bvB volumeB */
-  inline void collide(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB)
-  { this->entityA = entityA; this->entityB = entityB; this->bvA = bvA; this->bvB = bvB; }
+  inline void collide(int type, WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB)
+  { this->collisionType = type; this->entityA = entityA; this->entityB = entityB; this->bvA = bvA; this->bvB = bvB; }
   /** collides two WorldEntities @param entity world entity , @param ground ground plane, @param position position on the ground */
-  inline void collide(WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position, bool bInWall)
-  { this->entityA = entity; this->entityB = groundEntity, this->groundNormal = normal; this->position = position; this->bInWall = bInWall; }
+  inline void collide(int type, WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position, bool bInWall)
+  { this->collisionType = type; this->entityA = entity; this->entityB = groundEntity, this->groundNormal = normal; this->position = position; this->bInWall = bInWall; }
 
 
@@ -44 +48 @@
   inline Vector getCollisionPosition() { return this->position; }
 
+  /** @return the type of the collision */
+  inline int getType() { return this->collisionType; }
+
   /** @return true if the entity is in the wall */
   inline bool isInWall() { return this->bInWall; }
@@ -59 +66 @@
 
   bool              bInWall;                       //!< true if is in wall
+  int               collisionType;                 //!< collision type
 };
 

branches/single_player_map/src/lib/collision_reaction/cr_defs.h

@@ -28 +28 @@
 
 
+//!< the collision axis x collision event
+#define COLLISION_TYPE_AXIS_X   1
+//!< the collision axis y collision event
+#define COLLISION_TYPE_AXIS_Y   2
+//!< the collision axis z collision event
+#define COLLISION_TYPE_AXIS_Z   4
+//!< the collision is a obb collision
+#define COLLISION_TYPE_OBB      8
+
 
 #endif /* _NETWORK_MANAGER */

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();
@@ -73 +73 @@
   float CR_THRESHOLD = 0.2f;
 
-//   if( box != NULL)
-//   {
-//
-//     Vector collPos =  collision->getEntityB()->getAbsCoor()  + box->center - ce->getCollisionPosition();
-//     height = collPos.y - box->halfLength[1];
-//
-//     PRINTF(0)("height: %f          , model height: %f\n", height, box->halfLength[1]);
-//     PRINTF(0)(" ground normal: %f, %f, %f\n", normal.x, normal.y, normal.z);
-//
-//     // object is beneath the plane (ground)
-//     if( height < 0.0f )
-//     {
-//       entity->shiftCoor(Vector(0, -height, 0));
-//     }
-//     // object is already in the wall
-//     else if( ce->isInWall())
-//     {
-//
-//     }
-//
-//
-//
-//   }
+  if( box != NULL)
+  {
+
+    Vector collPos =  collision->getEntityB()->getAbsCoor()  + box->center - ce->getCollisionPosition();
+    height = collPos.y - box->halfLength[1];
+
+    PRINTF(0)("height: %f          , model height: %f\n", height, box->halfLength[1]);
+    PRINTF(0)(" ground normal: %f, %f, %f\n", normal.x, normal.y, normal.z);
+
+    // object is beneath the plane (ground)
+    if( height < 0.0f )
+    {
+      entity->shiftCoor(Vector(0, -height, 0));
+    }
+    // object is already in the wall
+    else if( ce->isInWall())
+    {
+      entity->setAbsCoor(entity->getLastAbsCoor());
+    }
+
+
+
+  }
 
 
@@ -101 +101 @@
 
 
-// #if 0
+#if 0
   if( box != NULL)
     height = ( ce->getCollisionPosition() - collision->getEntityB()->getAbsCoor() )*(-1.0f) ;
@@ -158 +158 @@
 
   }// if(box!= NULL)
-// #endif
+#endif
   /*
   PRINTF(0)("Collision with Ground: \n");