Changeset 4921 in orxonox.OLD

Timestamp:

Jul 21, 2005, 3:32:54 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: the way, where the fighter flights though is now drawn in quadtree partitions. now you can see where the space craft has been

Location:

orxonox/trunk/src

Files:

• lib/collision_detection/cd_engine.cc (modified) (1 diff)
• lib/graphics/spatial_separation/quadtree.cc (modified) (2 diffs)
• lib/graphics/spatial_separation/quadtree_node.cc (modified) (4 diffs)
• lib/graphics/spatial_separation/quadtree_node.h (modified) (2 diffs)
• lib/graphics/spatial_separation/spatial_separation.cc (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)

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

@@ -103 +103 @@
   Quadtree* q = this->terrain->ssp->getQuadtree();
   q->getQuadtreeFromPosition(this->player->getAbsCoor());
-
 }
 

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

@@ -162 +162 @@
     printf("-----------\nthe array coordinates are: %i, %i\n", i, j);
     printf("position: %f,%f, center %f, %f\n", position.x, position.z, this->nodes[i + j * max]->getDimension()->getCenter()->x, this->nodes[i + j * max]->getDimension()->getCenter()->z);
-    this->nodes[i + j * max]->drawTree(0,0);
+
+    //this->nodes[i + j * max]->draw();
     this->nodes[i + j * max]->includesPoint(position);
   }
   else
     printf("object has left terrain\n");
-
 }
 
@@ -179 +179 @@
   for(int i = 0; i < (int)pow(4, this->treeDepth); ++i)
   {
-    //this->nodes[i]->drawTree(0, 0);
+    this->nodes[i]->draw();
   }
 

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

@@ -102 +102 @@
   this->offset = 0.0f;
   this->nodeIter = -1;
+  this->bDraw = false;
 
   this->parent = NULL;
@@ -366 +367 @@
   else
     printf("POINT IS NOT INSIEDE\n");
+  this->bDraw = true;
 }
 
@@ -379 +381 @@
     float h = 50.0f;
 
+    //printf("draw @ %f, %f to %f, %f", t1.x + ax, t1.z + ax, t1.x - ax, t1.z - ax);
+
+    this->quadtree->getMaterial(this->indexNode)->select();
     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);
@@ -398 +402 @@
     this->nodeD->drawTree(depth - 1, drawMode);
 }
+
+void QuadtreeNode::draw() const
+{
+  if( likely(!bDraw))
+    return;
+  Vector t1 = *this->pDimension->getCenter();
+  float ax = this->pDimension->getAxis();
+  float h = 70.0f;
+
+    //printf("draw @ %f, %f to %f, %f", t1.x + ax, t1.z + ax, t1.x - ax, t1.z - ax);
+
+  glBegin(GL_QUADS);
+  this->quadtree->getMaterial(this->indexNode)->select();
+//   for( int i = 0; i < 50; ++i)
+//   {
+  int i = 0;
+    glVertex3f(t1.x + ax, h + 10.0f * i, t1.z + ax);
+    glVertex3f(t1.x - ax, h + 10.0f * i, t1.z + ax);
+    glVertex3f(t1.x - ax, h + 10.0f * i, t1.z - ax);
+    glVertex3f(t1.x + ax, h + 10.0f * i, t1.z - ax);
+//   }
+  glEnd();
+
+}

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

@@ -35 +35 @@
 
     void drawTree(int depth, int drawMode) const;
+    void draw() const;
 
 
@@ -71 +72 @@
     modelInfo*                      pModelInfo;         //!< reference to the modelInfo of the object
     Rectangle*                      pDimension;         //!< pointer to the local rectangle properties
+
+    bool                            bDraw;              //!< shall it be drawn? DEBUG only
 };
 

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(), 5);
 
   return this->quadtree;

orxonox/trunk/src/story_entities/world.cc

@@ -828 +828 @@
       if( this->bQuitCurrentGame || this->bQuitOrxonox)
           break;
+      // Process collision
+      this->collide ();
       // Process time
       this->tick ();
       // Update the state
       this->update ();
-      // Process collision
-      this->collide ();
       // Draw
       this->display ();