Changeset 5703 in orxonox.OLD for branches/collision_detection/src/lib/collision_detection/obb_tree_node.cc

Timestamp:

Nov 22, 2005, 1:42:42 PM (18 years ago)

Author:

patrick

Message:

collision_detection: cleanup and recode of some small parts.

File:

• branches/collision_detection/src/lib/collision_detection/obb_tree_node.cc (modified) (6 diffs)

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

@@ -33 +33 @@
 using namespace std;
 
-OBBTree*  OBBTreeNode::obbTree = NULL;
-
 float**  OBBTreeNode::coMat = NULL;
 float**  OBBTreeNode::eigvMat = NULL;
@@ -44 +42 @@
  *  standard constructor
  */
-OBBTreeNode::OBBTreeNode ()
+OBBTreeNode::OBBTreeNode (const OBBTree* tree) 
+  : BVTreeNode()
 {
   this->setClassID(CL_OBB_TREE_NODE, "OBBTreeNode");
+  this->obbTree = tree;
   this->nodeLeft = NULL;
   this->nodeRight = NULL;
@@ -117 +117 @@
 
   PRINT(3)("\n");
-  this->treeIndex = this->obbTree->getID();
   PRINTF(3)("OBB Depth: %i, tree index: %i, numVertices: %i\n", depth, treeIndex, length);
   this->depth = depth;
@@ -181 +180 @@
 {
   PRINT(3)("\n");
-  this->treeIndex = this->obbTree->getID();
   PRINTF(3)("OBB Depth: %i, tree index: %i, numVertices: %i\n", depth, treeIndex, length);
   this->depth = depth;
@@ -208 +206 @@
     if(this->tmpLen1 > 2)
     {
-      OBBTreeNode* node1 = new OBBTreeNode();
+      OBBTreeNode* node1 = new OBBTreeNode(this->obbTree);
       this->nodeLeft = node1;
       this->nodeLeft->spawnBVTree(depth - 1, this->tmpVert1, this->tmpLen1);
@@ -219 +217 @@
     if( this->tmpLen2 > 2)
     {
-      OBBTreeNode* node2 = new OBBTreeNode();
+      OBBTreeNode* node2 = new OBBTreeNode(this->obbTree);
       this->nodeRight = node2;
       this->nodeRight->spawnBVTree(depth - 1, this->tmpVert2, this->tmpLen2);