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

Timestamp:

11/16/06 15:41:44 (18 years ago)

Author:

bittner

Message:

filter updates, kd + bvh PVS coexistence

File:

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

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

@@ -32 +32 @@
 
 // $$JB HACK
-#define USE_KD_PVS 0
-#define KD_PVS_AREA (5*1e-4f)
+#define USE_KD_PVS 1
+#define KD_PVS_AREA (1e-4f)
 
 
@@ -87 +87 @@
 {
         // visualization stuff
-        Environment::GetSingleton()->GetBoolValue("ViewCells.Visualization.exportRays", mExportRays);
+        Environment::GetSingleton()->GetBoolValue("ViewCells.Visualization.exportRays", mExportRays);
         Environment::GetSingleton()->GetBoolValue("ViewCells.Visualization.exportGeometry", mExportGeometry);
         Environment::GetSingleton()->GetFloatValue("ViewCells.maxPvsRatio", mMaxPvsRatio);
@@ -317 +317 @@
 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
 }
 
@@ -794 +804 @@
                 stream << "<BoundingBoxes>" << endl;
 #if USE_KD_PVS 
-        KdIntersectableMap::const_iterator kit, kit_end = GetPreprocessor()->mKdTree->mKdIntersectables.end();
+                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).second;
-                        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;
+                  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();
-
+                ObjectContainer::const_iterator oit, oit_end = objects.end();
+                
                 for (oit = objects.begin(); oit != oit_end; ++ oit)
                 {
@@ -955 +965 @@
                                                                           float &contribution) const
 {
-        if (!obj) return false;
-
+        if (!obj)
+          return false;
+        
         // potentially visible objects
         return vc->AddPvsSample(obj, pdf, contribution);
@@ -1401 +1412 @@
                                                                                 )
 {
-        sort(mViewCells.begin(), mViewCells.end(), ViewCell::SmallerPvs);
-
-        int start = (int)(mViewCells.size() * minValid);
-        int end = (int)(mViewCells.size() * maxValid);
-
-        for (int i = 0; i < (int)mViewCells.size(); ++ i)
-        {
-                mViewCells[i]->SetValid(i >= start && i <= end);
+  ObjectPvs dummyPvs;
+  // update pvs sizes
+  for (int i = 0; i < (int)mViewCells.size(); ++ i) {
+        UpdatePvsForEvaluation(mViewCells[i], dummyPvs);
+  }
+  
+  sort(mViewCells.begin(), mViewCells.end(), ViewCell::SmallerPvs);
+  
+  int start = (int)(mViewCells.size() * minValid);
+  int end = (int)(mViewCells.size() * maxValid);
+  
+  for (int i = 0; i < (int)mViewCells.size(); ++ i)
+        {
+          //      cout<<"pvs:"<<mViewCells[i]->GetCachedPvsCost()<<endl;
+          mViewCells[i]->SetValid(i >= start && i <= end);
         }
 }
@@ -1821 +1839 @@
   stat.avgFilteredPvs = 0.0f;
   stat.avgFilterContribution = 0.0f;
+  stat.avgFilterRadius = 0;
+  stat.avgFilterRatio = 0;
   
   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;
-
-          const bool evaluateFilter = true;
-          
-          if (evaluateFilter) {
-                ObjectPvs filteredPvs = viewcell->GetPvs();
-                ApplyFilter2(viewcell, false, 1.0f, filteredPvs);
-                float filteredCost = filteredPvs.EvalPvsCost();
-                stat.avgFilteredPvs += filteredCost;
-                stat.avgFilterContribution += filteredCost - pvsCost;
-          } else {
-                stat.avgFilteredPvs += pvsCost;
-                stat.avgFilterContribution += 0;
+          if (viewcell->GetValid()) {
+                const float pvsCost = mViewCellsTree->GetPvsCost(viewcell);
+                
+                if (pvsCost < stat.minPvs)
+                  stat.minPvs = pvsCost;
+                if (pvsCost > stat.maxPvs)
+                  stat.maxPvs = pvsCost;
+                
+                stat.avgPvs += pvsCost;
+                
+                const bool evaluateFilter = true;
+                
+                if (evaluateFilter) {
+                  ObjectPvs filteredPvs = viewcell->GetPvs();
+                  PvsFilterStatistics fstat = ApplyFilter2(viewcell, false, 1.0f, filteredPvs);
+                  
+                  float filteredCost = filteredPvs.EvalPvsCost();
+                  stat.avgFilteredPvs += filteredCost;
+                  stat.avgFilterContribution += filteredCost - pvsCost;
+
+                  stat.avgFilterRadius += fstat.mAvgFilterRadius;
+                  stat.avgFilterRatio += fstat.mLocalFilterCount / (float) fstat.mGlobalFilterCount;
+                  
+                  
+                } else {
+                  stat.avgFilteredPvs += pvsCost;
+                  stat.avgFilterContribution += 0;
+                }
+                
+                ++ stat.viewcells;
           }
-          
-          ++ stat.viewcells;
         }
   
@@ -1855 +1882 @@
         stat.avgFilteredPvs/=stat.viewcells;
         stat.avgFilterContribution/=stat.viewcells;
+        stat.avgFilterRadius/=stat.viewcells;
+        stat.avgFilterRatio/=stat.viewcells;
   }
 }
