Changeset 563 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

Timestamp:

01/21/06 18:32:30 (18 years ago)

Author:

bittner

Message:

rss sampling changes, preprocessor::GenerateRays?

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp (modified) (3 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -171 +171 @@
 
 
-void ViewCellsManager::ComputeSampleContributions(const VssRayContainer &rays)
-{
-        // view cells not yet constructed
-        if (!ViewCellsConstructed())
-                return;
-
-        VssRayContainer::const_iterator it, it_end = rays.end();
-
-        for (it = rays.begin(); it != it_end; ++ it)
-        {
-                ComputeSampleContributions(*(*it));
-        }
+float
+ViewCellsManager::ComputeSampleContributions(const VssRayContainer &rays,
+                                                                                         const bool addRays
+                                                                                         )
+{
+  // view cells not yet constructed
+  if (!ViewCellsConstructed())
+        return 0.0f;
+  
+  VssRayContainer::const_iterator it, it_end = rays.end();
+
+  float sum = 0.0f;
+  for (it = rays.begin(); it != it_end; ++ it) {
+        sum += ComputeSampleContributions(*(*it), addRays);
+  }
+  return sum;
 }
 
@@ -440 +444 @@
 }
 
+void
+ViewCellsManager::AddSampleContributions(const VssRayContainer &rays)
+{
+  if (!ViewCellsConstructed())
+        return;
+  
+  VssRayContainer::const_iterator it, it_end = rays.end();
+  
+  for (it = rays.begin(); it != it_end; ++ it) {
+        AddSampleContributions(*(*it));
+  }
+}
 
 int ViewCellsManager::GetMinPvsSize() const
@@ -454 +470 @@
 
 
-void ViewCellsManager::ComputeSampleContributions(VssRay &ray)
-{
-        ViewCellContainer viewcells;
-
-        ray.mPvsContribution = 0;
-        ray.mRelativePvsContribution = 0.0f;
-
-        // matt TODO: remove this!!
-        Ray hray(ray);
-        //static Ray hray;
-        //hray.Init(ray.GetOrigin(), ray.GetDir(), Ray::LINE_SEGMENT);
-        
-        float tmin = 0, tmax = 1.0;
-
-        if (!GetViewSpaceBox().GetRaySegment(hray, tmin, tmax) || (tmin > tmax))
-                return;
-
-        Vector3 origin = hray.Extrap(tmin);
-        Vector3 termination = hray.Extrap(tmax);
-
-        CastLineSegment(origin, termination, viewcells);
-        //Debug << "constribution: " << (int)viewcells.size() << endl;
-        // copy viewcells memory efficiently
-        const bool storeViewcells = false;
-        if (storeViewcells)
-        {
-                ray.mViewCells.reserve(viewcells.size());
-                ray.mViewCells = viewcells;
-        }
-
-        ViewCellContainer::const_iterator it = viewcells.begin();
-
-        bool addInPlace = false;
-
-        if (addInPlace) 
-        {
-                for (; it != viewcells.end(); ++it) {
-                        ViewCell *viewcell = *it;
-
-                        // if ray not outside of view space
-                        float contribution;
-                        bool added =
-                        viewcell->GetPvs().AddSample(ray.mTerminationObject,
-                                                                                 ray.mPdf,
-                                                                                 contribution
-                                                                                 );
-                        if (added)
-                        ray.mPvsContribution++;
-
-                        ray.mRelativePvsContribution += contribution;
-                }
-        } 
-        else 
-        {
-                for (; it != viewcells.end(); ++it) {
-                        ViewCell *viewcell = *it;
-                        // if ray not outside of view space
-                        float contribution;
-                        if (viewcell->GetPvs().GetSampleContribution(ray.mTerminationObject,
-                                                                                                                 ray.mPdf,
-                                                                                                                 contribution
-                                                                                                                 ))
-                          ray.mPvsContribution++;
-                        ray.mRelativePvsContribution += contribution;
-                }
-                
-                for (it = viewcells.begin(); it != viewcells.end(); ++it) {
-                  ViewCell *viewcell = *it;
-                  // if ray not outside of view space
-                  viewcell->GetPvs().AddSample(ray.mTerminationObject, ray.mPdf);
-                }
-        }
+void
+ViewCellsManager::AddSampleContributions(VssRay &ray)
+{
+  // assumes viewcells have been stored...
+  ViewCellContainer *viewcells = &ray.mViewCells;
+  ViewCellContainer::const_iterator it;
+  for (it = viewcells->begin(); it != viewcells->end(); ++it) {
+        ViewCell *viewcell = *it;
+        // if ray not outside of view space
+        viewcell->GetPvs().AddSample(ray.mTerminationObject, ray.mPdf);
+  }
+}
+
+float
+ViewCellsManager::ComputeSampleContributions(VssRay &ray,
+                                                                                         const bool addRays
+                                                                                         )
+{
+  ViewCellContainer viewcells;
+  
+  ray.mPvsContribution = 0;
+  ray.mRelativePvsContribution = 0.0f;
+  
+  // matt TODO: remove this!!
+  Ray hray(ray);
+  float tmin = 0, tmax = 1.0;
+  
+  //hray.Init(ray.GetOrigin(), ray.GetDir(), Ray::LINE_SEGMENT);
+  if (!GetViewSpaceBox().GetRaySegment(hray, tmin, tmax) || (tmin > tmax))
+        return 0.0f;
+  
+  Vector3 origin = hray.Extrap(tmin);
+  Vector3 termination = hray.Extrap(tmax);
+
+  CastLineSegment(origin,
+                                  termination,
+                                  viewcells);
+  
+  //Debug << "constribution: " << (int)viewcells.size() << endl;
+  
+  // copy viewcells memory efficiently
+  const bool storeViewcells = !addRays;
+  
+  if (storeViewcells)
+        {
+          ray.mViewCells.reserve(viewcells.size());
+          ray.mViewCells = viewcells;
+        }
+  
+  ViewCellContainer::const_iterator it = viewcells.begin();
+  
+  
+  for (; it != viewcells.end(); ++it) {
+        ViewCell *viewcell = *it;
+        // if ray not outside of view space
+        float contribution;
+        if (viewcell->GetPvs().GetSampleContribution(ray.mTerminationObject,
+                                                                                                 ray.mPdf,
+                                                                                                 contribution
+                                                                                                 ))
+          ray.mPvsContribution++;
+        ray.mRelativePvsContribution += contribution;
+  }
+  
+  if (addRays)
+        for (it = viewcells.begin(); it != viewcells.end(); ++it) {
+          ViewCell *viewcell = *it;
+          // if ray not outside of view space
+          viewcell->GetPvs().AddSample(ray.mTerminationObject, ray.mPdf);
+        }
+
+  return ray.mRelativePvsContribution;
 }