Changeset 1594 for GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp

Timestamp:

10/10/06 00:59:59 (18 years ago)

Author:

bittner

Message:

support for kd tree based pvs

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp (modified) (6 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp

@@ -13 +13 @@
 #include "IntersectableWrapper.h"
 #include "BvHierarchy.h"
+#include "KdTree.h"
 
 //#include <Cg/cg.h>
@@ -78 +79 @@
   mSnapPrefix = "snap/";
   mUseForcedColors = false;
-
+  mRenderBoxes = false;
   mUseGlLists = true;
   //mUseGlLists = false;
@@ -108 +109 @@
 GlRenderer::RenderIntersectable(Intersectable *object)
 {
-
+  if (object->Mailed())
+        return;
+  object->Mail();
+  
   glPushAttrib(GL_CURRENT_BIT);
   if (mUseFalseColors)
@@ -129 +133 @@
   case Intersectable::BVH_INTERSECTABLE: {
 
+        
         BvhNode *node = (dynamic_cast<BvhIntersectable *>(object))->GetItem();
-        //      RenderBvhNode(node);
-        RenderBox(node->GetBoundingBox());
+
+        if (mRenderBoxes)
+          RenderBox(node->GetBoundingBox());
+        else
+          RenderBvhNode(node);
+        break;
+  }
+  case Intersectable::KD_INTERSECTABLE: {
+        KdNode *node = (dynamic_cast<KdIntersectable *>(object))->GetItem();
+
+        if (mRenderBoxes)
+          RenderBox(mKdTree->GetBox(node));
+        else
+          RenderKdNode(node);
         break;
   }
@@ -628 +645 @@
         BvhLeaf *leaf = (BvhLeaf *) node;
         for (int i=0; i < leaf->mObjects.size(); i++)
-                cout << "leaf obj " << i << endl;
-          //RenderIntersectable(mObjects[i]);
+          RenderIntersectable(leaf->mObjects[i]);
   } else {
         BvhInterior *in = (BvhInterior *)node;
@@ -635 +651 @@
         RenderBvhNode(in->GetFront());
   }
-  
-}
-
-}
+
+  //cout << "leaf obj " << i << endl;
+
+}
+
+void
+GlRenderer::RenderKdNode(KdNode *node)
+{
+  if (node->IsLeaf()) {
+        KdLeaf *leaf = (KdLeaf *) node;
+        for (int i=0; i < leaf->mObjects.size(); i++) {
+          RenderIntersectable(leaf->mObjects[i]);
+        }
+  } else {
+        KdInterior *in = (KdInterior *)node;
+        RenderKdNode(in->mBack);
+        RenderKdNode(in->mFront);
+  }
+  
+}
+
+}