Changeset 1160 for GTP/trunk

Timestamp:

07/26/06 17:38:01 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• ViewCell.cpp (modified) (1 diff)
• ViewCell.h (modified) (2 diffs)
• ViewCellsManager.cpp (modified) (10 diffs)
• ViewCellsManager.h (modified) (1 diff)
• VspBspTree.cpp (modified) (2 diffs)
• VspOspTree.cpp (modified) (2 diffs)

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

@@ -113 +113 @@
 mMergeCost(0),
 mPvsSize(0),
+mEntriesInPvs(0),
 mPvsSizeValid(false)
 {

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.h

@@ -266 +266 @@
         /// the potentially visible objects
         ObjectPvs mPvs;
-        /// the potentially visible kd leaves
-        KdPvs mKdPvs;
-
+        /// the volume of this view cell
         float mVolume;
         float mArea;
-
+        /// the cost that were paid for merging this view cells from two others.
         float mMergeCost;
-
+        /// if the view cell is valid view space
         bool mValid;
 
@@ -279 +277 @@
         RgbColor mColor;
 
-        
         /// store pvs size, used for evaluation purpose when pvss are stored only in the leaves
         int mPvsSize;
+        // stores number of entries in pvs
+        int mEntriesInPvs;
+
         /// if the pvs size scalar is up to date and corresponding to the real pvs size
         bool mPvsSizeValid;
+        
 
 };

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

@@ -2214 +2214 @@
 
 
-void ViewCellsManager::SetScalarPvsSize(ViewCell *vc, 
-                                                                                const int pvsSize) const
+void ViewCellsManager::UpdateScalarPvsSize(ViewCell *vc, const int pvsSize, const int entriesInPvs) const
 {
         vc->mPvsSize = pvsSize;
+        vc->mEntriesInPvs = entriesInPvs;
+
         vc->mPvsSizeValid = true;
 }
@@ -3198 +3199 @@
         {
                 pvs = root->GetPvs();
-                SetScalarPvsSize(root, pvs.GetSize());
+                UpdateScalarPvsSize(root, pvs.CountPvs(), pvs.GetSize());
                 
                 return;
@@ -3253 +3254 @@
         }
         
-        // set new pvs size
-    SetScalarPvsSize(interior, pvs.GetSize());
+        // set correct pvs size for interior
+        UpdateScalarPvsSize(interior, pvs.CountPvs(), pvs.GetSize());
 
 #else
@@ -4081 +4082 @@
         {
                 pvs = root->GetPvs();
-                SetScalarPvsSize(root, root->GetPvs().CountPvs());
+                UpdateScalarPvsSize(root, pvs.CountPvs(), pvs.GetSize());
                 
                 return;
@@ -4138 +4139 @@
         
         // set new pvs size
-        SetScalarPvsSize(interior, pvs.GetSize());
+        UpdateScalarPvsSize(interior, pvs.CountPvs(), pvs.GetSize());
         
 
@@ -5121 +5122 @@
         // terminate traversal
         if (root->IsLeaf())
-        {
+        { 
+                // we assume that pvs is explicitly stored in leaves
                 pvs = root->GetPvs();
-                SetScalarPvsSize(root, root->GetPvs().GetSize());
+                UpdateScalarPvsSize(root, pvs.CountPvs(), pvs.GetSize());
                 
                 return;
@@ -5179 +5181 @@
         
         // set new pvs size
-        SetScalarPvsSize(interior, pvs.GetSize());
+        UpdateScalarPvsSize(interior, pvs.CountPvs(), pvs.GetSize());
         
 
@@ -5797 +5799 @@
                                         if (!mStoreKdPvs)
                                         {
-                                                viewcell->GetPvs().AddSample(ray.mTerminationObject, ray.mPdf);
+                                                viewcell->AddPvsSample(ray.mTerminationObject, ray.mPdf, ray.mRelativePvsContribution);
                                         }
                                         else
@@ -5803 +5805 @@
                                                 /// get current leaf the point
                                                 KdLeaf *leaf = mOspTree->GetLeaf(ray.mTermination);
-
                                                 KdIntersectable *entry = mOspTree->GetOrCreateKdIntersectable(leaf);
 
-                                                viewcell->GetPvs().AddSample(entry, ray.mPdf);
+                                                viewcell->AddPvsSample(entry, ray.mPdf, ray.mRelativePvsContribution);
                                         }
                                 }
@@ -5812 +5813 @@
 #if COUNT_ORIGIN_OBJECTS
                                  if (ray.mOriginObject)
-                                         viewcell->GetPvs().AddSample(ray.mOriginObject, ray.mPdf);
+                                         viewcell->AddPvsSample(ray.mOriginObject, ray.mPdf, ray.mPvsContribution);
 #endif
                         }

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.h

@@ -412 +412 @@
                 of the hierarchy.
         */
-        void SetScalarPvsSize(ViewCell *vc, const int pvsSize) const;
+        void UpdateScalarPvsSize(ViewCell *vc, const int pvsSize, const int entriesInPvs) const;
 
 

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

@@ -842 +842 @@
 
                 // update scalar pvs size lookup
-                mViewCellsManager->SetScalarPvsSize(viewCell, viewCell->GetPvs().CountPvs());
+                ObjectPvs &pvs = viewCell->GetPvs();
+                mViewCellsManager->UpdateScalarPvsSize(viewCell, pvs.CountPvs(), pvs.GetSize());
         
 
@@ -982 +983 @@
 
                 // update scalar pvs size value
-                mViewCellsManager->SetScalarPvsSize(viewCell, viewCell->GetPvs().CountPvs());
+                ObjectPvs &pvs = viewCell->GetPvs();
+                mViewCellsManager->UpdateScalarPvsSize(viewCell, pvs.CountPvs(), pvs.GetSize());
 
                 mBspStats.contributingSamples += conSamp;

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

@@ -609 +609 @@
 
                 // update scalar pvs size value
-                mViewCellsManager->SetScalarPvsSize(viewCell, viewCell->GetPvs().CountPvs());
+                ObjectPvs &pvs = viewCell->GetPvs();
+                mViewCellsManager->UpdateScalarPvsSize(viewCell, pvs.CountPvs(), pvs.GetSize());
 
                 mVspStats.contributingSamples += conSamp;
@@ -723 +724 @@
 
                 // update scalar pvs size value
-                mViewCellsManager->SetScalarPvsSize(viewCell, viewCell->GetPvs().CountPvs());
+                ObjectPvs &pvs = viewCell->GetPvs();
+                mViewCellsManager->UpdateScalarPvsSize(viewCell, pvs.CountPvs(), pvs.GetSize());
 
                 mVspStats.contributingSamples += conSamp;