Changeset 4852 in orxonox.OLD

Timestamp:

Jul 13, 2005, 9:58:40 PM (19 years ago)

Author:

patrick

Message:

split the constructor into init and both constr. some debug output

Location:

orxonox/trunk/src

Files:

• defs/debug.h (modified) (1 diff)
• lib/graphics/spatial_separation/quadtree.cc (modified) (1 diff)
• lib/graphics/spatial_separation/quadtree_node.cc (modified) (7 diffs)
• lib/graphics/spatial_separation/quadtree_node.h (modified) (1 diff)
• lib/graphics/spatial_separation/spatial_separation.cc (modified) (1 diff)

orxonox/trunk/src/defs/debug.h

@@ -81 +81 @@
 
 #define DEBUG_MODULE_COLLISON_DETECTION 0
-#define DEBUG_MODULE_SPATIAL_SEPARATION 0
+#define DEBUG_MODULE_SPATIAL_SEPARATION 3
 
 #define HARD_DEBUG_LEVEL DEBUG_SPECIAL_MODULE

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

@@ -49 +49 @@
  */
 void Quadtree::separate()
-{}
+{
+  this->rootNode->separateNode();
+}
 
 

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

@@ -28 +28 @@
 QuadtreeNode::QuadtreeNode (sTriangleExt* triangles, int numTriangles, Quadtree* quadtree)
 {
-   this->setClassID(CL_QUADTREE_NODE, "QuadtreeNode");
+  this->init();
 }
 
@@ -46 +46 @@
   for( int i = 0; i < this->pModelInfo->numTriangles; ++i)
     this->pTriangles[i] = &this->pModelInfo->pTriangles[i];
-  
+
+  this->init();
+}
+
+
+/**
+ * takes the rest of the initialisation process
+ */
+void QuadtreeNode::init()
+{
+  PRINTF(0)("Creating QuadtreeNode\n");
+  this->setClassID(CL_QUADTREE_NODE, "QuadtreeNode");
+
+  this->offset = 0.0f;
 }
 
@@ -52 +65 @@
 /**
  *  standard deconstructor
-
-*/
+ */
 QuadtreeNode::~QuadtreeNode ()
 {
@@ -64 +76 @@
  */
 void QuadtreeNode::separateNode(int treeDepth)
-{}
+{
+  this->separateNode();
+}
 
 
@@ -72 +86 @@
 */
 void QuadtreeNode::separateNode(float minLength)
-{}
+{
+  this->separateNode();
+}
 
 
@@ -81 +97 @@
 void QuadtreeNode::separateNode()
 {
+  PRINTF(0)("got command to separate node\n");
   tList<sTriangleExt*>*           listA = new tList<sTriangleExt*>();    //!< triangle list of nodeA
   tList<sTriangleExt*>*           listB = new tList<sTriangleExt*>();    //!< triangle list of nodeB
@@ -95 +112 @@
           pVert = &this->pVertices[this->pTriangles[i]->indexToVertices[j]];
           if(  pVert[0] > rectCenter->x + this->offset && pVert[2] > rectCenter->z + this->offset)
-            printf("");
-
+            printf("nA");
+          if( pVert[0] > rectCenter->x + this->offset && pVert[2]< rectCenter->z + this->offset) 
+            printf("nB");
+          if( pVert[0] < rectCenter->x + this->offset && pVert[2] > rectCenter->z + this->offset)
+            printf("nC");
+          if( pVert[0] < rectCenter->x + this->offset && pVert[2] < rectCenter->z + this->offset)
+            printf("nD");
         }
     }
+  PRINTF(0)("\nseparation complete\n");
 }
 

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

@@ -32 +32 @@
 
   private:
+    void init();
     Rectangle* getDimension(modelInfo* pModelInfo);
 

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

@@ -33 +33 @@
 SpatialSeparation::SpatialSeparation (AbstractModel* model, float overlapSize)
 {
+  PRINTF(0)("Spatial Separation process kicked on\n");
    this->setClassID(CL_SPATIAL_SEPARATION, "SpatialSeparation");
+   /* debug vice */
    this->createQuadtree(model);
 }