Changeset 8129 in orxonox.OLD

Timestamp:

Jun 3, 2006, 3:37:01 PM (18 years ago)

Author:

patrick

Message:

cr: finished cleaning up the code, collision reaction now integrated and should either work or throw a sigfault

Location:

branches/cr/src/lib

Files:

• collision_reaction/collision.cc (modified) (2 diffs)
• collision_reaction/collision.h (modified) (2 diffs)
• collision_reaction/collision_handle.cc (modified) (3 diffs)
• collision_reaction/collision_handle.h (modified) (2 diffs)
• collision_reaction/cr_object_damage.cc (modified) (2 diffs)
• graphics/effects/atmospheric_engine.cc (modified) (1 diff)

branches/cr/src/lib/collision_reaction/collision.cc

@@ -45 +45 @@
 
 /**
- * handles the collision events
- */
-void Collision::handleCollisionEvents()
-{
-
-  this->bDispatched = true;
-  this->flushCollisionEvents();
-}
-
-
-/**
  * flushes the CollisionEvent list
  */
@@ -66 +55 @@
   this->entityBCollide = false;
 
-  this->bDispatched = false;
+  this->bDispatched = true;
 
   this->collisionEvents.clear();

branches/cr/src/lib/collision_reaction/collision.h

@@ -45 +45 @@
     /** @returns true if this Collision has already been dispatched */
     inline bool isDispatched() { return this->bDispatched; }
+    /** sets the dispatched flag to true */
+    inline void dispatched() { this->bDispatched = true; }
 
     /** registers a @param event CollisionEvent to take place */
@@ -52 +54 @@
 
 
-    void handleCollisionEvents();
-
-
-  private:
     void flushCollisionEvents();
 

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

@@ -21 +21 @@
 #include "collision.h"
 #include "collision_event.h"
+#include "collision_reaction.h"
+
+#include "cr_object_damage.h"
 
 using namespace std;
@@ -37 +40 @@
 
   this->bCollided = false;
-  this->bContinuousPoll = false;
   this->bDispatched = false;
-  this->bStopOnFirstCollision = 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;
+
+  switch( type)
+  {
+    case CREngine::CR_OBJECT_DAMAGE:
+      this->collisionReaction = new CRObjectDamage();
+      break;
+    default:
+      break;
+  };
 }
 
@@ -166 +186 @@
   vector<Collision*>::iterator it = this->collisionList.begin();
   for(; it < this->collisionList.end(); it++) {
-    (*it)->handleCollisionEvents();
+    this->collisionReaction->reactToCollision(*it);
   }
 

branches/cr/src/lib/collision_reaction/collision_handle.h

@@ -16 +16 @@
 class Collision;
 class WorldEntity;
+class CollisionReaction;
 
 
@@ -63 +64 @@
     std::vector<long>             targetList;              //!< a list of target classes for filtering
 
+    CollisionReaction*            collisionReaction;       //!< reference to the collision reaction object
+
 };
 

branches/cr/src/lib/collision_reaction/cr_object_damage.cc

@@ -54 +54 @@
   float damage;
 
-  PRINTF(0)("dealing damage\n");
+  PRINTF(0)("Dealing damage - Handling collision: %s vs %s\n",
+            collision->getEntityA()->getClassName(),
+            collision->getEntityB()->getClassName());
 
   // the collision damage been dealed by the entity
@@ -66 +68 @@
   }
 
+  collision->flushCollisionEvents();
+  collision->dispatched();
+
 //   const std::vector<CollisionEvent*>* collisionEvents = &(collision->getCollisionEvents());
 //   std::vector<CollisionEvent*>::const_iterator it = collisionEvents->begin();

branches/cr/src/lib/graphics/effects/atmospheric_engine.cc

@@ -127 +127 @@
     for (it = weatherEffects->begin(); it != weatherEffects->end(); it++)
     {
-      printf("%s::%s \n", (*it)->getClassName(), (*it)->getName());
+/*      printf("%s::%s \n", (*it)->getClassName(), (*it)->getName());*/
       dynamic_cast<WeatherEffect*>(*it)->tick(dt);
     }