Changeset 904 for GTP/trunk/Lib

Timestamp:

05/05/06 11:09:03 (19 years ago)

Author:

bittner

Message:

visibility filter updates

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (1 diff)
• GlRenderer.cpp (modified) (3 diffs)
• KdTree.cpp (modified) (1 diff)
• Preprocessor.cpp (modified) (2 diffs)
• Preprocessor.h (modified) (1 diff)
• ViewCellsManager.cpp (modified) (4 diffs)
• ViewCellsManager.h (modified) (2 diffs)
• default.env (modified) (4 diffs)

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

@@ -1687 +1687 @@
                                    "preprocessor_apply_filter",
                                    "true");
+        
+        RegisterOption("Preprocessor.applyVisibilitySpatialFilter",
+                                   optBool,
+                                   "preprocessor_apply_spatial_filter",
+                                   "true");
 
         RegisterOption("Preprocessor.visibilityFilterWidth",

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

@@ -725 +725 @@
   PrVs prvs;
   //  mViewCellsManager->SetMaxFilterSize(1);
-  mViewCellsManager->GetPrVS(mViewPoint, prvs);
+  mViewCellsManager->GetPrVS(mViewPoint, prvs, mViewCellsManager->GetFilterWidth());
   viewcell = prvs.mViewCell;
   
@@ -851 +851 @@
   } else {
         //  mViewCellsManager->SetMaxFilterSize(1);
-        mViewCellsManager->GetPrVS(mViewPoint, prvs);
+        mViewCellsManager->GetPrVS(mViewPoint, prvs, mViewCellsManager->GetFilterWidth());
         viewcell = prvs.mViewCell;
   }
@@ -863 +863 @@
                                                                                         mSpatialFilterSize*
                                                                                         Magnitude(mViewCellsManager->GetViewSpaceBox().Size()),
-                                                                                        //                                                                                      mViewCellsManager->GetFilterWidth()/2,
                                                                                         pvs);
         }

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

