Changeset 4912 in orxonox.OLD

Timestamp:

Jul 21, 2005, 1:00:08 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: some problems with the hash alg

Location:

orxonox/trunk/src

Files:

• lib/graphics/spatial_separation/quadtree.cc (modified) (1 diff)
• lib/graphics/spatial_separation/quadtree_node.cc (modified) (3 diffs)
• world_entities/terrain.cc (modified) (1 diff)

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

@@ -73 +73 @@
 void Quadtree::drawTree(int depth, int drawMode) const
 {
-  this->rootNode->drawTree(depth, drawMode);
+  //this->rootNode->drawTree(depth, drawMode);
+  for(int i = 0; i < 256; ++i)
+  {
+    this->nodes[i]->drawTree(0, 0);
+  }
 }

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

@@ -136 +136 @@
 void QuadtreeNode::buildHashTable(QuadtreeNode** nodeList, int* index)
 {
-  int loopLimit = (this->nodeIter < ((int)pow(4, maxDepth - treeDepth) / 2))?2:4;
-
-  printf("buildHashTable depth: %i, nodeIter : %i, limit: %i, @nodeIndex: %i\n", this->treeDepth, nodeIter, loopLimit, indexNode);
+  int elCount = (int)pow(4, maxDepth - treeDepth) / 2;
+  int loopLimit = (this->nodeIter < elCount)?2:4;
+
   /* is it a leaf? */
   if( this->treeDepth < this->maxDepth)
   {
-    for(int i = (this->nodeIter < ((int)pow(4, maxDepth - treeDepth) / 2))?0:2; i < loopLimit; ++i)
-    {
+    for(int i = (this->nodeIter < elCount)?0:2; i < loopLimit; ++i)
+    {
+      for( int j = 0; j < this->treeDepth; ++j)
+        printf(" ");
+      printf("-> %i @ depth: %i, %i/%i \n", i, this->treeDepth, nodeIter, elCount);
+
       this->nodes[i]->buildHashTable(nodeList, index);
       ++this->nodeIter;
@@ -150 +154 @@
   else
   {
-    printf("leaf, index: %i\n", *index);
+    for( int j = 0; j < this->treeDepth; ++j)
+      printf(" ");
+    printf("        leaf, index: %i\n", *index);
     nodeList[(*index)++] = this;
   }
@@ -366 +372 @@
 void QuadtreeNode::drawTree(int depth, int drawMode) const
 {
-
-  Vector t1 = *this->pDimension->getCenter();
-  float ax = this->pDimension->getAxis();
-  float h = 50.0f;
-
-  glBegin(GL_QUADS);
-  this->quadtree->getMaterial(this->indexNode)->select();
-  glVertex3f(t1.x + ax, h - depth * 10.0f, t1.z + ax);
-  glVertex3f(t1.x - ax, h - depth * 10.0f, t1.z + ax);
-  glVertex3f(t1.x - ax, h - depth * 10.0f, t1.z - ax);
-  glVertex3f(t1.x + ax, h - depth * 10.0f, t1.z - ax);
-  glEnd();
-
+  if( depth == 0)
+  {
+    Vector t1 = *this->pDimension->getCenter();
+    float ax = this->pDimension->getAxis();
+    float h = 50.0f;
+
+    glBegin(GL_QUADS);
+    this->quadtree->getMaterial(this->indexNode)->select();
+    glVertex3f(t1.x + ax, h - depth * 10.0f, t1.z + ax);
+    glVertex3f(t1.x - ax, h - depth * 10.0f, t1.z + ax);
+    glVertex3f(t1.x - ax, h - depth * 10.0f, t1.z - ax);
+    glVertex3f(t1.x + ax, h - depth * 10.0f, t1.z - ax);
+    glEnd();
+  }
   if( this->nodeA != NULL)
     this->nodeA->drawTree(depth - 1, drawMode);

orxonox/trunk/src/world_entities/terrain.cc

@@ -122 +122 @@
   glPopMatrix();
 
-  //this->ssp->drawQuadtree();
+  this->ssp->drawQuadtree();
 }