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

Timestamp:

10/10/06 00:59:59 (18 years ago)

Author:

bittner

Message:

support for kd tree based pvs

File:

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

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

@@ -29 +29 @@
 #define SAMPLE_ORIGIN_OBJECTS 0
 
+// $$JB HACK
+#define USE_KD_PVS 1
+#define KD_PVS_AREA 1e-3f
 
 namespace GtpVisibilityPreprocessor {
@@ -1183 +1186 @@
                                                            const float filterWidth)
 {
-        ViewCell *currentViewCell = GetViewCell(viewPoint);
-
-        if (mMaxFilterSize < 1) {
-                prvs.mViewCell = currentViewCell;
-                return;
-        }
-
-        const AxisAlignedBox3 box = GetFilterBBox(viewPoint, filterWidth);
-
-        if (currentViewCell) 
-        {
-                ViewCellContainer viewCells;
-                ComputeBoxIntersections(box, viewCells);
-
-                ViewCell *root = ConstructLocalMergeTree2(currentViewCell, viewCells);
-                prvs.mViewCell = root;
-
+  ViewCell *currentViewCell = GetViewCell(viewPoint);
+
+  if (mMaxFilterSize < 1) {
+        prvs.mViewCell = currentViewCell;
+        return;
+  }
+  
+  const AxisAlignedBox3 box = GetFilterBBox(viewPoint, filterWidth);
+  
+  if (currentViewCell) 
+        {
+          ViewCellContainer viewCells;
+          ComputeBoxIntersections(box, viewCells);
+          
+          ViewCell *root = ConstructLocalMergeTree2(currentViewCell, viewCells);
+          prvs.mViewCell = root;
+          
         } 
-        else
-        {
-                prvs.mViewCell = NULL;
-                //prvs.mPvs = root->GetPvs();
+  else
+        {
+          prvs.mViewCell = NULL;
+          //prvs.mPvs = root->GetPvs();
         }
 }
@@ -1808 +1811 @@
   ViewCellContainer *viewcells = &ray.mViewCells;
   ViewCellContainer::const_iterator it;
+
+  if (!ray.mTerminationObject)
+        return;
+  
+#if USE_KD_PVS
+  float area = GetPreprocessor()->mKdTree->GetBox().SurfaceArea()*KD_PVS_AREA;
+  KdNode *node = GetPreprocessor()->mKdTree->GetNode(ray.mTermination, area);
+  Intersectable *obj =
+        GetPreprocessor()->mKdTree->
+        GetOrCreateKdIntersectable(node);
+#else
+  Intersectable *obj = ray.mTerminationObject;
+#endif
+  
   for (it = viewcells->begin(); it != viewcells->end(); ++it) {
         ViewCell *viewcell = *it;
         if (viewcell->GetValid()) {
           // if ray not outside of view space
-          viewcell->GetPvs().AddSample(ray.mTerminationObject, ray.mPdf);
+          viewcell->GetPvs().AddSample(obj, ray.mPdf);
         }
   }
@@ -1851 +1868 @@
         }
 
+#if USE_KD_PVS
+        float area = GetPreprocessor()->mKdTree->GetBox().SurfaceArea()*KD_PVS_AREA;
+        KdNode *node = GetPreprocessor()->mKdTree->GetNode(ray.mTermination, area);
+        Intersectable *obj =
+          GetPreprocessor()->mKdTree->
+          GetOrCreateKdIntersectable(node);
+#else
+        Intersectable *obj = ray.mTerminationObject;
+#endif
+        
+        
         ViewCellContainer::const_iterator it = viewcells.begin();
-
+        
         for (; it != viewcells.end(); ++ it) 
         {
@@ -1862 +1890 @@
 
                         if (ray.mTerminationObject) 
-                        {                       
-                                if (viewcell->GetPvs().GetSampleContribution(
-                                                        ray.mTerminationObject,
-                                                        ray.mPdf,
-                                                        contribution))
+                          {                     
+                                
+
+                          if (viewcell->GetPvs().GetSampleContribution(obj,
+                                                                                                                   ray.mPdf,
+                                                                                                                   contribution))
                                 {
-                                        ++ ray.mPvsContribution;
-                                        ray.mRelativePvsContribution += contribution;
+                                  ++ ray.mPvsContribution;
+                                  ray.mRelativePvsContribution += contribution;
                                 }
                         }
@@ -1903 +1932 @@
                                 if (ray.mTerminationObject)
                                 {
-                                        viewcell->GetPvs().AddSample(ray.mTerminationObject, ray.mPdf);
+                                        viewcell->GetPvs().AddSample(obj, ray.mPdf);
                                 }                               
 #if SAMPLE_ORIGIN_OBJECTS
@@ -2330 +2359 @@
   // now compute a new Pvs by including also objects intersecting the 
   // extended boxes of visible objects
-
   Intersectable::NewMail();
   
@@ -5510 +5538 @@
                         if (ray.mTerminationObject) 
                         {
-                                // todo: maybe not correct for kd node pvs
-                                Intersectable *obj = mHierarchyManager->GetIntersectable(ray, true);
-                                if (viewcell->GetPvs().GetSampleContribution(obj,
-                                                                                                                         ray.mPdf, 
-                                                                                                                         contribution))
+                          // todo: maybe not correct for kd node pvs
+                          Intersectable *obj = mHierarchyManager->GetIntersectable(ray, true);
+                          
+                          if (viewcell->GetPvs().GetSampleContribution(obj,
+                                                                                                                   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!