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

Timestamp:

11/24/06 00:24:41 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -2591 +2591 @@
 
 
+void ViewCellsManager::MergeViewCellsEfficient(ObjectPvs &pvs, const ViewCellContainer &viewCells) const
+{
+        LocalMergeTree mergeTree(viewCells);
+        mergeTree.Merge(pvs);
+}
+
+#if 1
 PvsFilterStatistics
 ViewCellsManager::ApplyFilter2(ViewCell *viewCell,
@@ -2602 +2609 @@
   AxisAlignedBox3 vbox = GetViewCellBox(viewCell);
   Vector3 center = vbox.Center();
-  // COpy the PVS
+  // copy the PVS
   ObjectPvs basePvs = viewCell->GetPvs();
   Intersectable::NewMail();
@@ -2740 +2747 @@
   return stats;
 }
+#else
+PvsFilterStatistics
+ViewCellsManager::ApplyFilter2(ViewCell *viewCell,
+                                                           const bool useViewSpaceFilter,
+                                                           const float filterSize,
+                                                           ObjectPvs &pvs
+                                                           )
+{cout << "x";
+  PvsFilterStatistics stats;
+
+  AxisAlignedBox3 vbox = GetViewCellBox(viewCell);
+  Vector3 center = vbox.Center();
+  // copy the PVS
+  ObjectPvs basePvs = viewCell->GetPvs();
+  Intersectable::NewMail();
+
+  ObjectPvsIterator pit = basePvs.GetIterator();
+
+#if !USE_KD_PVS
+  // first mark all object from this pvs
+  while (pit.HasMoreEntries()) {                
+        ObjectPvsEntry entry = pit.Next();
+        
+        Intersectable *object = entry.mObject;
+        object->Mail();
+  }
+#endif
+
+  int pvsSize = 0;
+  int nPvsSize = 0;
+  float samples = (float)basePvs.GetSamples();
   
+  Debug<<"f #s="<<samples<<"pvs size = "<<basePvs.GetSize();
+  //  cout<<"Filter size = "<<filterSize<<endl;
+  //  cout<<"vbox = "<<vbox<<endl;
+  //  cout<<"center = "<<center<<endl;
+
+
+   // Minimal number of local samples to take into account
+   // the local sampling density.
+   // The size of the filter is a minimum of the conservative
+   // local sampling density estimate (#rays intersecting teh viewcell and
+   // the object)
+   // and gobal estimate for the view cell
+   // (total #rays intersecting the viewcell)
+#define MIN_LOCAL_SAMPLES 5
+
+  float viewCellRadius = 0.5f*Magnitude(vbox.Diagonal());
   
+  // 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);
+        ObjectPvs pvs;
+        MergeViewCellsEfficient(pvs, viewCells);
+        basePvs = pvs;
+                
+        // update samples and globalC
+        samples = (float)pvs.GetSamples();
+        //      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);
+  }
+  
+  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);
+  }
+#endif
+  viewCell->SetFilteredPvsSize(pvs.GetSize());
+  
+  Intersectable::NewMail();
+  return stats;
+}
+#endif
 
   
@@ -6031 +6181 @@
                 //dummyStrat.push_back(SamplingStrategy::REVERSE_VIEWSPACE_BORDER_BASED_DISTRIBUTION);
 
-                CastPassSamples(samplesPerPass, mStrategies, evaluationSamples);
+                CastPassSamples(samplesPerPass, dummyStrat, evaluationSamples);
+                //CastPassSamples(samplesPerPass, mStrategies, evaluationSamples);
                 
                 castSamples += samplesPerPass;
@@ -6118 +6269 @@
 }
 #endif
-}
+
+
+LocalMergeTree::LocalMergeTree(const ViewCellContainer &viewCells):
+mViewCells(viewCells)
+{
+        mRoot = Subdivide(0, (int)mViewCells.size());
+}
+
+
+void LocalMergeTree::Merge(ObjectPvs &mergedPvs)
+{
+        Merge(mRoot, mergedPvs);
+}
+
+
+void LocalMergeTree::Merge(LocalMergeNode *node, ObjectPvs &mergedPvs)
+{
+        ////////////////
+        //-- pvs is not stored with the interiors => reconstruct
+        if (node->IsLeaf())
+        {
+                LocalMergeLeaf *leaf = dynamic_cast<LocalMergeLeaf *>(node);
+        mergedPvs = leaf->mViewCell->GetPvs();
+        }
+        else
+        {
+                LocalMergeInterior *interior = dynamic_cast<LocalMergeInterior *>(node);
+
+                ObjectPvs leftPvs, rightPvs;
+
+                Merge(interior->mLeft, leftPvs);
+                Merge(interior->mRight, rightPvs);
+
+                ObjectPvs::Merge(mergedPvs, leftPvs, rightPvs);
+        }       
+}
+
+
+LocalMergeNode *LocalMergeTree::Subdivide(const int leftIdx, const int rightIdx)
+{
+        if (leftIdx == rightIdx)
+        {
+                return new LocalMergeLeaf(mViewCells[leftIdx]);
+        }
+
+        LocalMergeInterior *interior = new LocalMergeInterior();
+
+        const int midSplit = (leftIdx + rightIdx) / 2;
+
+        interior->mLeft = Subdivide(leftIdx, midSplit);
+        interior->mRight = Subdivide(midSplit,  rightIdx);
+
+        return interior;
+}
+
+
+
+}