Changeset 9008 in orxonox.OLD for trunk/src/lib/collision_detection

Timestamp:

Jul 2, 2006, 2:22:19 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network bak to the trunk
merged with command:
svn merge -r8804:HEAD ​https://svn.orxonox.net/orxonox/branches/multi_player_map .

conflicts all resolved in favour of the branche

Location:

trunk/src/lib/collision_detection

Files:

• bounding_volume.h (modified) (1 diff)
• obb_tree_node.cc (modified) (5 diffs)

trunk/src/lib/collision_detection/bounding_volume.h

@@ -38 +38 @@
     const int*          triangleIndexes;            //!< Array with the triangle indexes in modelInfo
     int                 triangleIndexesLength;      //!< length of the indexes array
+
+    float               radius;                     //!< the radius of the box (longest axis)
 };
 

trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -364 +364 @@
     }
   }
+  this->bvElement->radius = longestAxis;
   PRINTF(4)("\nLongest Axis is: Nr %i with a half-length of:%11.2f\n", longestAxisIndex, longestAxis);
 
@@ -454 +455 @@
     return;
 
+  float distanceMax = this->bvElement->radius + ((OBBTreeNode*)treeNode)->bvElement->radius;
+  float distance = fabs((nodeA->getAbsCoor() - nodeB->getAbsCoor()).len());
+
+
+//   if( distance < distanceMax)
+//     PRINTF(0)(" %s (%s: group %i) vs %s (%s: group %i): distanceMax: %f, distance: %f\n", nodeA->getClassName(), nodeA->getName(), nodeA->getOMListNumber(), nodeB->getClassName(),  nodeB->getName(), nodeB->getOMListNumber(), distanceMax, distance);
+
+
   PRINTF(4)("collideWith\n");
   PRINTF(5)("Checking OBB %i vs %i: ", this->getIndex(), treeNode->getIndex());
@@ -482 +491 @@
       if( this->overlapTest(this->nodeLeft->bvElement, treeNode->bvElement, nodeA, nodeB))
       {
+        bool bAdvance = false;
         if( treeNode->nodeLeft != NULL)
           this->nodeLeft->collideWith(treeNode->nodeLeft, nodeA, nodeB);
+        else
+          bAdvance = true;
+
         if( treeNode->nodeRight != NULL)
           this->nodeLeft->collideWith(treeNode->nodeRight, nodeA, nodeB);
+        else
+          bAdvance = true;
+
+        if( bAdvance)
+          this->nodeLeft->collideWith(treeNode, nodeA, nodeB);  // go down the other tree also
       }
     }
@@ -494 +512 @@
       if( this->overlapTest(this->nodeRight->bvElement, treeNode->bvElement, nodeA, nodeB))
       {
+        bool bAdvance = false;
+
         if( treeNode->nodeLeft != NULL)
           this->nodeRight->collideWith(treeNode->nodeLeft, nodeA, nodeB);
+        else
+          bAdvance = true;
+
         if( treeNode->nodeRight != NULL)
           this->nodeRight->collideWith(treeNode->nodeRight, nodeA, nodeB);
+        else
+          bAdvance = true;
+
+        if( bAdvance)
+          this->nodeRight->collideWith(treeNode, nodeA, nodeB);  // go down the other tree also
       }
     }
@@ -516 +544 @@
         (treeNode->nodeRight == NULL && treeNode->nodeLeft == NULL)) )
     {
+//       PRINTF(0)("----------------------------------------------\n\n\n\n\n\n--------------------------------\n\n\n");
       nodeA->registerCollision(nodeA, nodeB, (BoundingVolume*)this->bvElement, (BoundingVolume*)treeNode->bvElement);
     }