Changeset 7944 in orxonox.OLD for branches/cr/src/lib

Timestamp:

May 29, 2006, 12:02:04 AM (19 years ago)

Author:

patrick

Message:

cr: collision registration work

Location:

branches/cr/src/lib

Files:

• collision_detection/obb_tree_node.cc (modified) (1 diff)
• collision_reaction/cr_engine.cc (modified) (1 diff)
• collision_reaction/cr_engine.h (modified) (1 diff)

branches/cr/src/lib/collision_detection/obb_tree_node.cc

@@ -506 +506 @@
                  (treeNode->nodeRight == NULL || treeNode->nodeLeft == NULL)) )
     {
-      nodeA->collidesWith(nodeB, treeNode->bvElement->center);
-      nodeB->collidesWith(nodeA, this->bvElement->center);
+//       nodeA->collidesWith(nodeB, treeNode->bvElement->center);
+//       nodeB->collidesWith(nodeA, this->bvElement->center);
+      nodeA->registerCollision(nodeA, nodeB, (BoundingVolume*)this->bvElement, (BoundingVolume*)treeNode->bvElement);
     }
 

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

@@ -57 +57 @@
   Collision* collisions = new Collision[CR_MAX_COLLISIONS];
   for( int i = 0; i < CR_MAX_COLLISIONS; i++)
-    this->cachedCollisions.push_back(collisions[i]);
+    this->cachedCollisions.push_back(&collisions[i]);
 }
 

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

@@ -50 +50 @@
   bool unsubscribeReaction(CollisionHandle* collisionHandle);
 
-
   void handleCollisions();
 
   /** @returns an instance to a collision object. instead of creating new object this ones can be resycled */
-  inline Collision* getCollisionObject() { /* return the first element of the cache list*/ }
+  inline Collision* popCollisionObject() { if(!this->cachedCollisions.empty()) { this->cachedCollisions.back(); this->cachedCollisions.pop_back();} else return NULL; }
   /** @param collision: returns the Collision object back to the cache list */
-  inline void putCollisionObject(Collision* collision) { this->cachedCollisions.push_back(collision); }
+  inline void pushCollisionObject(Collision* collision) { this->cachedCollisions.push_back(collision); }