Changeset 8490 in orxonox.OLD for trunk/src/lib/collision_reaction/collision_handle.cc

Timestamp:

Jun 15, 2006, 9:34:48 PM (18 years ago)

Author:

patrick

Message:

merged the bsp branche back to trunk

File:

• trunk/src/lib/collision_reaction/collision_handle.cc (modified) (6 diffs)

trunk/src/lib/collision_reaction/collision_handle.cc

@@ -24 +24 @@
 
 #include "cr_object_damage.h"
+#include "cr_physics_ground_walk.h"
 
 #include "debug.h"
@@ -42 +43 @@
 
   this->bCollided = false;
-  this->bDispatched = false;
-
-  if( this->type == CREngine::CR_PHYSICS_STEP_BACK)
-    this->bContinuousPoll = false;
-  else
-    this->bContinuousPoll = true;
-
-  if( this->type == CREngine::CR_OBJECT_DAMAGE)
-    this->bStopOnFirstCollision = true;
-  else
-   this->bStopOnFirstCollision = false;
+  this->bDispatched = true;
+
+  this->collisionReaction = NULL;
+  this->bContinuousPoll = false;
+  this->bStopOnFirstCollision = false;
+
 
   switch( type)
   {
+    case CREngine::CR_PHYSICS_STEP_BACK:
+//       this->collisionReaction = new CRPhysicsGroundWalk();
+      this->bContinuousPoll = true;
+      break;
+    case CREngine::CR_PHYSICS_GROUND_WALK:
+      this->collisionReaction = new CRPhysicsGroundWalk();
+      this->bContinuousPoll = true;
+      break;
     case CREngine::CR_OBJECT_DAMAGE:
       this->collisionReaction = new CRObjectDamage();
+      this->bStopOnFirstCollision = true;
       break;
     default:
@@ -71 +76 @@
 {
   // delete what has to be deleted here
+  if( this->collisionReaction != NULL)
+    delete this->collisionReaction;
 }
 
@@ -169 +176 @@
 
  c->registerCollisionEvent(collisionEvent);
+ PRINTF(0)("Registering Collision Event: %s, %s\n", collisionEvent->getEntityA()->getClassName(), collisionEvent->getEntityB()->getClassName());
 }
 
@@ -186 +194 @@
 void CollisionHandle::handleCollisions()
 {
+  // if continuous poll poll the reaction
+  if( this->bContinuousPoll && !this->bCollided)
+  {
+    this->collisionReaction->update(this->owner);
+    return;
+  }
+
   // collision reaction calculations (for every collision there will be a reaction)
   vector<Collision*>::iterator it = this->collisionList.begin();
@@ -214 +229 @@
   {
     if( collisionEvent->getEntityA() == this->owner) {
-      if( collisionEvent->getEntityA()->isA((ClassID)(*it)))
+      if( collisionEvent->getEntityB()->isA((ClassID)(*it))) {
+        PRINTF(0)("I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(),
+                  collisionEvent->getEntityB()->getClassName(), *it);
         return true; }
+    }
     else {
-      if( collisionEvent->getEntityB()->isA((ClassID)(*it)))
-        return true; }
+      if( collisionEvent->getEntityA()->isA((ClassID)(*it))) {
+        PRINTF(0)("I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(),
+                  collisionEvent->getEntityA()->getClassName(), *it);
+      return true; }
+    }
   }