Changeset 4913 in orxonox.OLD

Timestamp:

Jul 21, 2005, 9:58:10 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: working on the hash table alg

Location:

orxonox/trunk/src/lib/graphics/spatial_separation

Files:

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

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

@@ -74 +74 @@
 {
   //this->rootNode->drawTree(depth, drawMode);
-  for(int i = 0; i < 256; ++i)
+  for(int i = 0; i < 4; ++i)
   {
     this->nodes[i]->drawTree(0, 0);

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

@@ -52 +52 @@
   for( int i = 0; i < this->treeDepth; ++i)
     PRINT(3)(" |");
-  PRINT(3)(" | +-| (Event) Separating Node Nr. %i Depth: %i/%i\n", this->indexNode, treeDepth, maxDepth);
+  PRINT(3)(" | +-| (Event) Building Node Nr. %i Depth: %i/%i, pointer: %p\n", this->indexNode, treeDepth, maxDepth, this);
 
   for( int i = 0; i < this->treeDepth; ++i)
@@ -86 +86 @@
   for( int i = 0; i < this->treeDepth; ++i)
     PRINT(3)(" |");
-  PRINT(3)(" | +-| (Event) Separating Node Nr. %i Depth: %i/%i\n", this->indexNode, treeDepth, maxDepth);
+  PRINT(3)(" | +-| (Event) Building Node Nr. %i Depth: %i/%i, pointer: %p\n", this->indexNode, treeDepth, maxDepth, this);
 
   this->pDimension = this->getDimFromModel();
@@ -139 +139 @@
   int loopLimit = (this->nodeIter < elCount)?2:4;
 
+  for( int i = 0; i < this->treeDepth; ++i)
+    printf(" ");
+  printf("entering %i: hit counts: %i/%i\n", treeDepth, nodeIter, elCount);
+
   /* is it a leaf? */
   if( this->treeDepth < this->maxDepth)
@@ -156 +160 @@
     for( int j = 0; j < this->treeDepth; ++j)
       printf(" ");
-    printf("        leaf, index: %i\n", *index);
+    printf("        leaf, index: %i, pointer: %p\n", *index, this);
     nodeList[(*index)++] = this;
   }
@@ -213 +217 @@
     for( int i = 0; i < treeDepth; ++i)
       PRINT(3)(" |");
-    PRINT(3)(" | +-| (II) Quadtree Counts: A: %i, B: %i, C: %i, D: %i\n", listA->getSize(), listB->getSize(), listC->getSize(), listD->getSize());
+    PRINT(3)(" | +-| (II) Quadtree Counts - separating: A: %i, B: %i, C: %i, D: %i\n", listA->getSize(), listB->getSize(), listC->getSize(), listD->getSize());
 
   /* Separating into to the triangle lists  */
@@ -372 +376 @@
 void QuadtreeNode::drawTree(int depth, int drawMode) const
 {
-  if( depth == 0)
+  printf("this = %p\n", this);
+  if( this->treeDepth == this->maxDepth)
   {
     Vector t1 = *this->pDimension->getCenter();
@@ -386 +391 @@
     glEnd();
   }
+
+
   if( this->nodeA != NULL)
     this->nodeA->drawTree(depth - 1, drawMode);

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

@@ -99 +99 @@
 Quadtree* SpatialSeparation::createQuadtree(AbstractModel* model)
 {
-  this->quadtree = new Quadtree(model->getModelInfo(), 4);
+  this->quadtree = new Quadtree(model->getModelInfo(), 1);
 
   return this->quadtree;