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

Timestamp:

12/15/06 23:40:27 (18 years ago)

Author:

bittner

Message:

experiments with different contribution computations

File:

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

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

@@ -27 +27 @@
 
 // $$JB HACK
-#define USE_KD_PVS 0
+#define USE_KD_PVS 1
 
 #define KD_PVS_AREA (1e-5f)
+
+#define USE_RAY_LENGTH_AS_CONTRIBUTION 0
+#define DIST_WEIGHTED_CONTRIBUTION 1
 
 namespace GtpVisibilityPreprocessor {
@@ -1536 +1539 @@
                                                                                          const bool storeViewCells)
 {
-  // view cells not yet constructed
-  if (!ViewCellsConstructed())
-        return 0.0f;
-  
   float sum = 0.0f;
+
   VssRayContainer::const_iterator it, it_end = rays.end();
   
   for (it = rays.begin(); it != it_end; ++ it) 
         {
-          sum += ComputeSampleContribution(*(*it), addRays, storeViewCells);
+          if (!ViewCellsConstructed()) {
+                // view cells not yet constructed
+                // just take the lenghts of the rays as contributions
+                if ((*it)->mTerminationObject)
+                  sum += (*it)->Length();
+          } else {
+                sum += ComputeSampleContribution(*(*it), addRays, storeViewCells);
+          }
         }
   
@@ -2009 +2016 @@
 float
 ViewCellsManager::ComputeSampleContribution(VssRay &ray,
-                                                                                                  const bool addRays,
-                                                                                                  const bool storeViewCells)
+                                                                                        const bool addRays,
+                                                                                        const bool storeViewCells)
 {
   ray.mPvsContribution = 0;
@@ -2059 +2066 @@
                         {
                           // todo: maybe not correct for kd node pvs
-                          if (viewcell->GetPvs().GetSampleContribution(
-                                                                                                                   terminationObj, ray.mPdf, contribution))
+                          bool absContribution = viewcell->GetPvs().GetSampleContribution(
+                                                                                                                                                          terminationObj,
+                                                                                                                                                          ray.mPdf,
+                                                                                                                                                          contribution);
+#if DIST_WEIGHTED_CONTRIBUTION
+                          // clear the relative contribution
+                          contribution = 0.0f;
+#endif
+                          if (absContribution)
                                 {
                                   ++ ray.mPvsContribution;
@@ -2073 +2087 @@
 #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!
+                                  contribution = 1.0f/SqrDistance(GetViewCellBox(viewcell).Center(),
+                                                                                                  ray.mTermination);
+#endif
                                 }
                           
@@ -2079 +2099 @@
                 }
         }
-  
+
+#if USE_RAY_LENGTH_AS_CONTRIBUTION
+  float c = 0.0f;
+  if (terminationObj) 
+        c = ray.Length();
+  ray.mRelativePvsContribution = ray.mPvsContribution = c;
+  return c;
+#else
   return ABS_CONTRIBUTION_WEIGHT*ray.mPvsContribution +
         (1.0f - ABS_CONTRIBUTION_WEIGHT)*ray.mRelativePvsContribution;
+#endif
 }