Changeset 1902 for GTP/trunk/Lib/Vis/Preprocessing

Timestamp:

12/16/06 14:51:13 (18 years ago)

Author:

mattausch

Message:

added kd pvs as option to view cells manager to avoid errors when updating the svn from jiri

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (2 diffs)
• ViewCellsManager.cpp (modified) (8 diffs)
• ViewCellsManager.h (modified) (2 diffs)

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

@@ -1549 +1549 @@
                 "false");
 
+        RegisterOption("ViewCells.useKdPvs",
+                optBool, 
+                "view_cells_use_kd_pvs=", 
+                "false");
+
+
 
         /****************************************************************************/
@@ -1999 +2005 @@
 
         RegisterOption("VspBspTree.useSplitCostQueue",
-                optBool,
-                "vsp_bsp_use_split_cost_queue=",
-                "true");
+                                        optBool,
+                                        "vsp_bsp_use_split_cost_queue=",
+                                        "true");
 
         RegisterOption("VspBspTree.Termination.globalCostMissTolerance",

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

@@ -27 +27 @@
 
 // $$JB HACK
-#define USE_KD_PVS 1
-
 #define KD_PVS_AREA (1e-5f)
 
@@ -111 +109 @@
         Environment::GetSingleton()->GetBoolValue("ViewCells.exportBboxesForPvs", mExportBboxesForPvs);
         Environment::GetSingleton()->GetBoolValue("ViewCells.exportPvs", mExportPvs);
-        
+
+        Environment::GetSingleton()->GetBoolValue("ViewCells.useKdPvs", mUseKdPvs);
+
         char buf[100];
         Environment::GetSingleton()->GetStringValue("ViewCells.samplingType", buf);
@@ -260 +260 @@
         Debug << "export bounding boxes: " << mExportBboxesForPvs << endl;
         Debug << "export pvs for view cells: " << mExportPvs << endl;
+        Debug << "use kd pvs " << mUseKdPvs << endl;
         Debug << endl;
 }
@@ -282 +283 @@
 ViewCellsManager::GetIntersectable(const VssRay &ray, const bool isTermination) const
 {
-#if USE_KD_PVS
-  float area = GetPreprocessor()->mKdTree->GetBox().SurfaceArea()*KD_PVS_AREA;
-  KdNode *node = GetPreprocessor()->mKdTree->GetNode(isTermination ?
-                                                                                                         ray.mTermination : ray.mOrigin,
-                                                                                                         area);
-  return 
-        GetPreprocessor()->mKdTree->
-        GetOrCreateKdIntersectable(node);
-#else
-  return isTermination ? ray.mTerminationObject : ray.mOriginObject;
-#endif
-}
+        if (mUseKdPvs)
+        {
+                float area = GetPreprocessor()->mKdTree->GetBox().SurfaceArea()*KD_PVS_AREA;
+                KdNode *node = GetPreprocessor()->mKdTree->GetNode(isTermination ?
+                                                                                                                 ray.mTermination : ray.mOrigin,
+                                                                                                                 area);
+        return GetPreprocessor()->mKdTree->GetOrCreateKdIntersectable(node);
+        }
+        else
+        {
+                return isTermination ? ray.mTerminationObject : ray.mOriginObject;
+        }
+}
+
 
 void
@@ -785 +788 @@
                 //-- export bounding boxes
                 stream << "<BoundingBoxes>" << endl;
