Changeset 4896 in orxonox.OLD

Timestamp:

Jul 19, 2005, 9:10:16 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: extended the constructor interface to force the specification of a parent Node

Location:

orxonox/trunk/src/lib/graphics/spatial_separation

Files:

• quadtree_node.cc (modified) (5 diffs)
• quadtree_node.h (modified) (3 diffs)

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

@@ -28 +28 @@
 */
 QuadtreeNode::QuadtreeNode (sTriangleExt** triangles, int numTriangles,
-                            const float* pVertices, int numVertices, Quadtree* quadtree)
+                            const float* pVertices, int numVertices,
+                            Quadtree* quadtree, QuadtreeNode* parent)
 {
   this->pTriangles = triangles;
@@ -36 +37 @@
   this->quadtree = quadtree;
   this->treeDepth = 0;
-
-//   this->pDimension = this->getDimension();
+  this->parent = parent;
+
   this->init();
 }
@@ -58 +59 @@
   this->treeDepth = 0;
 
-//   this->pDimension = this->getDimension(this->pModelInfo);
   this->init();
 }
@@ -71 +71 @@
 
   this->offset = 0.0f;
+  this->parent = NULL;
   this->nodeA = NULL;
   this->nodeB = NULL;
@@ -245 +246 @@
 
   /* now propagate */
-  this->nodeA = new QuadtreeNode(pTriA, lenA, this->pVertices, this->numVertices, this->quadtree);
-  this->nodeB = new QuadtreeNode(pTriB, lenB, this->pVertices, this->numVertices, this->quadtree);
-  this->nodeC = new QuadtreeNode(pTriC, lenC, this->pVertices, this->numVertices, this->quadtree);
-  this->nodeD = new QuadtreeNode(pTriD, lenD, this->pVertices, this->numVertices, this->quadtree);
+  this->nodeA = new QuadtreeNode(pTriA, lenA, this->pVertices, this->numVertices, this->quadtree, this);
+  this->nodeB = new QuadtreeNode(pTriB, lenB, this->pVertices, this->numVertices, this->quadtree, this);
+  this->nodeC = new QuadtreeNode(pTriC, lenC, this->pVertices, this->numVertices, this->quadtree, this);
+  this->nodeD = new QuadtreeNode(pTriD, lenD, this->pVertices, this->numVertices, this->quadtree, this);
 }
 

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

@@ -21 +21 @@
   public:
     QuadtreeNode(sTriangleExt** triangles, int numTriangles,
-                 const float* pVertices, int numVertices, Quadtree* quadtree);
+                 const float* pVertices, int numVertices,
+                 Quadtree* quadtree, QuadtreeNode* parent);
     QuadtreeNode(modelInfo* pModelInfo);
     virtual ~QuadtreeNode();
@@ -36 +37 @@
     Rectangle* getDimension(modelInfo* pModelInfo);
     Rectangle* getDimension();
+
+
+  protected:
+    QuadtreeNode*                   parent;             //!< reference to the paren QuadtreeNode (NULL if rootnode)
+    QuadtreeNode*                   nodeA;              //!< reference to the node A
+    QuadtreeNode*                   nodeB;              //!< reference to the node B
+    QuadtreeNode*                   nodeC;              //!< reference to the node C
+    QuadtreeNode*                   nodeD;              //!< reference to the node D
 
   private:
@@ -52 +61 @@
     modelInfo*                      pModelInfo;         //!< reference to the modelInfo of the object
     Rectangle*                      pDimension;         //!< pointer to the local rectangle properties
-
-    QuadtreeNode*                   nodeA;              //!< reference to the node A
-    QuadtreeNode*                   nodeB;              //!< reference to the node B
-    QuadtreeNode*                   nodeC;              //!< reference to the node C
-    QuadtreeNode*                   nodeD;              //!< reference to the node D
-
 };