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

Timestamp:

11/09/06 19:41:31 (18 years ago)

Author:

bittner

Message:

visibility filter updates

File:

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

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

@@ -261 +261 @@
 
 
+void
+ViewCellsManager::CollectObjects(const AxisAlignedBox3 &box, ObjectContainer &objects)
+{
+  GetPreprocessor()->mKdTree->CollectObjects(box, objects);
+}
 
 AxisAlignedBox3 ViewCellsManager::GetViewCellBox(ViewCell *vc)
@@ -1731 +1736 @@
 void ViewCellsManager::UpdatePvs()
 {
-        if (mViewCellPvsIsUpdated || !ViewCellsTreeConstructed())
-                return;
-
-        mViewCellPvsIsUpdated = true;
-
-        ViewCellContainer leaves;
-        mViewCellsTree->CollectLeaves(mViewCellsTree->GetRoot(), leaves);
-
-        ViewCellContainer::const_iterator it, it_end = leaves.end();
-
-        for (it = leaves.begin(); it != it_end; ++ it)
-        {
-                mViewCellsTree->PropagatePvs(*it);
+  if (mViewCellPvsIsUpdated || !ViewCellsTreeConstructed())
+        return;
+  
+  mViewCellPvsIsUpdated = true;
+  
+  ViewCellContainer leaves;
+  mViewCellsTree->CollectLeaves(mViewCellsTree->GetRoot(), leaves);
+  
+  ViewCellContainer::const_iterator it, it_end = leaves.end();
+  
+  for (it = leaves.begin(); it != it_end; ++ it)
+        {
+          mViewCellsTree->PropagatePvs(*it);
         }
 }
@@ -1750 +1755 @@
 void ViewCellsManager::GetPvsStatistics(PvsStatistics &stat)
 {
-        // update pvs of view cells tree if necessary
-        UpdatePvs();
-
-        ViewCellContainer::const_iterator it = mViewCells.begin();
-
-        stat.viewcells = 0;
-        stat.minPvs = 100000000;
-        stat.maxPvs = 0;
-        stat.avgPvs = 0.0f;
-
-        for (; it != mViewCells.end(); ++ it) 
-        {
-                ViewCell *viewcell = *it;
-
-                const float pvsCost = mViewCellsTree->GetPvsCost(viewcell);
-
-                if (pvsCost < stat.minPvs)
-                        stat.minPvs = pvsCost;
-                if (pvsCost > stat.maxPvs)
-                        stat.maxPvs = pvsCost;
-
-                stat.avgPvs += pvsCost;
-
-                ++ stat.viewcells;
-        }
-
-        if (stat.viewcells)
-                stat.avgPvs/=stat.viewcells;
+  // update pvs of view cells tree if necessary
+  UpdatePvs();
+  
+  ViewCellContainer::const_iterator it = mViewCells.begin();
+  
+  stat.viewcells = 0;
+  stat.minPvs = 100000000;
+  stat.maxPvs = 0;
+  stat.avgPvs = 0.0f;
+  stat.avgFilteredPvs = 0.0f;
+  stat.avgFilterContribution = 0.0f;
+  
+  for (; it != mViewCells.end(); ++ it) 
+        {
+          ViewCell *viewcell = *it;
+          
+          const float pvsCost = mViewCellsTree->GetPvsCost(viewcell);
+          
+          if (pvsCost < stat.minPvs)
+                stat.minPvs = pvsCost;
+          if (pvsCost > stat.maxPvs)
+                stat.maxPvs = pvsCost;
+          
+          stat.avgPvs += pvsCost;
+
+          if (0) {
+                ObjectPvs filteredPvs = viewcell->GetPvs();
+                ApplyFilter2(viewcell, false, 1.0f, filteredPvs);
+                float filteredCost = filteredPvs.EvalPvsCost();
+                stat.avgFilteredPvs += filteredCost;
+                stat.avgFilterContribution += filteredCost - pvsCost;
+          }
+          
+          ++ stat.viewcells;
+        }
+  
+  if (stat.viewcells) {
+        stat.avgPvs/=stat.viewcells;
+        stat.avgFilteredPvs/=stat.viewcells;
+        stat.avgFilterContribution/=stat.viewcells;
+  }
 }
 
@@ -1787 +1805 @@
   GetPvsStatistics(pvsStat);
   s<<"#AVG_PVS\n"<<pvsStat.avgPvs<<endl;
+  s<<"#AVG_FILTERED_PVS\n"<<pvsStat.avgFilteredPvs<<endl;
+  s<<"#AVG_FILTER_CONTRIBUTION\n"<<pvsStat.avgFilterContribution<<endl;
   s<<"#MAX_PVS\n"<<pvsStat.maxPvs<<endl;
   s<<"#MIN_PVS\n"<<pvsStat.minPvs<<endl;
@@ -2497 +2517 @@
 void
 ViewCellsManager::ApplyFilter2(ViewCell *viewCell,
-                                                           KdTree *kdTree,
+                                                           const bool useViewSpaceFilter,
                                                            const float filterSize,
                                                            ObjectPvs &pvs
                                                            )
 {
-  Vector3 center = viewCell->GetBox().Center();
+  AxisAlignedBox3 vbox = GetViewCellBox(viewCell);
+  Vector3 center = vbox.Center();
   // first determine the average size of the filter
-
-
 
   Intersectable::NewMail();
@@ -2518 +2537 @@
   int pvsSize = 0;
   int nPvsSize = 0;
-  int samples = pvs.mSamples;
-
-  
+  float samples = pvs.mSamples;
+  cout<<"Samples = "<<samples<<endl;
+  //  cout<<"Filter size = "<<filterSize<<endl;
+  //  cout<<"vbox = "<<vbox<<endl;
+  //  cout<<"center = "<<center<<endl;
+
+
+#define MIN_LOCAL_SAMPLES 5
+
+  // compute the average filter radius
+  float globalC = 2.0f*filterSize/sqrt(samples);
+
+  float sumRadius = 0.0f;
   for (oi = pvs.mEntries.begin(); oi != pvs.mEntries.end(); ++oi, pvsSize++) {
         Intersectable *object = (*oi).first;
         // compute filter size based on the distance and the numebr of samples
-        float distance = Distance(center, object->GetBox().Center());
-
+        AxisAlignedBox3 box = object->GetBox();
+
+        float distance = Distance(center, box.Center());
+        float globalRadius = distance*globalC;
+
+        int objectSamples = (int)(*oi).second.mSumPdf;
+        float localRadius = MAX_FLOAT;
+        
+        if (objectSamples > MIN_LOCAL_SAMPLES)
+          localRadius = 0.5f*Magnitude(box.Diagonal())/sqrt((float)objectSamples);
+        
         // now compute the filter size
-        float radius = distance*(filterSize/(4*samples));
+        float radius = Min(localRadius, globalRadius);
+        
+        sumRadius +=radius;
+  }
+  
+  float avgRadius = sumRadius/pvsSize;
+  float viewCellRadius = 0.5f*Magnitude(vbox.Diagonal());
+  cout<<"radius ratio = "<<avgRadius/viewCellRadius<<endl;
+  
+  // now compute the filter box around the current viewCell
+
+  if (useViewSpaceFilter) {
+        //      float radius = Max(viewCellRadius/100.0f, avgRadius - viewCellRadius);
+        float radius = viewCellRadius/100.0f;
+        vbox.Enlarge(radius);
+        cout<<"vbox = "<<vbox<<endl;
+        ViewCellContainer viewCells;
+        ComputeBoxIntersections(vbox, 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)
+          if ((*it) != viewCell) {
+                //cout<<"v"<<i<<" pvs="<<(*it)->GetPvs().mEntries.size()<<endl;
+                pvs.Merge((*it)->GetPvs());
+          }
+
+        // update samples and globalC
+        samples = pvs.mSamples;
+        globalC = 2.0f*filterSize/sqrt(samples);
+        cout<<"neighboring viewcells = "<<i-1<<endl;
+        cout<<"Samples' = "<<samples<<endl;
+  }
+  
+  for (oi = pvs.mEntries.begin(); oi != pvs.mEntries.end(); ++oi) {
+        Intersectable *object = (*oi).first;
+        // compute filter size based on the distance and the numebr of samples
         AxisAlignedBox3 box = object->GetBox();
+
+        float distance = Distance(center, box.Center());
+        float globalRadius = distance*globalC;
+
+        
+        int objectSamples = (int)(*oi).second.mSumPdf;
+        float localRadius = MAX_FLOAT;
+        if (objectSamples > MIN_LOCAL_SAMPLES)
+          localRadius = filterSize*0.5f*Magnitude(box.Diagonal())/sqrt((float)objectSamples);
+        
+        //      cout<<"lr="<<localRadius<<" gr="<<globalRadius<<endl;
+        
+        // now compute the filter size
+        float radius = Min(localRadius, globalRadius);
+
+        // cout<<"box = "<<box<<endl;
+        //      cout<<"distance = "<<distance<<endl;
+        //      cout<<"radiues = "<<radius<<endl;
+        
         box.Enlarge(Vector3(radius));
 
         ObjectContainer objects;
         // $$ warning collect objects takes only unmailed ones!
-        // should use VspOsp!!
-        kdTree->CollectObjects(box, objects);
+        CollectObjects(box, objects);
         //      cout<<"collected objects="<<objects.size()<<endl;
         ObjectContainer::const_iterator noi = objects.begin();
@@ -2544 +2638 @@
         }
   }
-  //  cout<<"nPvs size = "<<nPvsSize<<endl;
+  cout<<"nPvs size = "<<nPvsSize<<endl;
   pvs.Merge(nPvs);
+  Intersectable::NewMail();
 }
   
@@ -5724 +5819 @@
 }
 
+void
+VspOspViewCellsManager::CollectObjects(const AxisAlignedBox3 &box, ObjectContainer &objects)
+{
+  mHierarchyManager->CollectObjects(box, objects);
+}
+
 
 #if 1