@@ -746 +746 @@
       for (int j=0; j < leaf->mObjects.size(); j++) {
                 Intersectable *object = leaf->mObjects[j];
-                if (!object->Mailed()) {
+                if (!object->Mailed() && Overlap(box, object->GetBox())) {
                   object->Mail();
                   objects.push_back(object);

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

@@ -133 +133 @@
         mVisibilityFileName = buffer;
         environment->GetBoolValue("Preprocessor.applyVisibilityFilter", mApplyVisibilityFilter );
+        environment->GetBoolValue("Preprocessor.applyVisibilitySpatialFilter",
+                                                          mApplyVisibilitySpatialFilter );
         environment->GetFloatValue("Preprocessor.visibilityFilterWidth", mVisibilityFilterWidth);
 
@@ -273 +275 @@
 {
   
-  if (mApplyVisibilityFilter) {
+  if (mApplyVisibilityFilter || mApplyVisibilitySpatialFilter) {
         cout<<"Applying visibility filter...";
         cout<<"filyter width = "<<mVisibilityFilterWidth<<endl;
-
+        
         mViewCellsManager->ApplyFilter(mKdTree,
-                                                                   mVisibilityFilterWidth,
-                                                                   mVisibilityFilterWidth);
+                                                                   mApplyVisibilityFilter ? mVisibilityFilterWidth : -1.0f,
+                                                                   mApplyVisibilitySpatialFilter ? mVisibilityFilterWidth : -1.0f);
         cout<<"done.";
   }

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

@@ -171 +171 @@
   
   bool mApplyVisibilityFilter;
+  bool mApplyVisibilitySpatialFilter;
 
   float mVisibilityFilterWidth;

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

@@ -1082 +1082 @@
 
 
-void ViewCellsManager::GetPrVS(const Vector3 &viewPoint, PrVs &prvs)
-{
-  const AxisAlignedBox3 box = GetFilterBBox(viewPoint, mFilterWidth);
+void ViewCellsManager::GetPrVS(const Vector3 &viewPoint,
+                                                           PrVs &prvs,
+                                                           const float filterWidth)
+{
+  const AxisAlignedBox3 box = GetFilterBBox(viewPoint, filterWidth);
         
   ViewCell *currentViewCell = GetViewCell(viewPoint);
@@ -4917 +4919 @@
   //  AxisAlignedBox3 box(center - Vector3(viewSpaceFilterSize/2),
   //                                      center + Vector3(viewSpaceFilterSize/2));
+
+  if (viewSpaceFilterSize >=0.0f) {
+
+  bool usePrVS = false;
+
   
-  AxisAlignedBox3 box = GetViewCellBox(viewCell);
-  box.Enlarge(Vector3(viewSpaceFilterSize/2));
+  if (!usePrVS) {
+        AxisAlignedBox3 box = GetViewCellBox(viewCell);
+        box.Enlarge(Vector3(viewSpaceFilterSize/2));
+        
+        ViewCellContainer viewCells;
+        ComputeBoxIntersections(box, viewCells);
+        
+  //  cout<<"box="<<box<<endl;
+        ViewCellContainer::const_iterator it=viewCells.begin(), it_end = viewCells.end();
+        
+        int i;
+        for (i=0; it != it_end; ++it, i++) {
+          //    cout<<"v"<<i<<" pvs="<<(*it)->GetPvs().mEntries.size()<<endl;
+          pvs.Merge((*it)->GetPvs());
+        }
+  } else {
+        PrVs prvs;
+        AxisAlignedBox3 box = GetViewCellBox(viewCell);
+
+        //  mViewCellsManager->SetMaxFilterSize(1);
+        GetPrVS(box.Center(), prvs, viewSpaceFilterSize);
+        pvs = prvs.mViewCell->GetPvs();
+        DeleteLocalMergeTree(prvs.mViewCell);
+  }
+  } else
+        pvs = viewCell->GetPvs();
   
-  ViewCellContainer viewCells;
-  ComputeBoxIntersections(box, viewCells);
-
-  //  cout<<"box="<<box<<endl;
-  ViewCellContainer::const_iterator it=viewCells.begin(), it_end = viewCells.end();
-  
-  int i;
-  for (i=0; it != it_end; ++it, i++) {
-        //      cout<<"v"<<i<<" pvs="<<(*it)->GetPvs().mEntries.size()<<endl;
-        pvs.Merge((*it)->GetPvs());
-  }
-  
-  ApplySpatialFilter(kdTree, spatialFilterSize, pvs);
+  if (spatialFilterSize >=0.0f)
+        ApplySpatialFilter(kdTree, spatialFilterSize, pvs);
+
 }
 
@@ -4968 +4989 @@
         pvs.Clear();
         pvs = newPvs[i];
+        newPvs[i].Clear();
   }
   
+  delete newPvs;
 }
 
@@ -4989 +5012 @@
         const AxisAlignedBox3 tbox = GetFilterBBox(viewPoint, mFilterWidth);
 
-                GetPrVS(viewPoint, testPrVs);
+                GetPrVS(viewPoint, testPrVs, GetFilterWidth());
 
                 exporter->SetWireframe();

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

@@ -233 +233 @@
         virtual void GetPvsStatistics(PvsStatistics &stat);
 
-        virtual void GetPrVS(const Vector3 &viewPoint, PrVs &prvs);
+        virtual void GetPrVS(const Vector3 &viewPoint, PrVs &prvs, const float filterWidth);
   
         /** Get a viewcell containing the specified point 
@@ -455 +455 @@
 
   float GetFilterWidth() {
+        return mFilterWidth;
+  }
+
+  float GetAbsFilterWidth() {
         return Magnitude(mViewSpaceBox.Size())*mFilterWidth;
   }
-  
+
 protected:
     void

GTP/trunk/Lib/Vis/Preprocessing/src/default.env

@@ -9 +9 @@
 #       filename vienna.x3d
 # filename ../data/vienna/vienna-simple.x3d
-filename ../data/vienna/vienna-buildings.x3d
+#filename ../data/vienna/vienna-buildings.x3d
 #filename ../data/vienna/city1500_flat_1.x3d
 #filename ../data/vienna/vienna-buildings.x3d;../data/vienna/vienna-roofs.x3d;../data/vienna/vienna-plane.x3d;../data/vienna/vienna-roads.x3d
@@ -15 +15 @@
 #filename ../data/atlanta/atlanta2.x3d
 #filename ../data/soda/soda.dat
-#filename ../data/soda/soda5.dat
+filename ../data/soda/soda5.dat
 #filename ../data/PowerPlant/ppsection1/part_a/g0.ply
 #filename ../data/PowerPlant/ppsection1/part_b/g0.ply
@@ -40 +40 @@
         quitOnFinish false
         computeVisibility true
-        applyVisibilityFilter   true
+        applyVisibilityFilter   false
+        applyVisibilitySpatialFilter    true
         visibilityFilterWidth   0.01
         visibilityFile visibility.xml
@@ -279 +280 @@
 #       filename ../data/soda/soda5-viewcells.xml
 #       filename ../scripts/viewcells_atlanta.xml
-#       filename ../data/soda/soda5-viewcells2.xml
+        filename ../data/soda/soda5-viewcells2.xml
 #       filename ../data/atlanta/viewcells_atlanta3.xml
-        filename ../data/vienna/viewcells_vienna.xml
+#       filename ../data/vienna/viewcells_vienna.xml
 #       filename ../data/vienna/viewcells_vienna2.xml
 #       filename ../data/vienna/vienna_simple-21-04-avs2-viewCells.xml