-#if USE_KD_PVS 
-                vector<KdIntersectable *>::iterator kit, kit_end = GetPreprocessor()->mKdTree->mKdIntersectables.end();
-
-                int id = 0;
-                for (kit = GetPreprocessor()->mKdTree->mKdIntersectables.begin(); kit != kit_end; ++ kit, ++ id)
-                {
-                  Intersectable *obj = *kit;
-                  const AxisAlignedBox3 box = obj->GetBox();
+
+                if (mUseKdPvs)
+                {
+                        vector<KdIntersectable *>::iterator kit, kit_end = GetPreprocessor()->mKdTree->mKdIntersectables.end();
+
+                        int id = 0;
+                        for (kit = GetPreprocessor()->mKdTree->mKdIntersectables.begin(); kit != kit_end; ++ kit, ++ id)
+                        {
+                                Intersectable *obj = *kit;
+                                const AxisAlignedBox3 box = obj->GetBox();
                   
-                  obj->SetId(id);
-                  
-                  stream << "<BoundingBox" << " id=\"" << id << "\""
-                                 << " min=\"" << box.Min().x << " " << box.Min().y << " " << box.Min().z << "\""
-                                 << " max=\"" << box.Max().x << " " << box.Max().y << " " << box.Max().z << "\" />" << endl;
-                }
-#else
-                ObjectContainer::const_iterator oit, oit_end = objects.end();
+                                obj->SetId(id);
+        
+                                stream << "<BoundingBox" << " id=\"" << id << "\""
+                                           << " min=\"" << box.Min().x << " " << box.Min().y << " " << box.Min().z << "\""
+                                           << " max=\"" << box.Max().x << " " << box.Max().y << " " << box.Max().z << "\" />" << endl;
+                        }
+                }
+                else
+                {
+                        ObjectContainer::const_iterator oit, oit_end = objects.end();
                 
-                for (oit = objects.begin(); oit != oit_end; ++ oit)
-                {
-                        const AxisAlignedBox3 box = (*oit)->GetBox();
-
-                        ////////////
-                        //-- the bounding boxes
-                        stream << "<BoundingBox" << " id=\"" << (*oit)->GetId() << "\""
-                                   << " min=\"" << box.Min().x << " " << box.Min().y << " " << box.Min().z << "\""
-                                   << " max=\"" << box.Max().x << " " << box.Max().y << " " << box.Max().z << "\" />" << endl;
-                }
-#endif
+                        for (oit = objects.begin(); oit != oit_end; ++ oit)
+                        {
+                                const AxisAlignedBox3 box = (*oit)->GetBox();
+
+                                ////////////
+                                //-- the bounding boxes
+
+                                stream << "<BoundingBox" << " id=\"" << (*oit)->GetId() << "\""
+                                           << " min=\"" << box.Min().x << " " << box.Min().y << " " << box.Min().z << "\""
+                                           << " max=\"" << box.Max().x << " " << box.Max().y << " " << box.Max().z << "\" />" << endl;
+                        }
+                }
+
                 stream << "</BoundingBoxes>" << endl;
         }
@@ -2637 +2646 @@
   pvs.Reserve(viewCell->GetFilteredPvsSize());
 
-#if !USE_KD_PVS
-  // first mark all objects from this pvs
-  while (pit.HasMoreEntries()) {                
-        ObjectPvsEntry entry = pit.Next();
-        
-        Intersectable *object = entry.mObject;
-        object->Mail();
+  if (!mUseKdPvs)
+  {
+          // first mark all objects from this pvs
+          while (pit.HasMoreEntries())  
+          {
+                  ObjectPvsEntry entry = pit.Next();
+                  Intersectable *object = entry.mObject;
+                  object->Mail();
+          }
   }
-#endif
   
   int pvsSize = 0;
@@ -2770 +2780 @@
   Debug<<" nPvs size = "<<pvs.GetSize()<<endl;
   
-#if !USE_KD_PVS
-  // copy the base pvs to the new pvs
-  pit = basePvs.GetIterator();
-  while (pit.HasMoreEntries()) {                
-        ObjectPvsEntry entry = pit.Next();
-        pvs.AddSampleDirty(entry.mObject, entry.mData.mSumPdf);
+  if (!mUseKdPvs)
+  {
+          // copy the base pvs to the new pvs
+          pit = basePvs.GetIterator();
+          while (pit.HasMoreEntries()) 
+          {             
+                  ObjectPvsEntry entry = pit.Next();
+                  pvs.AddSampleDirty(entry.mObject, entry.mData.mSumPdf);
+          }
   }
-#endif
   
   pvs.SimpleSort();
@@ -5150 +5162 @@
 VspOspViewCellsManager::GetIntersectable(const VssRay &ray, const bool isTermination) const
 {
-#if USE_KD_PVS
-  return ViewCellsManager::GetIntersectable(ray, isTermination);
-#else
-  return mHierarchyManager->GetIntersectable(ray, isTermination);
-#endif
+        if (mUseKdPvs)
+        {
+                return ViewCellsManager::GetIntersectable(ray, isTermination);
+        }
+        else
+        {
+                return mHierarchyManager->GetIntersectable(ray, isTermination);
+        }
 }
 

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

@@ -684 +684 @@
 
         Preprocessor *mPreprocessor;
+        
         /// if bounding boxes should be exported together with the view cells
         bool mExportBboxesForPvs;
+        
         /// the clip plane for visualization
         AxisAlignedPlane mClipPlaneForViz;
+        
         /// if the visualization is using the clip plane
         bool mUseClipPlaneForViz;
+        
         /// Renders the view cells.
         Renderer *mRenderer;
+        
         /// Loaded view cells
         ViewCellContainer mViewCells;
+        
         /// the view cell hierarchy (i.e., the logical description of view cells)
         ViewCellsTree *mViewCellsTree;
@@ -748 +754 @@
         // only for debugging
         VssRayContainer storedRays;
+
+        bool mUseKdPvs;
 
         //////////////////