Changeset 4813 in orxonox.OLD

Timestamp:

Jul 7, 2005, 2:44:19 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: some smaller quadtree changes, changes in the OBBTreeNode deconstructors

Location:

orxonox/trunk/src/lib

Files:

• collision_detection/obb_tree_node.cc (modified) (1 diff)
• graphics/spatial_separation/quadtree_node.cc (modified) (1 diff)
• graphics/spatial_separation/quadtree_node.h (modified) (3 diffs)

orxonox/trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -79 +79 @@
 OBBTreeNode::~OBBTreeNode ()
 {
-  // delete what has to be deleted here
+
+  delete [] this->vertices;
+
+  delete this->bvElement;
+  delete this->nodeLeft;
+  delete this->nodeRight;
 }
 

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

@@ -23 +23 @@
 /**
    \brief standard constructor
-   \todo this constructor is not jet implemented - do it
 */
-QuadtreeNode::QuadtreeNode ()
+QuadtreeNode::QuadtreeNode (sTriangleExt* triangles, int numTriangles, Quadtree* quadtree)
 {
    this->setClassID(CL_QUADTREE_NODE, "QuadtreeNode");
-
 }
 

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

@@ -12 +12 @@
 
 // FORWARD DEFINITION
+class Quadtree;
 class QuadtreeNode;
 
@@ -18 +19 @@
 
  public:
-  QuadtreeNode();
+  QuadtreeNode(sTriangleExt* triangles, int numTriangles, Quadtree* quadtree);
   virtual ~QuadtreeNode();
 
@@ -27 +28 @@
 
  private:
+   Quadtree*                       quadtree;           //!< reference to the quadtree
    Vector                          center;             //!< center coordinate of the quadtree node - relative coordinates in model space(!)
    float                           axisLength;         //!< axis length of the quadtree
    float                           maxHeigth;          //!< max height of the model in the quadtree
 
-   sTriangleExt*                   triangles;
-   unsigned int                    numTriangles;
+   sTriangleExt*                   triangles;          //!< reference to the triangles of the node
+   unsigned int                    numTriangles;       //!< number of triangles of the Node
+   modelInfo*                      pModelInfo;         //!< reference to the modelInfo of the object
 
    QuadtreeNode*                   nodeA;              //!< reference to the node A