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

Timestamp:

06/09/06 01:26:46 (18 years ago)

Author:

mattausch

Message:

started viewspace-objectspace subdivision
removed memory leaks

File:

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

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

@@ -124 +124 @@
         Environment::GetSingleton()->GetIntValue("VspBspTree.nodePriorityQueueType", mNodePriorityQueueType);
 
-        Environment::GetSingleton()->GetBoolValue("ViewCells.PostProcess.emptyViewCellsMerge", mEmptyViewCellsMergeAllowed);
         
         char subdivisionStatsLog[100];
@@ -132 +131 @@
         Environment::GetSingleton()->GetFloatValue("VspBspTree.Construction.minBand", mMinBand);
         Environment::GetSingleton()->GetFloatValue("VspBspTree.Construction.maxBand", mMaxBand);
-        Environment::GetSingleton()->GetBoolValue("VspBspTree.Construction.useDrivingAxisForMaxCost", mUseDrivingAxisForMaxCost);
+        Environment::GetSingleton()->GetBoolValue("VspBspTree.Construction.useDrivingAxisForMaxCost", mUseDrivingAxisIfMaxCostViolated);
 
         //-- debug output
@@ -161 +160 @@
         Debug << "use random axis: " << mUseRandomAxis << endl;
         Debug << "priority queue type: " << mNodePriorityQueueType << endl;
-        Debug << "empty view cells merge: " << mEmptyViewCellsMergeAllowed << endl;
         Debug << "circulating axis: " << mCirculatingAxis << endl;
         Debug << "minband: " << mMinBand << endl;
         Debug << "maxband: " << mMaxBand << endl;
-        Debug << "use driving axis for max cost: " << mUseDrivingAxisForMaxCost << endl;
+        Debug << "use driving axis for max cost: " << mUseDrivingAxisIfMaxCostViolated << endl;
 
         Debug << "Split plane strategy: ";
@@ -1194 +1192 @@
                 }
           
-                if (ray->mOriginObject) 
+                // only count termination objects?
+                if (1 && ray->mOriginObject) 
                 {
                         if (vc->AddPvsSample(ray->mOriginObject, ray->mPdf, contribution))
@@ -1482 +1481 @@
         const float maxCostRatioForArbitraryAxis = 0.9f;
 
-        if (mUseDrivingAxisForMaxCost)
+        if (mUseDrivingAxisIfMaxCostViolated)
                 bestAxis = box.Size().DrivingAxis();
         else
@@ -1523 +1522 @@
                                                                                         nPosition[axis]);                       
                         }
-                        
-                        //-- split plane position is spatial median
-
-
-                        // also use median split if cost ratio very low as
-                        // there are not enough visibility cues
-                        //if (!mUseCostHeuristics || (nCostRatio[axis] > maxCostRatioForHeur))
-                        else 
+                        else //-- split plane position is spatial median
                         {
 
@@ -1578 +1570 @@
                                                 
                         
-                        if (mUseDrivingAxisForMaxCost)
+                        if (mUseDrivingAxisIfMaxCostViolated)
                         {
                                 // we take longest axis split if cost ratio exceeds threshold
@@ -1710 +1702 @@
         }
 
+
         //-- evaluate axis aligned splits
+        
         int axis;
         BspNodeGeometry *fGeom, *bGeom;
@@ -1717 +1711 @@
         candidateCost = 99999999.0f;
 
-        // option: axis aligned split only if no polygon available
+        // as a variant, we take axis aligned split only if there is 
+        // more polygon available to guide the split
         if (!mUsePolygonSplitIfAvailable || data.mPolygons->empty())
         {
@@ -1932 +1927 @@
 
 #if 1
-        // take render cost of node into account
+        // take render cost of node into account to avoid being stuck in a local minimum
         const float normalizedOldRenderCost = oldRenderCost / mBox.GetVolume();
+        
         //Debug << "rendercostdecr: " << 0.99f * renderCostDecrease << " old render cost: " << 0.01f * normalizedOldRenderCost << endl;
-        //return 0.5f * renderCostDecrease + 0.5f * normalizedOldRenderCost;
         return 0.99f * renderCostDecrease + 0.01f * normalizedOldRenderCost;
 #else
@@ -1956 +1951 @@
         float pvsBack = 0;
         
+        // overall probability is used as normalizer
+        float pOverall = 0;
+
         // probability that view point lies in back / front node
-        float pOverall = 0;
         pFront = 0;
         pBack = 0;
@@ -3532 +3529 @@
 
 
-typedef pair<BspNode *, BspNodeGeometry *> bspNodePair;
-
-
 int VspBspTree::CastBeam(Beam &beam)
 {
@@ -3656 +3650 @@
                                 MergeCandidate mc(leaf->GetViewCell(), (*nit)->GetViewCell());
 
-                                // dont't merge view cells if they are empty and not front and back leaf of the same parent
-                                // in the tree?
-                                if (mEmptyViewCellsMergeAllowed ||
-                                        !leaf->GetViewCell()->GetPvs().Empty() || 
+                                if (!leaf->GetViewCell()->GetPvs().Empty() || 
                                         !(*nit)->GetViewCell()->GetPvs().Empty() ||
                     leaf->IsSibling(*nit))