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

Timestamp:

02/27/06 18:39:47 (19 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -37 +37 @@
 int VspBspTree::sFrontAndBackId = 0;
 
-bool VspBspTraversalData::sBreathFirstSplits = false;
 
 
@@ -130 +129 @@
         environment->GetBoolValue("VspBspTree.useSplitCostQueue", mUseSplitCostQueue);
         environment->GetBoolValue("VspBspTree.simulateOctree", mSimulateOctree);
-        environment->GetBoolValue("VspBspTree.breathFirstSplits", VspBspTraversalData::sBreathFirstSplits);
+        environment->GetBoolValue("VspBspTree.useRandomAxis", mUseRandomAxis);
+        environment->GetBoolValue("VspBspTree.breathFirstSplits", mBreathFirstSplits);
 
         char subdivisionStatsLog[100];
@@ -162 +162 @@
         Debug << "use split cost queue: " << mUseSplitCostQueue << endl;
         Debug << "subdivision stats log: " << subdivisionStatsLog << endl;
-        
+        Debug << "use random axis: " << mUseRandomAxis << endl;
+        Debug << "breath first splits: " << mBreathFirstSplits << endl;
+
 
         Debug << "Split plane strategy: ";
@@ -463 +465 @@
                                                           geom);
 
-        tData.mPriority = mBreathFirstSplits ? 
-                (float)-frontData.mDepth : tData.mPvs * tData.mProbability;
+        EvalPriority(tData);
+        
 
         if (mSimulateOctree)
@@ -494 +496 @@
 
         long startTime = GetTime();     
-        int nLeaves = 0;
-        int nViewCells = 0;
+        int nLeaves = 500;
+        int nViewCells = 500;
 
         // used for intermediate time measurements and progress
@@ -538 +540 @@
                 }
 
-                if (mCreatedViewCells == nViewCells)
+                if (mCreatedViewCells >= nViewCells)
                 {
                         nViewCells += 500;
@@ -575 +577 @@
                                                           geom);
 
-        tData.mPriority = mBreathFirstSplits ? 
-                (float)-tData.mDepth : tData.mPvs * tData.mProbability;
+        
 
         // compute first split candidate
@@ -744 +745 @@
                         tBackData.mMaxCostMisses = maxCostMisses;
 
-                        ComputePriority(tFrontData);
-                        ComputePriority(tBackData);
+                        EvalPriority(tFrontData);
+                        EvalPriority(tBackData);
 
                         if (1)
@@ -864 +865 @@
                 tFrontData.mMaxCostMisses = maxCostMisses;
                 tBackData.mMaxCostMisses = maxCostMisses;
-                
-                ComputePriority(tFrontData);
-                ComputePriority(tBackData);
-
-                frontData.mPriority = mBreathFirstSplits ? 
-                (float)-frontData.mDepth : frontData.mPvs * frontData.mProbability;
-        backData.mPriority = mBreathFirstSplits ? 
-                (float)-backData.mDepth : backData.mPvs * backData.mProbability;
+                        
                 if (1)
                 {
@@ -951 +945 @@
 
         return newNode;
+}
+
+
+void VspBspTree::EvalPriority(VspBspTraversalData &tData) const
+{
+    tData.mPriority = mBreathFirstSplits ? 
+                (float)-tData.mDepth : tData.mPvs * tData.mProbability;
 }
 
@@ -1356 +1357 @@
         int sAxis = 0;
 
-        bool useSpecialAxis = false;
-
-        if (mSimulateOctree)
-        {
+        bool useSpecialAxis = mOnlyDrivingAxis || mUseRandomAxis || mSimulateOctree;
+
+        // use some kind of specialised fixed axis
+        if (mOnlyDrivingAxis)
+                sAxis = box.Size().DrivingAxis();
+        else if (mUseRandomAxis)
+                sAxis = Random(3);
+        else if (mSimulateOctree)
                 sAxis = tData.mAxis;
-                useSpecialAxis = true;
-        }
-        else if (mUseRandomAxis)
-        {
-                sAxis = Random(3);
-                useSpecialAxis = true;
-        }
-        else if (mOnlyDrivingAxis)
-        {
-                sAxis = box.Size().DrivingAxis();
-                useSpecialAxis = true;
-        }
+                
 
         for (axis = 0; axis < 3; ++ axis)