@@ -1867 +1896 @@
   s<<"#AVG_FILTERED_PVS\n"<<pvsStat.avgFilteredPvs<<endl;
   s<<"#AVG_FILTER_CONTRIBUTION\n"<<pvsStat.avgFilterContribution<<endl;
+  s<<"#AVG_FILTER_RADIUS\n"<<pvsStat.avgFilterRadius<<endl;
+  s<<"#AVG_FILTER_RATIO\n"<<pvsStat.avgFilterRatio<<endl;
   s<<"#MAX_PVS\n"<<pvsStat.maxPvs<<endl;
   s<<"#MIN_PVS\n"<<pvsStat.minPvs<<endl;
@@ -1985 +2016 @@
         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
+  Intersectable *obj = GetIntersectable(ray, true);
   
   for (it = viewcells->begin(); it != viewcells->end(); ++it) {
@@ -2037 +2060 @@
                 ray.mViewCells = viewcells;
         }
-
-#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
+        
+        Intersectable *obj = GetIntersectable(ray, true);
         
         
@@ -2590 +2605 @@
 
 
-void
+PvsFilterStatistics
 ViewCellsManager::ApplyFilter2(ViewCell *viewCell,
                                                            const bool useViewSpaceFilter,
@@ -2597 +2612 @@
                                                            )
 {
+  PvsFilterStatistics stats;
+
   AxisAlignedBox3 vbox = GetViewCellBox(viewCell);
   Vector3 center = vbox.Center();
-  
   // COpy the PVS
   ObjectPvs basePvs = viewCell->GetPvs();
@@ -2606 +2622 @@
   ObjectPvsIterator pit = basePvs.GetIterator();
 
+#if !USE_KD_PVS
   // first mark all object from this pvs
   while (pit.HasMoreEntries()) {                
@@ -2613 +2630 @@
         object->Mail();
   }
-
+#endif
 
   int pvsSize = 0;
   int nPvsSize = 0;
-  float samples = (float)pvs.GetSamples();
-
-  //  cout<<"#s"<<samples<<endl;
-  //  cout<<"pvs size = "<<pvs.GetSize() <<endl;
+  float samples = (float)basePvs.GetSamples();
+  
+  cout<<"f #s="<<samples<<"pvs size = "<<basePvs.GetSize();
   //  cout<<"Filter size = "<<filterSize<<endl;
   //  cout<<"vbox = "<<vbox<<endl;
@@ -2635 +2651 @@
 #define MIN_LOCAL_SAMPLES 5
 
-  float globalC = 2.0f*filterSize/sqrt(samples);
   float viewCellRadius = 0.5f*Magnitude(vbox.Diagonal());
   
@@ -2659 +2674 @@
         // update samples and globalC
         samples = (float)pvs.GetSamples();
-        globalC = 2.0f*filterSize/sqrt(samples);
         //      cout<<"neighboring viewcells = "<<i-1<<endl;
         //      cout<<"Samples' = "<<samples<<endl;
   }
+
+  // Minimal number of samples so that filtering takes place
+#define MIN_SAMPLES  100
+  if (samples > MIN_SAMPLES) {
+        float globalC = 2.0f*filterSize/sqrt(samples);
+        
+        pit = basePvs.GetIterator();
+        
+        ObjectContainer objects;
+        
+        while (pit.HasMoreEntries())
+          {             
+                ObjectPvsEntry entry = pit.Next();
+                
+                Intersectable *object = entry.mObject;
+                // 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)entry.mData.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;
+
+                if (localRadius < globalRadius) {
+                  radius = localRadius;
+                  stats.mLocalFilterCount++;
+                } else {
+                  radius = globalRadius;
+                  stats.mGlobalFilterCount++;
+                }
+
+                stats.mAvgFilterRadius += radius;
+                
+                // cout<<"box = "<<box<<endl;
+                //      cout<<"distance = "<<distance<<endl;
+                //      cout<<"radiues = "<<radius<<endl;
+                
+                box.Enlarge(Vector3(radius));
+                
+                objects.clear();
+                // $$ warning collect objects takes only unmailed ones!
+                CollectObjects(box, objects);
+                //      cout<<"collected objects="<<objects.size()<<endl;
+                ObjectContainer::const_iterator noi = objects.begin();
+                for (; noi != objects.end(); ++ noi) {
+                  Intersectable *o = *noi;
+                  // $$ JB warning: pdfs are not correct at this point!   
+                  pvs.AddSampleDirty(o, Limits::Small);
+                }
+          }
+        stats.mAvgFilterRadius /= (stats.mLocalFilterCount + stats.mGlobalFilterCount);
+  }
   
