Changeset 8108 in orxonox.OLD

Timestamp:

Jun 1, 2006, 11:14:54 PM (18 years ago)

Author:

patrick

Message:

cr: double sidded collision events updated

Location:

branches/cr/src/lib/collision_reaction

Files:

• collision.cc (modified) (3 diffs)
• collision.h (modified) (2 diffs)
• collision_handle.cc (modified) (1 diff)
• cr_object_damage.cc (modified) (1 diff)

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

@@ -29 +29 @@
   this->entityA = NULL;
   this->entityB = NULL;
+
+  this->bDispatched = false;
+  this->entityACollide = false;
+  this->entityBCollide = false;
 }
 
@@ -46 +50 @@
 {
 
-
+  this->bDispatched = true;
   this->flushCollisionEvents();
 }
@@ -56 +60 @@
 void Collision::flushCollisionEvents()
 {
+  this->entityA = NULL;
+  this->entityB = NULL;
+
+  this->entityACollide = false;
+  this->entityBCollide = false;
+
   this->collisionEvents.clear();
 }

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

@@ -31 +31 @@
     inline WorldEntity* getEntityB() const { return this->entityB; }
     /** @return true if Entity A collides */
-    inline bool isEntityACollide() { return this->entityACollide; }
+    inline bool isEntityACollide() const { return this->entityACollide; }
+    /** sets the flag if it reacts @param flag true if it should react on entityA*/
+    inline void setEntityACollide(bool flag) { this->entityACollide = flag; }
     /** @return true if Entity B collides */
-    inline bool isEntityBCollide() { return this->entityBCollide; }
+    inline bool isEntityBCollide() const { return this->entityBCollide; }
+    /** sets the flag if it reacts @param flag true if it should react on entityB*/
+    inline void setEntityBCollide(bool flag) { this->entityACollide = flag; }
 
     /** @returns true if this Collision has already been dispatched */
@@ -39 +43 @@
 
     /** registers a @param event CollisionEvent to take place */
-    inline void registerCollisionEvent(CollisionEvent* event) { this->collisionEvents.push_back(event); }
+    inline void registerCollisionEvent(CollisionEvent* event) { this->collisionEvents.push_back(event); this->bDispatched = false;}
     /** @returns a vector of collision events */
     inline const std::vector<CollisionEvent*>& getCollisionEvents() const { return this->collisionEvents; }
-
 
 

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

@@ -94 +94 @@
 
   c->collide(entityA, entityB);
+  c->setEntityACollide(true);
   this->collisionList.push_back(c);
 
   // now register it as a shared collision with the other collision entity
   CollisionHandle* ch = entityB->getCollisionHandle(this->type);
-  if( ch != NULL)
+  if( ch != NULL) {
     ch->registerSharedCollision(c);
+    c->setEntityBCollide(true);
+  }
 
   return c;

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

@@ -53 +53 @@
 {
 
-  float mass;
-  float velocity;
-
-
+//   if(collision->)
 
 //   const std::vector<CollisionEvent*>* collisionEvents = &(collision->getCollisionEvents());