Changeset 2332 for GTP/trunk/Lib/Vis/Preprocessing/src/KdTree.cpp

Timestamp:

04/23/07 16:19:30 (17 years ago)

Author:

mattausch

Message:

implemented part of rendering estimation of wimmer et al. for view space / object space subdivision.
warning: not working with undersampling estimation + local visibility based subdivision.

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/KdTree.cpp (modified) (5 diffs)

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

@@ -15 +15 @@
 // $$JB HACK
 #define KD_PVS_AREA (1e-5f)
+
+#define TYPE_INTERIOR -2
+#define TYPE_LEAF -3
+
 
 namespace GtpVisibilityPreprocessor {
@@ -1098 +1102 @@
 }
 
-int
-KdTree::CollectLeafPvs()
-{
-
-        // matt: no more kd pvs
-    int totalPvsSize = 0;
-        /*
-  stack<KdNode *> nodeStack;
-  
-  nodeStack.push(mRoot);
-  
-  while (!nodeStack.empty()) {
-    KdNode *node = nodeStack.top();
-    nodeStack.pop();
-    if (node->IsLeaf()) {
-      KdLeaf *leaf = (KdLeaf *)node;
-      for (int j=0; j < leaf->mObjects.size(); j++) {
-        Intersectable *object = leaf->mObjects[j];
-        if (!object->Mailed()) {
-          object->Mail();
-          // add this node to pvs of all nodes it can see
-          KdPvsMap::iterator ni = object->mKdPvs.mEntries.begin();
-          for (; ni != object->mKdPvs.mEntries.end(); ni++) {
-            KdNode *node = (*ni).first;
-            // $$ JB TEMPORARY solution -> should add object PVS or explictly computed
-            // kd tree PVS
-                float contribution;
-                if (leaf->mKdPvs.AddSample(node, 1.0f, contribution))
-              totalPvsSize++;
-          }
-        }
-      }
-    } else {
-      KdInterior *interior = (KdInterior *)node;
-      nodeStack.push(interior->mFront);
-      nodeStack.push(interior->mBack);
-    }
-  }
-*/
-  return totalPvsSize;
-}
-
 
 KdNode *
@@ -1223 +1185 @@
 
 
-#define TYPE_INTERIOR -2
-#define TYPE_LEAF -3
-
-
 void KdTree::ExportBinLeaf(OUT_STREAM &stream, KdLeaf *leaf)
 {
@@ -1319 +1277 @@
         OUT_STREAM stream(filename.c_str(), OUT_BIN_MODE);
         
-        //if (!stream.is_open()) return false;
+        if (!stream.is_open()) return false;
 
         // export binary version of mesh
@@ -1400 +1358 @@
         DEL_PTR(mRoot);
   
-        KdNode *node = LoadNextNode(stream, NULL, objects);
-        mRoot = node;
-
-        tStack.push(TraversalData(node, mBox, 0));
+        mRoot = LoadNextNode(stream, NULL, objects);
+
+        tStack.push(TraversalData(mRoot, mBox, 0));
         mStat.Reset();
         mStat.nodes = 1;