Changeset 1932 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

Timestamp:

01/03/07 01:36:35 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp (modified) (7 diffs)

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

@@ -34 +34 @@
 #define AVG_RAY_CONTRIBUTIONS 1
 #define CONTRIBUTION_RELATIVE_TO_PVS_SIZE 1
+#define PVS_ADD_DIRTY 1
 
 namespace GtpVisibilityPreprocessor {
@@ -82 +83 @@
 
 
-int ViewCellsManager::CastPassSamples2(const int samplesPerPass, VssRayContainer &passSamples) const
+int ViewCellsManager::CastPassSamples2(const int samplesPerPass, 
+                                                                           VssRayContainer &passSamples) const
 {
         long startTime = GetTime();
@@ -2153 +2155 @@
 
 
-
-#define PVS_ADD_DIRTY 1
+inline static void AddSampleToPvs(ObjectPvs &pvs, 
+                                                                  Intersectable *obj, 
+                                                                  const float pdf)
+{
+#if PVS_ADD_DIRTY
+        pvs.AddSampleDirtyCheck(obj, pdf);
+
+        if (pvs.RequiresResort()) 
+        {
+                pvs.SimpleSort();
+        }
+#else
+        pvs.AddSample(obj, pdf);
+#endif
+}
+
+
+void ViewCellsManager::ComputeViewCellContribution(ViewCell *viewCell,
+                                                                                                   VssRay &ray, 
+                                                                                                   Intersectable *obj,
+                                                                                                   const Vector3 &pt,
+                                                                                                   const bool addRays)
+{
+        // check if we are outside of view space
+        if (!obj || !viewCell->GetValid())
+                return;
+
+        // if ray not outside of view space
+        float relContribution = 0.0f;
+        float absContribution = 0.0f;
+
+        // todo: maybe not correct for kd node pvs
+        if (viewCell->GetPvs().GetSampleContribution(obj,
+                                                                                                 ray.mPdf,
+                                                                                                 relContribution))
+        {
+                absContribution = 1.0f;
+        }
+        
+        // $$ clear the relative contribution as it is currently not correct anyway
+        relContribution = 0.0f;
+
+        if (absContribution == 1.0f)
+        {
+                ++ ray.mPvsContribution;
+                relContribution = 1.0f;
+
+                if (addRays) 
+                {
+                        AddSampleToPvs(viewCell->GetPvs(), obj, ray.mPdf);
+                }
+
+#if DIST_WEIGHTED_CONTRIBUTION 
+                // recalculate the contribution - weight the 1.0f contribution by the sqr distance to the
+                // object-> a new contribution in the proximity of the viewcell has a larger weight!
+                relContribution /= SqrDistance(GetViewCellBox(viewcell).Center(), pt);
+                                  
+#endif
+        }
+
+#if SUM_RAY_CONTRIBUTIONS || AVG_RAY_CONTRIBUTIONS
+        ray.mRelativePvsContribution += relContribution;
+#else
+        // recalculate relative contribution - use max of AbsContribution
+        if (ray.mRelativePvsContribution < absContribution)
+                ray.mRelativePvsContribution = absContribution;
+#endif
+}
+
 
 float
@@ -2164 +2233 @@
         ray.mRelativePvsContribution = 0.0f;
 
-        if (ray.mTerminationObject==NULL)
+        if (!ray.mTerminationObject)
                 return 0.0f;
 
-        ViewCellContainer viewcells;
+        ViewCellContainer viewCells;
 
         static Ray hray;
@@ -2183 +2252 @@
 
         // traverse the view space subdivision
-        CastLineSegment(origin, termination, viewcells);
+        CastLineSegment(origin, termination, viewCells);
 
         if (storeViewCells)
         {       
                 // copy viewcells memory efficiently
-                ray.mViewCells.reserve(viewcells.size());
-                ray.mViewCells = viewcells;
-        }
-
-        ViewCellContainer::const_iterator it = viewcells.begin();
-
+                ray.mViewCells.reserve(viewCells.size());
+                ray.mViewCells = viewCells;
+        }
+
+        // optain pvs entry (can be different from hit object)
         Intersectable *terminationObj = GetIntersectable(ray, true);
 
-        
-        for (; it != viewcells.end(); ++ it) 
-        {
-                ViewCell *viewcell = *it;
-
-                if (viewcell->GetValid())
-                {       
-                        // if ray not outside of view space
-                        float relContribution = 0.0f;
-                        float absContribution = 0.0f;
-                        
-                        if (terminationObj) 
-                        {
-                                // todo: maybe not correct for kd node pvs
-                          if (viewcell->GetPvs().GetSampleContribution(
-                                                                                                                   terminationObj,
-                                                                                                                   ray.mPdf,
-                                                                                                                   relContribution))
-                                absContribution = 1.0f;
-                          
-                          // $$ clear the relative contribution as it is currently not correct anyway
-                          relContribution = 0.0f;
-
-                          if (absContribution == 1.0f)
-                                {
-                                  ++ ray.mPvsContribution;
-                                  relContribution = 1.0f;
-                                  if (addRays) {
-#if PVS_ADD_DIRTY
-                                        viewcell->GetPvs().AddSampleDirtyCheck(terminationObj, ray.mPdf);
-                                        if (viewcell->GetPvs().RequiresResort()) {
-                                          viewcell->GetPvs().SimpleSort();
-                                        }
-#else
-                                        viewcell->GetPvs().AddSample(terminationObj, ray.mPdf);
-#endif
-                                  }
-
-#if CONTRIBUTION_RELATIVE_TO_PVS_SIZE
-                                  relContribution /= viewcell->GetPvs().GetSize();
-#endif
-                                  
-#if DIST_WEIGHTED_CONTRIBUTION 
-                                  // recalculate the contribution - weight the 1.0f contribution by the sqr distance to the
-                                  // object-> a new contribution in the proximity of the viewcell has a larger weight!
-                                  relContribution /= SqrDistance(GetViewCellBox(viewcell).Center(),
-                                                                                                 ray.mTermination);
-                                  
-#endif
-                                }
-#if SUM_RAY_CONTRIBUTIONS || AVG_RAY_CONTRIBUTIONS
-                          ray.mRelativePvsContribution += relContribution;
-#else
-                          // recalculate relative contribution - use max of AbsContribution
-                          if (ray.mRelativePvsContribution < absContribution)
-                                ray.mRelativePvsContribution = absContribution;
-#endif
-                        }
-                }
+        ViewCellContainer::const_iterator it = viewCells.begin();
+
+        for (; it != viewCells.end(); ++ it) 
+        {
+                ComputeViewCellContribution(*it, 
+                                                                        ray, 
+                                                                        terminationObj, 
+                                                                        ray.mTermination, 
+                                                                        addRays);
         }
 
 #if AVG_RAY_CONTRIBUTIONS
-        ray.mRelativePvsContribution /= viewcells.size();
+        ray.mRelativePvsContribution /= (float)viewCells.size();
 #endif
 #if USE_RAY_LENGTH_AS_CONTRIBUTION
-  float c = 0.0f;
-  if (terminationObj) 
-        c = ray.Length();
-  ray.mRelativePvsContribution = ray.mPvsContribution = c;
-  return c;
+        float c = 0.0f;
+        if (obj) 
+                c = ray.Length();
+        ray.mRelativePvsContribution = ray.mPvsContribution = c;
+        return c;
 #else
-  return ABS_CONTRIBUTION_WEIGHT*ray.mPvsContribution +
-        (1.0f - ABS_CONTRIBUTION_WEIGHT)*ray.mRelativePvsContribution;
+        return ABS_CONTRIBUTION_WEIGHT * ray.mPvsContribution +
+                (1.0f - ABS_CONTRIBUTION_WEIGHT) * ray.mRelativePvsContribution;
 #endif
 }
-
 
 
@@ -3544 +3561 @@
                                 if (p < raysOut)
                                 {
-                                        if ((*rit)->mFlags & VssRay::BorderSample)
+                                        if (0 && (*rit)->mFlags & VssRay::BorderSample)
                                         {
-                                                cout << "b";
                                                 vcRays.push_back(*rit);
                                         }
                                         else if ((*rit)->mFlags & VssRay::ReverseSample)
                                         {
+                                                cout << "l";
                                                 vcRays2.push_back(*rit);
-                                                cout << "r";
                                         }
-                                        else
+                                        else if(0)
                                         {
-                                                cout << "n";
                                                 vcRays3.push_back(*rit);
                                         }       
@@ -5448 +5463 @@
 
         if (0)
-        {       // real meshes are constructed at this stage
+        {       
+                // real meshes are constructed at this stage
                 cout << "finalizing view cells ... ";
-                FinalizeViewCells(true);
+        FinalizeViewCells(true);
                 cout << "finished" << endl;
         }