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

Timestamp:

12/08/06 23:46:17 (18 years ago)

Author:

bittner

Message:

halton generator updates

File:

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

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

@@ -32 +32 @@
 
 // $$JB HACK
-#define USE_KD_PVS 0
+#define USE_KD_PVS 1
 
 #define KD_PVS_AREA (1e-5f)
@@ -2023 +2023 @@
   
   ViewCellContainer viewcells;
-  
-
-
   
   static Ray hray;
@@ -2084 +2081 @@
                   // for directional sampling it is important to count only contributions
                   // made in one direction!!!
-                        // the other contributions of this sample will be counted for the oposite ray!
+                  // the other contributions of this sample will be counted for the oposite ray!
 
                         if (ray.mOriginObject && 
@@ -6047 +6044 @@
 
 #define PVS_ADD_DIRTY 1
+
 float
 VspOspViewCellsManager::ComputeSampleContribution(VssRay &ray,
@@ -6060 +6058 @@
   ViewCellContainer viewcells;
   
-
-        static Ray hray;
-        hray.Init(ray);
-        //hray.mFlags |= Ray::CULL_BACKFACES;
-        //Ray hray(ray);
-
-        //      if (ray.mPdf!=1.0f)
-        //        cout<<ray.mPdf<<" ";
-
-        float tmin = 0, tmax = 1.0;
-
-        if (!GetViewSpaceBox().GetRaySegment(hray, tmin, tmax) || (tmin > tmax))
-                return 0;
-
-        Vector3 origin = hray.Extrap(tmin);
-        Vector3 termination = hray.Extrap(tmax);
-
-        ViewCell::NewMail();
-
-        // traverse the view space subdivision
-        CastLineSegment(origin, termination, viewcells);
-
-        if (storeViewCells)
+  static Ray hray;
+  hray.Init(ray);
+
+  float tmin = 0, tmax = 1.0;
+  
+  if (!GetViewSpaceBox().GetRaySegment(hray, tmin, tmax) || (tmin > tmax))
+        return 0;
+  
+  Vector3 origin = hray.Extrap(tmin);
+  Vector3 termination = hray.Extrap(tmax);
+  
+  ViewCell::NewMail();
+  
+  // traverse the view space subdivision
+  CastLineSegment(origin, termination, viewcells);
+  
+  if (storeViewCells)
         {       
-                // copy viewcells memory efficiently
-                ray.mViewCells.reserve(viewcells.size());
-                ray.mViewCells = viewcells;
-        }
-
-        ViewCellContainer::const_iterator it = viewcells.begin();
-
-        Intersectable *terminationObj = GetIntersectable(ray, true);
-
+          // copy viewcells memory efficiently
+          ray.mViewCells.reserve(viewcells.size());
+          ray.mViewCells = viewcells;
+        }
+  
+  ViewCellContainer::const_iterator it = viewcells.begin();
+  
+  Intersectable *terminationObj = GetIntersectable(ray, true);
+  
 #if SAMPLE_ORIGIN_OBJECTS
-        Intersectable *originObj = GetIntersectable(ray, false);
+  Intersectable *originObj = GetIntersectable(ray, false);
 #endif
-
-        for (; it != viewcells.end(); ++ it) 
-        {
-                ViewCell *viewcell = *it;
-
-                if (viewcell->GetValid())
+  
+  for (; it != viewcells.end(); ++ it) 
+        {
+          ViewCell *viewcell = *it;
+          
+          if (viewcell->GetValid())
                 {       // if ray not outside of view space
-                        float contribution;
-
-                        if (terminationObj) 
+                  float contribution;
+                  
+                  if (terminationObj) 
                         {
                           // todo: maybe not correct for kd node pvs
@@ -6116 +6108 @@
                           ray.mRelativePvsContribution += contribution;
                         }
-
-                        ////////////////
-                        //-- for directional sampling it is important to count 
-                        //-- only contributions made in one direction!
-                        //-- the other contributions of this sample will be counted for the opposite ray!
-
+                  
+                  ////////////////
+                  //-- for directional sampling it is important to count 
+                  //-- only contributions made in one direction!
+                  //-- the other contributions of this sample will be counted for the opposite ray!
+                  
 #if SAMPLE_ORIGIN_OBJECTS
-
-                        if (originObj && 
-                                viewcell->GetPvs().GetSampleContribution(originObj,
-                                                                                                                 ray.mPdf,
-                                                                                                                 contribution))
+                  
+                  if (originObj && 
+                          viewcell->GetPvs().GetSampleContribution(originObj,
+                                                                                                           ray.mPdf,
+                                                                                                           contribution))
                         {
-                                ++ ray.mPvsContribution;
-                                ray.mRelativePvsContribution += contribution;
+                          ++ ray.mPvsContribution;
+                          ray.mRelativePvsContribution += contribution;
                         }
 #endif
                 }
         }
-
-        if (!addRays)
-        {
-                return ray.mRelativePvsContribution;
-        }
-
-        // sampled objects are stored in the pvs
-        for (it = viewcells.begin(); it != viewcells.end(); ++ it) 
-        {
-                ViewCell *viewCell = *it;
-
-                if (!viewCell->GetValid())
-                        break;
-
-                //$$JB hack
-
+  
+  if (!addRays) {
+        return ray.mRelativePvsContribution;
+  }
+  
+  // sampled objects are stored in the pvs
+  for (it = viewcells.begin(); it != viewcells.end(); ++ it)  {
+        ViewCell *viewCell = *it;
+        
+        if (!viewCell->GetValid())
+          break;
+        
+        //$$JB hack
+        
 #if PVS_ADD_DIRTY
-                viewCell->GetPvs().AddSampleDirtyCheck(terminationObj, ray.mPdf);
+        viewCell->GetPvs().AddSampleDirtyCheck(terminationObj, ray.mPdf);
 #else
-                viewCell->GetPvs().AddSample(terminationObj, ray.mPdf);
+        viewCell->GetPvs().AddSample(terminationObj, ray.mPdf);
 #endif
-
+        
 #if SAMPLE_ORIGIN_OBJECTS
 #if PVS_ADD_DIRTY
-                viewCell->GetPvs().AddSampleDirtyCheck(originObj, ray.mPdf);
+        viewCell->GetPvs().AddSampleDirtyCheck(originObj, ray.mPdf);
 #else
-                viewCell->GetPvs().AddSample(originObj, ray.mPdf);
+        viewCell->GetPvs().AddSample(originObj, ray.mPdf);
 #endif
 #endif
-                if (viewCell->GetPvs().RequiresResort())
-                {
-                        viewCell->GetPvs().Sort();                      
-                }
-        }
-
-        return ABS_CONTRIBUTION_WEIGHT*ray.mPvsContribution +
-                (1.0f - ABS_CONTRIBUTION_WEIGHT)*ray.mRelativePvsContribution;
+        if (viewCell->GetPvs().RequiresResort()) {
+          viewCell->GetPvs().Sort();                    
+        }
+  }
+  
+  return ABS_CONTRIBUTION_WEIGHT*ray.mPvsContribution +
+        (1.0f - ABS_CONTRIBUTION_WEIGHT)*ray.mRelativePvsContribution;
 }