Changeset 4900 in orxonox.OLD

Timestamp:

Jul 19, 2005, 10:28:36 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: the separation now works correctly again. tree index introduced

Location:

orxonox/trunk/src/lib/graphics/spatial_separation

Files:

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

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

@@ -12 +12 @@
 #include "abstract_model.h"
 
+
 class QuadtreeNode;
+class Material;
 
 //! A class for quadtree separation of the world

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

@@ -30 +30 @@
                             const float* pVertices, int numVertices,
                             Quadtree* quadtree, QuadtreeNode* parent,
-                            Rectangle* rect, int treeDepth, const int maxDepth
+                            Rectangle* rect, int treeDepth, const int maxDepth, int index
                            )
 {
@@ -44 +44 @@
   this->treeDepth = treeDepth;
   this->maxDepth = maxDepth;
+  this->indexNode = index;
 
 
@@ -49 +50 @@
   for( int i = 0; i < this->treeDepth; ++i)
     PRINT(3)(" |");
-  PRINT(3)(" | +-| (Event) Separating Node Depth: %i/%i\n", treeDepth, maxDepth);
+  PRINT(3)(" | +-| (Event) Separating Node Nr. %i Depth: %i/%i\n", this->indexNode, treeDepth, maxDepth);
 
   for( int i = 0; i < this->treeDepth; ++i)
@@ -74 +75 @@
   for( int i = 0; i < this->pModelInfo->numTriangles; ++i)
     this->pTriangles[i] = &this->pModelInfo->pTriangles[i];
+
   this->treeDepth = 0;
   this->maxDepth = maxDepth;
+  this->indexNode = 0;
 
   /* debug output */
   for( int i = 0; i < this->treeDepth; ++i)
     PRINT(3)(" |");
-  PRINT(3)(" | +-| (Event) Separating Node Depth: %i/%i\n", treeDepth, maxDepth);
+  PRINT(3)(" | +-| (Event) Separating Node Nr. %i Depth: %i/%i\n", this->indexNode, treeDepth, maxDepth);
 
   this->pDimension = this->getDimFromModel();
@@ -164 +167 @@
           if( pVert[0] > rectCenter->x + this->offset && pVert[2] > rectCenter->z + this->offset)
             listA->add(&this->pTriangles[i]);
-          if( pVert[0] > rectCenter->x + this->offset && pVert[2]< rectCenter->z + this->offset)
+          if( pVert[0] < rectCenter->x + this->offset && pVert[2] > rectCenter->z + this->offset)
             listB->add(&this->pTriangles[i]);
-          if( pVert[0] < rectCenter->x + this->offset && pVert[2] > rectCenter->z + this->offset)
+          if( pVert[0] < rectCenter->x + this->offset && pVert[2] < rectCenter->z + this->offset)
             listC->add(&this->pTriangles[i]);
-          if( pVert[0] < rectCenter->x + this->offset && pVert[2] < rectCenter->z + this->offset)
+          if( pVert[0] > rectCenter->x + this->offset && pVert[2] < rectCenter->z + this->offset)
             listD->add(&this->pTriangles[i]);
         }
@@ -252 +255 @@
 
   v.x = this->pDimension->getCenter()->x + this->pDimension->getAxis() / 2.0f;
+  v.y = 0.0;
   v.z = this->pDimension->getCenter()->z + this->pDimension->getAxis() / 2.0f;
   Rectangle* rA = new Rectangle(v, this->pDimension->getAxis() / 2.0f);
@@ -265 +269 @@
 
   /* now propagate */
-  this->nodeA = new QuadtreeNode(pTriA, lenA, this->pVertices, this->numVertices, this->quadtree, this, rA, this->treeDepth + 1, this->maxDepth);
-  this->nodeB = new QuadtreeNode(pTriB, lenB, this->pVertices, this->numVertices, this->quadtree, this, rB, this->treeDepth + 1, this->maxDepth);
-  this->nodeC = new QuadtreeNode(pTriC, lenC, this->pVertices, this->numVertices, this->quadtree, this, rC, this->treeDepth + 1, this->maxDepth);
-  this->nodeD = new QuadtreeNode(pTriD, lenD, this->pVertices, this->numVertices, this->quadtree, this, rD, this->treeDepth + 1, this->maxDepth);
+  this->nodeA = new QuadtreeNode(pTriA, lenA, this->pVertices, this->numVertices, this->quadtree, this, rA, this->treeDepth + 1, this->maxDepth, (this->treeDepth + 1) * 10 + 0);
+
+  this->nodeB = new QuadtreeNode(pTriB, lenB, this->pVertices, this->numVertices, this->quadtree, this, rB, this->treeDepth + 1, this->maxDepth, (this->treeDepth + 1) * 10 + 1);
+
+  this->nodeC = new QuadtreeNode(pTriC, lenC, this->pVertices, this->numVertices, this->quadtree, this, rC, this->treeDepth + 1, this->maxDepth, (this->treeDepth + 1) * 10 + 2);
+
+  this->nodeD = new QuadtreeNode(pTriD, lenD, this->pVertices, this->numVertices, this->quadtree, this, rD, this->treeDepth + 1, this->maxDepth, (this->treeDepth + 1) * 10 + 3);
 }
 

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

@@ -23 +23 @@
                  const float* pVertices, int numVertices,
                  Quadtree* quadtree, QuadtreeNode* parent,
-                 Rectangle* rect, int treeDepth, const int maxDepth);
+                 Rectangle* rect, int treeDepth, const int maxDepth, int index);
     QuadtreeNode(modelInfo* pModelInfo, const int maxDepth);
     virtual ~QuadtreeNode();
@@ -54 +54 @@
     int                             treeDepth;          //!< the depth of the tree
     int                             maxDepth;           //!< the maximal depth of the tree
+    int                             indexNode;          //!< the index number of the node
 
     sTriangleExt**                  pTriangles;         //!< reference to the triangles of the node