-  pit = basePvs.GetIterator();
-
-  ObjectContainer objects;
-
-  while (pit.HasMoreEntries())
-  {             
-        ObjectPvsEntry entry = pit.Next();
-
-        Intersectable *object = entry.mObject;
-        // 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)entry.mData.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));
-        
-        objects.clear();
-        // $$ warning collect objects takes only unmailed ones!
-        CollectObjects(box, objects);
-        //      cout<<"collected objects="<<objects.size()<<endl;
-        ObjectContainer::const_iterator noi = objects.begin();
-        for (; noi != objects.end(); ++ noi) {
-          Intersectable *o = *noi;
-          // $$ JB warning: pdfs are not correct at this point!   
-          pvs.AddSampleDirty(o, Limits::Small);
-        }
-  }
-
-  //  cout<<"nPvs size = "<<pvs.GetSize()<<endl;
-
+  cout<<" nPvs size = "<<pvs.GetSize()<<endl;
+
+#if !USE_KD_PVS
   // copy the base pvs to the new pvs
   pit = basePvs.GetIterator();
@@ -2716 +2748 @@
         pvs.AddSampleDirty(entry.mObject, entry.mData.mSumPdf);
   }
+#endif
   
   Intersectable::NewMail();
+  return stats;
 }
   
@@ -5096 +5130 @@
 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
 }
 
@@ -5853 +5891 @@
         ViewCellContainer::const_iterator it = viewcells.begin();
 
+        Intersectable *terminationObj = GetIntersectable(ray, true);
+        Intersectable *originObj = GetIntersectable(ray, false);
+          
         for (; it != viewcells.end(); ++ it) 
         {
@@ -5861 +5902 @@
                         float contribution;
 
-                        if (ray.mTerminationObject) 
+                        if (terminationObj) 
                         {
                                 // todo: maybe not correct for kd node pvs
-                                Intersectable *obj = mHierarchyManager->GetIntersectable(ray, true);
-
-                                if (viewcell->GetPvs().GetSampleContribution(obj,
-                                        ray.mPdf, 
-                                        contribution))
+                          
+                          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 
@@ -5881 +5921 @@
                         //-- the other contributions of this sample will be counted for the opposite ray!
 #if SAMPLE_ORIGIN_OBJECTS
-                        if (ray.mOriginObject && 
-                                viewcell->GetPvs().GetSampleContribution(ray.mOriginObject,
-                                ray.mPdf,
-                                contribution))
-                        {
+                        if (originObj && 
+                                viewcell->GetPvs().GetSampleContribution(originObj,
+                                                                                                                 ray.mPdf,
+                                                                                                                 contribution))
+                          {
                                 ++ ray.mPvsContribution;
                                 ray.mRelativePvsContribution += contribution;
-                        }
+                          }
 #endif
                 }
@@ -5906 +5946 @@
                         break;
 
+                //$$JB hack
+#if !USE_KD_PVS
                 AddSampleToPvs(
-                        ray.mTerminationObject, 
-                        ray.mTermination, 
-                        viewCell, 
-                        ray.mPdf, 
-                        ray.mRelativePvsContribution);
-
+                                           terminationObj, 
+                                           ray.mTermination, 
+                                           viewCell, 
+                                           ray.mPdf, 
+                                           ray.mRelativePvsContribution);
+#else
+                viewCell->GetPvs().AddSample(terminationObj, ray.mPdf);
+#endif
+                
 #if SAMPLE_ORIGIN_OBJECTS
-
                 AddSampleToPvs(
-                        ray.mOriginObject, 
-                        ray.mOrigin, 
-                        viewCell, 
-                        ray.mPdf, 
-                        ray.mRelativePvsContribution);
+                                           originObj, 
+                                           ray.mOrigin, 
+                                           viewCell, 
+                                           ray.mPdf, 
+                                           ray.mRelativePvsContribution);
 #endif                  
         }
-
+        
         
 
@@ -5937 +5981 @@
                                                                                         float &contribution) const
 {
-        // The hierarchy manager decides about the type of sample cast
-        return mHierarchyManager->AddSampleToPvs(obj, hitPoint, vc, pdf, contribution);
+  // The hierarchy manager decides about the type of sample cast
+  return mHierarchyManager->AddSampleToPvs(obj, hitPoint, vc, pdf, contribution);
 }