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

Timestamp:

01/22/07 20:25:06 (17 years ago)

Author:

bittner

Message:

pvs efficiency tuning

File:

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

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

@@ -28 +28 @@
 
 
+
 #define USE_RAY_LENGTH_AS_CONTRIBUTION 0
 #define DIST_WEIGHTED_CONTRIBUTION 0
@@ -37 +38 @@
 namespace GtpVisibilityPreprocessor {
 
+
+PerfTimer viewCellCastTimer;
+PerfTimer pvsTimer;
+PerfTimer objTimer;
 
 // HACK
@@ -1694 +1699 @@
 
   VssRayContainer::const_iterator it, it_end = rays.end();
-  
+
   for (it = rays.begin(); it != it_end; ++ it) 
         {
@@ -1707 +1712 @@
         }
 
+  cout<<"view cell cast time:"<<viewCellCastTimer.TotalTime()<<" s"<<endl;
+  cout<<"pvs time:"<<pvsTimer.TotalTime()<<" s"<<endl;
+  
   return sum;
 }
@@ -2235 +2243 @@
 
 
+void
+ViewCellsManager::SortViewCellPvs()
+{
+
+  ViewCellContainer::iterator it, it_end = mViewCells.end();
+  for (it = mViewCells.begin(); it != it_end; ++ it) {
+        ObjectPvs &pvs = (*it)->GetPvs();
+        if (pvs.RequiresResortLog())
+          pvs.Sort();
+  }
+}
+
 void ViewCellsManager::ComputeViewCellContribution(ViewCell *viewCell,
                                                                                                    VssRay &ray, 
@@ -2242 +2262 @@
 {
   // 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;
-        
-        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;
-                  
-                  
+  // $$JB tmp commented to speedup up computations
+#if 0
+  if (!obj || !viewCell->GetValid())
+        return;
+#endif
+  
+  
+  // if ray not outside of view space
+  float relContribution = 0.0f;
+  float absContribution = 0.0f;
+  bool hasAbsContribution;
+  
+  // todo: maybe not correct for kd node pvs
+  if (addRays) {
+        hasAbsContribution = viewCell->GetPvs().AddSampleDirtyCheck(obj,
+                                                                                                                                ray.mPdf);
+  }
+  else {
+        hasAbsContribution = viewCell->GetPvs().GetSampleContribution(
+                                                                                                                                  obj,
+                                                                                                                                  ray.mPdf,
+                                                                                                                                  relContribution);
+  }
+  
+  // $$ clear the relative contribution as it is currently not correct anyway
+  //  relContribution = 0.0f;
+  
+  if (hasAbsContribution)  {
+        ++ ray.mPvsContribution;
+        absContribution = relContribution = 1.0f;
+        if (viewCell->GetPvs().RequiresResort()) 
+          viewCell->GetPvs().SimpleSort();
+
 #if CONTRIBUTION_RELATIVE_TO_PVS_SIZE
-                  relContribution /= viewcell->GetPvs().GetSize();
+        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);
-                  
+        // 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 Rel Contribution
-                if (ray.mRelativePvsContribution < relContribution)
-                  ray.mRelativePvsContribution = relContribution;
+  // recalculate relative contribution - use max of Rel Contribution
+  if (ray.mRelativePvsContribution < relContribution)
+        ray.mRelativePvsContribution = relContribution;
 #endif
-          }
-        
-}
+}
+
+
 
 
@@ -2365 +2377 @@
         
         if (!ray.mTerminationObject)
-                return 0.0f;
-
-        static ViewCellContainer viewCells;
-
-          
+          return 0.0f;
+        
         static Ray hray;
         hray.Init(ray);
@@ -2382 +2391 @@
         Vector3 origin = hray.Extrap(tmin);
         Vector3 termination = hray.Extrap(tmax);
-
+        
         ViewCell::NewMail();
-
-        viewCells.clear();
-        
-        // traverse the view space subdivision
-        CastLineSegment(origin, termination, viewCells);
+        
+        viewCellCastTimer.Entry();
+
+        static ViewCellContainer viewCells;
+        static VssRay *lastVssRay = NULL;
+        
+        if (lastVssRay == NULL ||
+                !(ray.mOrigin == lastVssRay->mTermination) ||
+                !(ray.mTermination == lastVssRay->mOrigin)) {
+          viewCells.clear();
+          // traverse the view space subdivision
+          CastLineSegment(origin, termination, viewCells);
+          lastVssRay = &ray;
+        }
+        
+        viewCellCastTimer.Exit();
 
         mSamplesStat.mViewCells += (int)viewCells.size();
@@ -2394 +2414 @@
         if (storeViewCells)
         {       
+          cerr<<"Store viewcells should not be used in the test!"<<endl;
           // copy viewcells memory efficiently
 #if VSS_STORE_VIEWCELLS
@@ -2403 +2424 @@
 #endif
         }
-
+        
         Intersectable *terminationObj;
+        
+        objTimer.Entry();
 
         // obtain pvs entry (can be different from hit object)
         if (!useHitObjects)
-                terminationObj = GetIntersectable(ray, true);
+          terminationObj = GetIntersectable(ray, true);
         else
-                terminationObj = ray.mTerminationObject;
+          terminationObj = ray.mTerminationObject;
+        
+        objTimer.Exit();
+        
+        pvsTimer.Entry();
 
         ViewCellContainer::const_iterator it = viewCells.begin();
@@ -2422 +2449 @@
                                                                         addRays);
         }
+
+        pvsTimer.Exit();
 
         mSamplesStat.mPvsContributions += ray.mPvsContribution;