Changeset 2224 for GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp

Timestamp:

03/09/07 18:30:24 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp (modified) (18 diffs)

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

@@ -393 +393 @@
         mNodeTimer.Entry();
 
-/*
-#if STORE_VIEWCELLS_WITH_BVH
-        AssociateViewCellsWithObjects(sc.mSampledFrontObjects);
-        AssociateViewCellsWithObjects(sc.mSampledBackObjects);
-#endif  
-*/
         const BvhTraversalData &tData = sc.mParentData;
         BvhLeaf *leaf = tData.mNode;
@@ -500 +494 @@
                 AssignSortedObjects(sc, frontData, backData);
         }
-/*
-#if STORE_VIEWCELLS_WITH_BVH
-        ReleaseViewCells(sc.mSampledFrontObjects);
-        ReleaseViewCells(sc.mSampledBackObjects);
-#endif
-*/
+
         mNodeTimer.Exit();
 
@@ -515 +504 @@
 BvhNode *BvHierarchy::Subdivide(SplitQueue &tQueue,
                                                                 SubdivisionCandidate *splitCandidate,
-                                                                const bool globalCriteriaMet)
+                                                                const bool globalCriteriaMet
+                                                                ,vector<SubdivisionCandidate *> &dirtyList
+                                                                )
 {
         mSubdivTimer.Entry();
@@ -552 +543 @@
                                 new BvhSubdivisionCandidate(tBackData);
                 
-                EvalSubdivisionCandidate(*frontCandidate);
-                EvalSubdivisionCandidate(*backCandidate);
-
+                // preprocess view cells
+                AssociateViewCellsWithObjects(*tData.mSampledObjects);
+
+                EvalSubdivisionCandidate(*frontCandidate, true, false);
+                EvalSubdivisionCandidate(*backCandidate, true, false);
+
+                CollectDirtyCandidates(sc, dirtyList, true);
+                ReleaseViewCells(*tData.mSampledObjects);
+                
                 // cross reference
                 tFrontData.mNode->SetSubdivisionCandidate(frontCandidate); 
@@ -638 +635 @@
 
 void BvHierarchy::EvalSubdivisionCandidate(BvhSubdivisionCandidate &splitCandidate, 
-                                                                                   bool computeSplitPlane)
+                                                                                   const bool computeSplitPlane,
+                                                                                   const bool preprocessViewCells)
 {
         mPlaneTimer.Entry();
 
 #if STORE_VIEWCELLS_WITH_BVH
-        // fill view cells cache
-        AssociateViewCellsWithObjects(*splitCandidate.mParentData.mSampledObjects);
+        if (preprocessViewCells) // fill view cells cache
+                AssociateViewCellsWithObjects(*splitCandidate.mParentData.mSampledObjects);
 #endif
 
@@ -656 +654 @@
                 const bool sufficientSamples = 
                         splitCandidate.mParentData.mNumRays > mMinRaysForVisibility;
+
+                //if (!sufficientSamples) cout << splitCandidate.mParentData.mNumRays << " ";
 
                 const bool useVisibiliyBasedHeuristics = 
@@ -757 +757 @@
 
 #if STORE_VIEWCELLS_WITH_BVH
-        ReleaseViewCells(*splitCandidate.mParentData.mSampledObjects);
+        if (preprocessViewCells)
+                ReleaseViewCells(*splitCandidate.mParentData.mSampledObjects);
 #endif
 
@@ -1672 +1673 @@
         VssRay::NewMail();
 
-        if ((mMaxTests < tData.mNumRays) &&      mUseCostHeuristics && useVisibilityBasedHeuristics)
+        /*if ((mMaxTests < tData.mNumRays) && mUseCostHeuristics && useVisibilityBasedHeuristics)
         {
                 VssRayContainer rays;
@@ -1692 +1693 @@
                         }
                 }               
-        }
+        }*/
 
         ////////////////////////////////////
@@ -1733 +1734 @@
                         }
 
-                        // no good results for degenerate axis split
+                        // avoid splits in degenerate axis with high penalty
                         if (1 &&
                                 (tData.mNode->GetBoundingBox().Size(axis) < 0.0001))//Limits::Small))
@@ -2405 +2406 @@
         ///////////////////////////////////////
         // start from root of tree
-        /*
+
         if (node == NULL)
                 node = mRoot;
@@ -2449 +2450 @@
   
         return leaf;
-        */
 }
 #endif
@@ -2632 +2632 @@
                 
                 // evaluate priority
-                EvalSubdivisionCandidate(*oSubdivisionCandidate);
+                EvalSubdivisionCandidate(*oSubdivisionCandidate, true, true);
                 PrintSubdivisionStats(*oSubdivisionCandidate);
 
@@ -2646 +2646 @@
                         
                         // reevaluate priority
-                        EvalSubdivisionCandidate(*sCandidate);
+                        EvalSubdivisionCandidate(*sCandidate, true, true);
                         tQueue.Push(sCandidate);
                 }
@@ -2655 +2655 @@
         {       
                 // evaluate priority
-                EvalSubdivisionCandidate(*oSubdivisionCandidate);
+                EvalSubdivisionCandidate(*oSubdivisionCandidate, true, true);
                 PrintSubdivisionStats(*oSubdivisionCandidate);
 
@@ -2794 +2794 @@
                 new BvhSubdivisionCandidate(oData);
 
-        EvalSubdivisionCandidate(*oSubdivisionCandidate);
+        EvalSubdivisionCandidate(*oSubdivisionCandidate, true, true);
         bvhLeaf->SetSubdivisionCandidate(oSubdivisionCandidate);
 
@@ -2929 +2929 @@
                 
                 // evaluate the changes in render cost and pvs entries
-                EvalSubdivisionCandidate(*sc, false);
+                EvalSubdivisionCandidate(*sc, false, true);
 
                 // create new interior node and two leaf node
@@ -3062 +3062 @@
                         const bool globalCriteriaMet = GlobalTerminationCriteriaMet(bsc->mParentData);
                 
-                        BvhNode *node = Subdivide(tempQueue, bsc, globalCriteriaMet);
+                        SubdivisionCandidateContainer dirtyList;
+                        BvhNode *node = Subdivide(tempQueue, bsc, globalCriteriaMet, dirtyList);
 
                         // not needed anymore