Changeset 8106 in orxonox.OLD

Timestamp:

Jun 1, 2006, 10:27:53 PM (18 years ago)

Author:

patrick

Message:

cr: supporting now shared collision lists

Location:

branches/cr/src

Files:

• lib/collision_reaction/collision.h (modified) (3 diffs)
• lib/collision_reaction/collision_handle.cc (modified) (3 diffs)
• lib/collision_reaction/collision_handle.h (modified) (1 diff)
• lib/collision_reaction/cr_object_damage.cc (modified) (1 diff)
• lib/physics/physics_interface.h (modified) (2 diffs)
• world_entities/world_entity.h (modified) (1 diff)

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

@@ -30 +30 @@
     /** @return Collision WorldEntity B */
     inline WorldEntity* getEntityB() const { return this->entityB; }
+    /** @return true if Entity A collides */
+    inline bool isEntityACollide() { return this->entityACollide; }
+    /** @return true if Entity B collides */
+    inline bool isEntityBCollide() { return this->entityBCollide; }
 
     /** @returns true if this Collision has already been dispatched */
@@ -38 +42 @@
     /** @returns a vector of collision events */
     inline const std::vector<CollisionEvent*>& getCollisionEvents() const { return this->collisionEvents; }
+
+
 
     void handleCollisionEvents();
@@ -49 +55 @@
     WorldEntity*                 entityA;                       //!< the collision body A
     WorldEntity*                 entityB;                       //!< the collision body B
+    bool                         entityACollide;                //!< true if entity A is subscribed for collision reaction
+    bool                         entityBCollide;                //!< true if entity B is subscribed for collision reaction
 
     bool                         bDispatched;                   //!< true if this collision has already been dispatched

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

@@ -17 +17 @@
 #include "collision_handle.h"
 
+#include "world_entity.h"
 
 #include "collision.h"
@@ -95 +96 @@
   this->collisionList.push_back(c);
 
+  // now register it as a shared collision with the other collision entity
+  CollisionHandle* ch = entityB->getCollisionHandle(this->type);
+  ch->registerSharedCollision(c);
+
   return c;
 }
@@ -105 +110 @@
  * Therefore dispatching it only once
  */
-void CollisionHandle::registerCollision(Collision* collision)
+void CollisionHandle::registerSharedCollision(Collision* collision)
 {
+  // set the state to not dispatched
+  this->bDispatched = false;
 
+  this->collisionList.push_back(collision);
 }
 

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

@@ -31 +31 @@
     void addTarget(long target);
     Collision* registerCollision(WorldEntity* entityA, WorldEntity* entityB);
-    void registerCollision(Collision* collision);
+    void registerSharedCollision(Collision* collision);
     void registerCollisionEvent(CollisionEvent* collisionEvent);
 

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

@@ -56 +56 @@
   float velocity;
 
-  PhysicsInterface* pi;
 
-  const std::vector<CollisionEvent*>* collisionEvents = &(collision->getCollisionEvents());
-  std::vector<CollisionEvent*>::const_iterator it = collisionEvents->begin();
-  for(; it != collisionEvents->end(); it++)
-  {
-    pi = &(*it)->getEntityA()->getPhysicsInterface();
-    // go through the collisions and try to estimate the damage
-    mass = pi->getMass();
-  }
+
+//   const std::vector<CollisionEvent*>* collisionEvents = &(collision->getCollisionEvents());
+//   std::vector<CollisionEvent*>::const_iterator it = collisionEvents->begin();
+//   for(; it != collisionEvents->end(); it++)
+//   {
+//     // go through the collisions and try to estimate the damage
+//     mass = (*it)->getEntityA()->getMass();
+//   }
 
 }

branches/cr/src/lib/physics/physics_interface.h

@@ -39 +39 @@
   inline float getTotalMass( void ) const { return mass + massChildren; };
 
+  /** @returns the velocity */
+  inline const Vector getVelocity() { return this->velocity; }
+  /** @returns the acceleration */
+  inline const Vector getAcceleration() { return this->acceleration; }
+
   virtual void applyForce(const Vector& force);
   virtual void applyField(Field* field);
@@ -51 +56 @@
   float          massChildren;          //!< Sum of the masses of the children nodes
 
+  Vector         velocity;              //!< the velocity of the masspoint
+  Vector         acceleration;          //!< acceleration of the masspoint
+
   Vector         forceSum;              //!< Total central force for this tick
   Quaternion     momentumSum;           //!< Total momentum in this tick

branches/cr/src/world_entities/world_entity.h

@@ -84 +84 @@
   inline bool isReactive() const { return this->bReactive; }
 
-  const CollisionHandle* getCollisionHandle(CREngine::CRType type) const { return this->collisionHandles[type]; }
+  CollisionHandle* getCollisionHandle(CREngine::CRType type) const { return this->collisionHandles[type]; }