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

Timestamp:

11/23/06 21:38:45 (18 years ago)

Author:

bittner

Message:

merge, filter update, renderebuffer made functional

File:

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

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

@@ -26 +26 @@
 
 
-#define ABS_CONTRIBUTION_WEIGHT 1.0f
 
 // warning: Should not count origin object for sampling 
@@ -33 +32 @@
 
 // $$JB HACK
-#define USE_KD_PVS 0
+#define USE_KD_PVS 1
 #define KD_PVS_AREA (1e-5f)
 
@@ -1826 +1825 @@
                 
                 stat.avgPvs += pvsCost;
-                
-                const bool evaluateFilter = true;
+
+                bool evaluateFilter;
+                Environment::GetSingleton()->GetBoolValue("Preprocessor.evaluateFilter", evaluateFilter);
+                
                 
                 if (evaluateFilter) {
                   ObjectPvs filteredPvs = viewcell->GetPvs();
-                  PvsFilterStatistics fstat = ApplyFilter2(viewcell, false, 1.0f, filteredPvs);
+                  PvsFilterStatistics fstat = ApplyFilter2(viewcell, false,
+                                                                                                   1.0f, filteredPvs);
                   
                   float filteredCost = filteredPvs.EvalPvsCost();
@@ -2032 +2034 @@
         ViewCell::NewMail();
 
+        //      if (ray.mPdf!=1.0f)
+        //        cout<<ray.mPdf<<" ";
+        
+        
         // traverse the view space subdivision
         CastLineSegment(origin, termination, viewcells);
@@ -5852 +5858 @@
         //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;
@@ -5867 +5877 @@
         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;
         }
 
@@ -5877 +5887 @@
         Intersectable *originObj = GetIntersectable(ray, false);
           
-        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
-                                if (viewcell->GetPvs().GetSampleContribution(
-                                                terminationObj, ray.mPdf, contribution))
+                          // todo: maybe not correct for kd node pvs
+                          if (viewcell->GetPvs().GetSampleContribution(
+                                                                                                                   terminationObj, ray.mPdf, contribution))
                                 {
-                                        ++ ray.mPvsContribution;
+                                  ++ ray.mPvsContribution;
                                 }
-
-                                ray.mRelativePvsContribution += contribution;
+                          
+                          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))
-                          {
-                                ++ ray.mPvsContribution;
-                                ray.mRelativePvsContribution += contribution;
-                          }
+                  
+                  if (originObj && 
+                          viewcell->GetPvs().GetSampleContribution(originObj,
+                                                                                                           ray.mPdf,
+                                                                                                           contribution))
+                        {
+                          ++ ray.mPvsContribution;
+                          ray.mRelativePvsContribution += contribution;
+                        }
 #endif
                 }
         }
-
+        
         if (!addRays)
         {