Changeset 735 for GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.cpp

Timestamp:

04/08/06 12:15:50 (18 years ago)

Author:

mattausch

Message:

added histogram functionality

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.cpp (modified) (3 diffs)

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

@@ -120 +120 @@
         environment->GetBoolValue("VspBspTree.simulateOctree", mSimulateOctree);
         environment->GetBoolValue("VspBspTree.useRandomAxis", mUseRandomAxis);
-        environment->GetBoolValue("VspBspTree.useBreathFirstSplits", mBreathFirstSplits);
+        environment->GetIntValue("VspBspTree.nodePriorityQueueType", mNodePriorityQueueType);
 
         environment->GetBoolValue("ViewCells.PostProcess.emptyViewCellsMerge", mEmptyViewCellsMergeAllowed);
@@ -154 +154 @@
         Debug << "subdivision stats log: " << subdivisionStatsLog << endl;
         Debug << "use random axis: " << mUseRandomAxis << endl;
-        Debug << "breath first splits: " << mBreathFirstSplits << endl;
-        Debug << "depth first splits: " << mDepthFirstSplits << endl;
-
+        Debug << "priority queue type: " << mNodePriorityQueueType << endl;
         Debug << "empty view cells merge: " << mEmptyViewCellsMergeAllowed << endl;
-
         Debug << "octree: " << mSimulateOctree << endl;
 
@@ -942 +939 @@
 void VspBspTree::EvalPriority(VspBspTraversalData &tData) const
 {
-        if (mBreathFirstSplits)
+    switch (mNodePriorityQueueType) 
+        {
+        case BREATH_FIRST:
                 tData.mPriority = (float)-tData.mDepth;
-        else if (mDepthFirstSplits)
+                break;
+        case DEPTH_FIRST:
                 tData.mPriority = (float)tData.mDepth;
-        else
+                break;
+        default:
                 tData.mPriority = tData.mPvs * tData.mProbability;
-        //cout << "priority: " << tData.mPriority << endl;
+                //Debug << "priority: " << tData.mPriority << endl;
+                break;
+        }
 }