Changeset 4867 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Jul 14, 2005, 11:26:17 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: implemented the tree stepping functions and some minor corrections in the main functions

Location:

orxonox/trunk/src/lib/graphics/spatial_separation

Files:

• quadtree_node.cc (modified) (7 diffs)
• quadtree_node.h (modified) (1 diff)

orxonox/trunk/src/lib/graphics/spatial_separation/quadtree_node.cc

@@ -26 +26 @@
  *  standard constructor
 */
-QuadtreeNode::QuadtreeNode (sTriangleExt* triangles, int numTriangles, Quadtree* quadtree)
-{
+QuadtreeNode::QuadtreeNode (sTriangleExt** triangles, int numTriangles, Quadtree* quadtree)
+{
+  this->pTriangles = triangles;
+  this->numTriangles = numTriangles;
+  this->quadtree = quadtree;
+  
   this->init();
 }
@@ -58 +62 @@
 
   this->offset = 0.0f;
+  this->nodeA = NULL;
+  this->nodeB = NULL;
+  this->nodeC = NULL;
+  this->nodeD = NULL;
 }
 
@@ -66 +74 @@
 QuadtreeNode::~QuadtreeNode ()
 {
+  if( this->nodeA != NULL)
+    delete this->nodeA;
+  if( this->nodeB != NULL)
+    delete this->nodeB;
+  if( this->nodeC != NULL)
+    delete this->nodeC;
+  if( this->nodeD != NULL)
+    delete this->nodeD;
 }
 
@@ -75 +91 @@
 void QuadtreeNode::separateNode(int treeDepth)
 {
+  if( treeDepth <= 0)
+    return;
   this->separateNode();
+
+  this->nodeA->separateNode(treeDepth - 1);
+  this->nodeB->separateNode(treeDepth - 1);
+  this->nodeC->separateNode(treeDepth - 1);
+  this->nodeD->separateNode(treeDepth - 1);
 }
 
@@ -85 +108 @@
 void QuadtreeNode::separateNode(float minLength)
 {
+  if( minLength <= this->pDimension->getAxis())
+    return;
   this->separateNode();
+
+  this->nodeA->separateNode(minLength);
+  this->nodeB->separateNode(minLength);
+  this->nodeC->separateNode(minLength);
+  this->nodeD->separateNode(minLength);
 }
 
@@ -130 +160 @@
   sTriangleExt**                 pTriC;                                 //!< Triangle array C
   sTriangleExt**                 pTriD;                                 //!< Triangle array D
-  float                          lenA;                                  //!< length array A
-  float                          lenB;                                  //!< length array B
-  float                          lenC;                                  //!< length array C
-  float                          lenD;                                  //!< length array D
+  int                            lenA;                                  //!< length array A
+  int                            lenB;                                  //!< length array B
+  int                            lenC;                                  //!< length array C
+  int                            lenD;                                  //!< length array D
   tIterator<sTriangleExt*>*      iterator;                              //!< iterator for the list iterations
   sTriangleExt**                 tempTri;                               //!< temp save place for triangle pointer
@@ -197 +227 @@
 
   /* now propagate */
-  /*
   this->nodeA = new QuadtreeNode(pTriA, lenA, this->quadtree);
-  this->nodeA->separate();
-
   this->nodeB = new QuadtreeNode(pTriB, lenB, this->quadtree);
-  this->nodeB->separate();
-
   this->nodeC = new QuadtreeNode(pTriC, lenC, this->quadtree);
-  this->nodeC->separate();
-
   this->nodeD = new QuadtreeNode(pTriD, lenD, this->quadtree);
-  this->nodeD->separate();
-  */
+
 
   PRINTF(0)("separation complete\n");

orxonox/trunk/src/lib/graphics/spatial_separation/quadtree_node.h

@@ -20 +20 @@
 
   public:
-    QuadtreeNode(sTriangleExt* triangles, int numTriangles, Quadtree* quadtree);
+    QuadtreeNode(sTriangleExt** triangles, int numTriangles, Quadtree* quadtree);
     QuadtreeNode(modelInfo* pModelInfo);
     virtual ~QuadtreeNode();