Changeset 8213 in orxonox.OLD for branches/bsp_model/src/lib/collision_reaction

Timestamp:

Jun 7, 2006, 9:06:41 PM (18 years ago)

Author:

patrick

Message:

bsp: integrating the bspmanager fully into the collision detection/reaction system

Location:

branches/bsp_model/src/lib/collision_reaction

Files:

• collision_handle.cc (modified) (3 diffs)
• cr_engine.cc (modified) (1 diff)

branches/bsp_model/src/lib/collision_reaction/collision_handle.cc

@@ -24 +24 @@
 
 #include "cr_object_damage.h"
+#include "cr_physics_ground_walk.h"
 
 using namespace std;
@@ -42 +43 @@
   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->collisionReaction = NULL;
+  this->bContinuousPoll = true;
+  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();
+      break;
     case CREngine::CR_OBJECT_DAMAGE:
       this->collisionReaction = new CRObjectDamage();
+      this->bStopOnFirstCollision = true;
       break;
     default:
@@ -69 +73 @@
 {
   // delete what has to be deleted here
+  if( this->collisionReaction != NULL)
+    delete this->collisionReaction;
 }
 

branches/bsp_model/src/lib/collision_reaction/cr_engine.cc

@@ -124 +124 @@
 {
   std::vector<CollisionHandle*>::iterator it;
-  for( it = this->collisionHandles.begin(); it != this->collisionHandles.end(); it++)
-  {
-    if( *it == collisionHandle)
-    {
+  for( it = this->collisionHandles.begin(); it != this->collisionHandles.end(); it++)  {
+    if( *it == collisionHandle) {
       this->collisionHandles.erase(it);
       delete collisionHandle;