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

Timestamp:

01/05/07 16:29:54 (18 years ago)

Author:

bittner

Message:

tmp commit

File:

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

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

@@ -31 +31 @@
 #define USE_RAY_LENGTH_AS_CONTRIBUTION 0
 #define DIST_WEIGHTED_CONTRIBUTION 0
-#define SUM_RAY_CONTRIBUTIONS 0
-#define AVG_RAY_CONTRIBUTIONS 1
-#define CONTRIBUTION_RELATIVE_TO_PVS_SIZE 1
+#define SUM_RAY_CONTRIBUTIONS 1
+#define AVG_RAY_CONTRIBUTIONS 0
+#define CONTRIBUTION_RELATIVE_TO_PVS_SIZE 0
 #define PVS_ADD_DIRTY 1
 
@@ -1996 +1996 @@
   stat.avgFilterRadius = 0;
   stat.avgFilterRatio = 0;
+  stat.avgRelPvsIncrease = 0.0f;
+  stat.devRelPvsIncrease = 0.0f;
   
-  for (; it != mViewCells.end(); ++ it) 
+  if (mPerViewCellStat.size() != mViewCells.size()) {
+        // reset the pvs size array after the first call to this routine
+        mPerViewCellStat.resize(mViewCells.size());
+        for (int i=0; i < mPerViewCellStat.size(); i++) {
+          mPerViewCellStat[i].pvsSize = 0.0f;
+          mPerViewCellStat[i].relPvsIncrease = 0.0f;
+        }
+  }
+  int i;
+  bool evaluateFilter;
+  Environment::GetSingleton()->GetBoolValue("Preprocessor.evaluateFilter", evaluateFilter);
+
+  for (i=0; it != mViewCells.end(); ++ it, i++) 
         {
           ViewCell *viewcell = *it;
@@ -2010 +2024 @@
                 stat.avgPvs += pvsCost;
 
-                bool evaluateFilter;
-                Environment::GetSingleton()->GetBoolValue("Preprocessor.evaluateFilter", evaluateFilter);
+
+                if (mPerViewCellStat[i].pvsSize > 0.0f)
+                  mPerViewCellStat[i].relPvsIncrease = (pvsCost - mPerViewCellStat[i].pvsSize)/mPerViewCellStat[i].pvsSize;
+                
+                stat.avgRelPvsIncrease += mPerViewCellStat[i].relPvsIncrease;
+                
+                // update the pvs size
+                mPerViewCellStat[i].pvsSize = pvsCost;
+                
                 
                 
@@ -2040 +2061 @@
           }
         }
+
+  
   
   if (stat.viewcells) {
@@ -2046 +2069 @@
         stat.avgFilterContribution/=stat.viewcells;
         stat.avgFilterRadius/=stat.viewcells;
-        stat.avgFilterRatio/=stat.viewcells;
+        stat.avgFilterRatio/=stat.viewcells; 
+        stat.avgRelPvsIncrease/=stat.viewcells;
+
+        // evaluate std deviation of relPvsIncrease
+        float sum=0.0f;
+        for (i=0; i < stat.viewcells; i++) {
+          sum += sqr(mPerViewCellStat[i].relPvsIncrease - stat.avgRelPvsIncrease);
+        }
+        stat.devRelPvsIncrease = sqrt(sum/stat.viewcells);
   }
+  
 }
 
@@ -2063 +2095 @@
   s<<"#MAX_PVS\n"<<pvsStat.maxPvs<<endl;
   s<<"#MIN_PVS\n"<<pvsStat.minPvs<<endl;
+  s<<"#AVG_REL_PVS_INCREASE\n"<<pvsStat.avgRelPvsIncrease<<endl;
+  s<<"#DEV_REL_PVS_INCREASE\n"<<pvsStat.devRelPvsIncrease<<endl;
 }
 
@@ -2178 +2212 @@
                                                                                                    const bool addRays)
 {
-        // check if we are outside of view space
+  // 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 (obj) 
+          {
+                // todo: maybe not correct for kd node pvs
+                if (addRays) {
+                  float pdf = viewCell->GetPvs().AddSampleDirtyCheck(obj, ray.mPdf);
+                  if (pdf == ray.mPdf) {
+                        absContribution = 1.0f;
+                        if (viewCell->GetPvs().RequiresResort()) 
+                          viewCell->GetPvs().SimpleSort();
+                  }
+                          } else {
+                                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 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(), pt);
-                                  
+                  // 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;
+                ray.mRelativePvsContribution += relContribution;
 #else
-        // recalculate relative contribution - use max of AbsContribution
-        if (ray.mRelativePvsContribution < absContribution)
-                ray.mRelativePvsContribution = absContribution;
+                // recalculate relative contribution - use max of Rel Contribution
+                if (ray.mRelativePvsContribution < relContribution)
+                  ray.mRelativePvsContribution = relContribution;
 #endif
+          }
+        
 }
 
@@ -2243 +2288 @@
         float tmin = 0, tmax = 1.0;
 
-        if (!GetViewSpaceBox().GetRaySegment(hray, tmin, tmax) || (tmin > tmax))
-                return 0;
+        if (!GetViewSpaceBox().GetRaySegment(hray, tmin, tmax) || (tmin > tmax)) {
+          //      cerr<<"ray outside view space box\n";
+          return 0;
+        }
 
         Vector3 origin = hray.Extrap(tmin);
@@ -2254 +2301 @@
         CastLineSegment(origin, termination, viewCells);
 
+        
         if (storeViewCells)
         {       
-                // copy viewcells memory efficiently
-                ray.mViewCells.reserve(viewCells.size());
-                ray.mViewCells = viewCells;
+          // copy viewcells memory efficiently
+          ray.mViewCells.reserve(viewCells.size());
+          ray.mViewCells = viewCells;
         }
 
@@ -2280 +2328 @@
 #if USE_RAY_LENGTH_AS_CONTRIBUTION
         float c = 0.0f;
-        if (obj) 
-                c = ray.Length();
+        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;
+        return ABS_CONTRIBUTION_WEIGHT*ray.mPvsContribution +
+          (1.0f - ABS_CONTRIBUTION_WEIGHT)*ray.mRelativePvsContribution;
 #endif
 }
@@ -2897 +2945 @@
                 sqrt((float)objectSamples);
           
-          //    cout<<"lr="<<localRadius<<" gr="<<globalRadius<<endl;
+          //      cout<<"os="<<objectSamples<<" lr="<<localRadius<<" gr="<<globalRadius<<endl;
           
           // now compute the filter size