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

Timestamp:

03/08/07 13:23:13 (17 years ago)

Author:

mattausch

Message:

improved performance of osp

File:

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

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

@@ -881 +881 @@
                                                                                         splitCandidate.GetAvgRayContribution());
         
+        splitCandidate.mFrontPvs = fPvsSize;
+        splitCandidate.mBackPvs = bPvsSize;
+
         if (0)
         cout << "vsp pvs"
@@ -902 +905 @@
 
         const VspTraversalData &tData = sc.mParentData;
-        const AxisAlignedPlane splitPlane = sc.mSplitPlane;
+        const AxisAlignedPlane &splitPlane = sc.mSplitPlane;
 
         ///////////////
@@ -917 +920 @@
 
         //-- compute pvs
-        frontData.mPvs = (float)EvalPvsEntriesSize(*frontData.mRays);
-        backData.mPvs = (float)EvalPvsEntriesSize(*backData.mRays);
+        frontData.mPvs = sc.mFrontPvs;//(float)EvalPvsEntriesSize(*frontData.mRays);
+        backData.mPvs = sc.mBackPvs;//(float)EvalPvsEntriesSize(*backData.mRays);
         
         //-- compute pvs correction for coping with undersampling
@@ -934 +937 @@
 
         //-- compute render cost
-        frontData.mRenderCost = (float)EvalPvsCost(*frontData.mRays);
-        backData.mRenderCost = (float)EvalPvsCost(*backData.mRays);
+        frontData.mRenderCost = sc.mFrontRenderCost;//(float)EvalPvsCost(*frontData.mRays);
+        backData.mRenderCost = sc.mBackRenderCost;//(float)EvalPvsCost(*backData.mRays);
         
         frontData.mCorrectedRenderCost = sc.mCorrectedFrontRenderCost;
@@ -1275 +1278 @@
         const float maxBand = minBox + mMaxBand * sizeBox;
 
+        // sort by the current dimension
         SortSubdivisionCandidates(usedRays, axis, minBand, maxBand);
 
@@ -1589 +1593 @@
         sc.mCorrectedBackRenderCost = mHierarchyManager->EvalCorrectedPvs(pvsBack, penaltyOld, avgRayContri);
 
+        sc.mFrontRenderCost = pvsFront;
+        sc.mBackRenderCost = pvsBack;
+
         const float oldRenderCost = pOverall * penaltyOld;
         const float newRenderCost = sc.mCorrectedFrontRenderCost * pFront + 
@@ -1727 +1734 @@
 
         const float renderCost = countEntries ? 1 : 
-                mHierarchyManager->mBvHierarchy->EvalAbsCost(leaf->mObjects);
+                mBvHierarchy->EvalAbsCost(leaf->mObjects);
         
         // leaf in no pvs => new
@@ -2286 +2293 @@
         case HierarchyManager::BV_BASED_OBJ_SUBDIV:
                 {
-                        BvhLeaf *bvhleaf = mHierarchyManager->mBvHierarchy->GetLeaf(obj);
+                        BvhLeaf *bvhleaf = mBvHierarchy->GetLeaf(obj);
 
                         if (!bvhleaf->Mailed())
@@ -2901 +2908 @@
         VspSubdivisionCandidate::sVspTree = this;
         
+        mBvHierarchy = mHierarchyManager->mBvHierarchy;
+
         // initialise termination criteria
         mTermMinProbability *= mBoundingBox.GetVolume();
@@ -2969 +2978 @@
         case HierarchyManager::BV_BASED_OBJ_SUBDIV:
                 {
-                        BvhLeaf *leaf = mHierarchyManager->mBvHierarchy->GetLeaf(obj);
+                        BvhLeaf *leaf = mBvHierarchy->GetLeaf(obj);
 
                         if (!leaf->Mailed())
@@ -3049 +3058 @@
         case HierarchyManager::BV_BASED_OBJ_SUBDIV:
                 {
-                        BvhLeaf *leaf = mHierarchyManager->mBvHierarchy->GetLeaf(obj);
+                        BvhLeaf *leaf = mBvHierarchy->GetLeaf(obj);
 
                         if (-- leaf->mCounter == 0)
@@ -3098 +3107 @@
         case HierarchyManager::BV_BASED_OBJ_SUBDIV:
                 {
-                        BvhLeaf *leaf = mHierarchyManager->mBvHierarchy->GetLeaf(obj);
+                        BvhLeaf *leaf = mBvHierarchy->GetLeaf(obj);
 
                         if (!leaf->Mailed())
@@ -3151 +3160 @@
         case HierarchyManager::BV_BASED_OBJ_SUBDIV:
                 {
-                        BvhLeaf *leaf = mHierarchyManager->mBvHierarchy->GetLeaf(obj);
+                        BvhLeaf *leaf = mBvHierarchy->GetLeaf(obj);
                         if (!leaf->Mailed())
                         {
@@ -3198 +3207 @@
                 case HierarchyManager::BV_BASED_OBJ_SUBDIV:
                 {
-                        BvhLeaf *leaf = mHierarchyManager->mBvHierarchy->GetLeaf(obj);
+                        BvhLeaf *leaf = mBvHierarchy->GetLeaf(obj);
                         UpdateContributionsToPvs(leaf, cf, frontPvs, backPvs, totalPvs, false);
                         break;
@@ -3227 +3236 @@
         case HierarchyManager::BV_BASED_OBJ_SUBDIV:
                 {
-                        BvhLeaf *leaf = mHierarchyManager->mBvHierarchy->GetLeaf(obj);
+                        BvhLeaf *leaf = mBvHierarchy->GetLeaf(obj);
                         UpdateContributionsToPvs(leaf, cf, pvsFront, pvsBack, totalPvs, true);
                         break;
@@ -3269 +3278 @@
         case HierarchyManager::BV_BASED_OBJ_SUBDIV:
                 {
-                        BvhLeaf *bvhleaf = mHierarchyManager->mBvHierarchy->GetLeaf(obj);
+                        BvhLeaf *bvhleaf = mBvHierarchy->GetLeaf(obj);
 
                         if (!bvhleaf->Mailed())