Changeset 7958 in orxonox.OLD for branches/cr/src/lib/collision_detection

Timestamp:

May 29, 2006, 5:32:42 PM (19 years ago)

Author:

patrick

Message:

cr: collision reactance introduced

File:

• branches/cr/src/lib/collision_detection/obb_tree_node.cc (modified) (1 diff)

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

@@ -523 +523 @@
       nodeA->registerCollision(nodeA, nodeB, (BoundingVolume*)this->bvElement, (BoundingVolume*)treeNode->bvElement);
     }
-
-
-
-    /* check if left node overlaps */
-//     if( this->nodeLeft != NULL )
-//     {
-//       PRINTF(5)("Checking OBB %i vs %i: ", this->nodeLeft->getIndex(), treeNode->getIndex());
-//       if( this->overlapTest(this->nodeLeft->bvElement, treeNode->bvElement, nodeA, nodeB))
-//       {
-//         this->nodeLeft->collideWith(treeNode->nodeLeft, nodeA, nodeB);
-//         this->nodeLeft->collideWith(treeNode->nodeRight, nodeA, nodeB);
-//       }
-//     }
-
-    /* check if right node overlaps */
-//     if( likely( this->nodeRight != NULL))
-//     {
-//       PRINTF(5)("Checking OBB %i vs %i: ", this->nodeRight->getIndex(), treeNode->getIndex());
-//       if(this->overlapTest(this->nodeRight->bvElement, treeNode->bvElement, nodeA, nodeB))
-//       {
-//         this->nodeRight->collideWith(treeNode->nodeLeft, nodeA, nodeB);
-//         this->nodeRight->collideWith(treeNode->nodeRight, nodeA, nodeB);
-//       }
-//     }
-
-    /* so there is a collision and this is the last box in the tree (i.e. leaf) */
-//     if( unlikely((this->nodeRight == NULL || this->nodeLeft == NULL) ||
-//                  (treeNode->nodeRight == NULL || treeNode->nodeLeft == NULL)) )
-//     {
-//       nodeA->collidesWith(nodeB, treeNode->bvElement->center);
-//       nodeB->collidesWith(nodeA, this->bvElement->center);
-//       nodeA->registerCollision(nodeA, nodeB, (BoundingVolume*)this->bvElement, (BoundingVolume*)treeNode->bvElement);
-//     }
 
   }