Changeset 1302 for GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp

Timestamp:

08/30/06 21:54:49 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp (modified) (22 diffs)

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

@@ -23 +23 @@
 
 
+
 namespace GtpVisibilityPreprocessor {
 
@@ -32 +33 @@
 
 VspTree *VspTree::VspSubdivisionCandidate::sVspTree = NULL;
-
+int VspNode::sMailId = 1;
 
 // variable for debugging volume contribution for heuristics
 static float debugVol;
 
-int VspNode::sMailId = 1;
 
 // pvs penalty can be different from pvs size
@@ -53 +53 @@
                 return (float)upper;
         }
-
         return (float)pvs;
 }
@@ -299 +298 @@
 
 
-VspLeaf::VspLeaf(): mViewCell(NULL), mPvs(NULL)
+VspLeaf::VspLeaf(): mViewCell(NULL), mPvs(NULL), mSubdivisionCandidate(NULL)
 {
 }
@@ -554 +553 @@
                 // || mOutOfMemory
                 || (mVspStats.Leaves() >= mMaxViewCells)
-        || (mGlobalCostMisses >= mTermGlobalCostMissTolerance) 
+        //|| (mGlobalCostMisses >= mTermGlobalCostMissTolerance) 
                 );
 
@@ -630 +629 @@
         VspSubdivisionCandidate *sc = 
                 dynamic_cast<VspSubdivisionCandidate *>(splitCandidate);
+
         VspTraversalData &tData = sc->mParentData;
-
         VspNode *newNode = tData.mNode;
 
@@ -735 +734 @@
 
         // max cost threshold violated?
-        splitCandidate.mMaxCostMisses = 
-                maxCostRatioViolated  ? 
+        splitCandidate.mMaxCostMisses = maxCostRatioViolated  ? 
                         splitCandidate.mParentData.mMaxCostMisses + 1:
                         splitCandidate.mParentData.mMaxCostMisses;
@@ -749 +747 @@
         splitCandidate.SetRenderCostDecrease(renderCostDecr);
 
-#if 0
+#if 1
         const float priority = (float)-splitCandidate.mParentData.mDepth;
-#else   
-
+#else
         // take render cost of node into account 
         // otherwise danger of being stuck in a local minimum!!
@@ -785 +782 @@
 
         //-- compute pvs
+
         frontData.mPvs = EvalPvsSize(*frontData.mRays);
         backData.mPvs = EvalPvsSize(*backData.mRays);
@@ -815 +813 @@
     
         VspInterior *interior = new VspInterior(splitPlane);
-
-#ifdef _DEBUG
-        Debug << interior << endl;
-#endif+
 
 
@@ -1196 +1190 @@
         float minSum = 1e20f;
 
-        
         // if no good split can be found, take mid split
         position = minBox + 0.5f * sizeBox;
@@ -1209 +1202 @@
 
         //-- traverse through visibility events
-
         vector<SortableEntry>::const_iterator ci, ci_end = mLocalSubdivisionCandidates->end();
 
@@ -1373 +1365 @@
         Intersectable::NewMail(3);
         KdLeaf::NewMail(3);
-        //for (int i=0;i<25;++i) BvhLeaf::NewMail();
         BvhLeaf::NewMail(3);
 
@@ -1392 +1383 @@
                 // evaluate contribution of ray endpoint to front and back pvs
                 // with respect to the classification
-                //Debug << "mail1:  " << BvhLeaf::sMailId << endl;
                 UpdateContributionsToPvs(*ray, true, cf, pvsFront, pvsBack, totalPvs);  
-                //Debug << "mail2:  " << BvhLeaf::sMailId << endl;
                 UpdateContributionsToPvs(*ray, false, cf, pvsFront, pvsBack, totalPvs);
-                //Debug << "mail3:  " << BvhLeaf::sMailId << endl;
-        }
-
+        }
 
         AxisAlignedBox3 frontBox;
@@ -1412 +1399 @@
 
         //-- pvs rendering heuristics
+
         const int lowerPvsLimit = mViewCellsManager->GetMinPvsSize();
         const int upperPvsLimit = mViewCellsManager->GetMaxPvsSize();
 
-        //-- only render cost heuristics or combined with standard deviation
-
+        // only render cost heuristics or combined with standard deviation
         const float penaltyOld = EvalPvsPenalty((int)totalPvs, lowerPvsLimit, upperPvsLimit);
     const float penaltyFront = EvalPvsPenalty((int)pvsFront, lowerPvsLimit, upperPvsLimit);
@@ -1484 +1471 @@
         
 #ifdef _DEBUG
-        Debug << axis << " " << pvsSize << " " << pvsBack << " " << pvsFront << endl;
-        Debug << pFront << " " << pBack << " " << pOverall << endl;
+        Debug << "axis: " << axis << " " << pvsSize << " " << pvsBack << " " << pvsFront << endl;
+        Debug << "p: " << pFront << " " << pBack << " " << pOverall << endl;
 #endif
 
@@ -2662 +2649 @@
         VspSubdivisionCandidate *splitCandidate = new VspSubdivisionCandidate(vData);
     EvalSubdivisionCandidate(*splitCandidate);
+        leaf->SetSubdivisionCandidate(splitCandidate);
 
         mTotalCost = (float)pvsSize;
@@ -2674 +2662 @@
                                                                         vector<SubdivisionCandidate *> &dirtyList) const
 {
+
         Intersectable *obj;
         Vector3 pt;
@@ -2679 +2668 @@
 
         ray.GetSampleData(isTermination, pt, &obj, &node);
-
+        
         if (!obj) return;
 
@@ -2693 +2682 @@
                                 dirtyList.push_back(leaf->mSubdivisionCandidate);
                         }
-
                         break;
                 }
         case HierarchyManager::BV_BASED_OBJ_SUBDIV:
                 {
+                        BvhLeaf *leaf = mHierarchyManager->mBvHierarchy->GetLeaf(obj);
+
+                        if (!leaf->Mailed())
+                        {
+                                leaf->Mail();
+                                dirtyList.push_back(leaf->GetSubdivisionCandidate());
+                                Debug << "here120 candidate: " << leaf->GetSubdivisionCandidate() << " type: " << leaf->GetSubdivisionCandidate()->Type() << endl;
+                        }
+                        break;
                 }
                 break;
@@ -2714 +2711 @@
         KdLeaf::NewMail();
         BvhLeaf::NewMail();
-
+        
         RayInfoContainer::const_iterator rit, rit_end = tData.mRays->end();
 
@@ -2721 +2718 @@
         {
                 VssRay *ray = (*rit).mRay;
-        
+                
                 CollectDirtyCandidate(*ray, true, dirtyList);
                 CollectDirtyCandidate(*ray, false, dirtyList);