Changeset 1716 for GTP/trunk/Lib/Vis

Timestamp:

11/06/06 23:33:16 (18 years ago)

Author:

bittner

Message:

new visibility filter support

File:

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

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

@@ -2451 +2451 @@
                                                                          )
 {
-        // now compute a new Pvs by including also objects intersecting the 
-        // extended boxes of visible objects
-        Intersectable::NewMail();
-
-        ObjectPvsMap::const_iterator oi;
-
+  // now compute a new Pvs by including also objects intersecting the 
+  // extended boxes of visible objects
+  Intersectable::NewMail();
+  
+  ObjectPvsMap::const_iterator oi;
+  
   for (oi = pvs.mEntries.begin(); oi != pvs.mEntries.end(); ++ oi) 
-  {
+        {
           Intersectable *object = (*oi).first;
       object->Mail();
-  }
+        }
 
   ObjectPvs nPvs;
@@ -2475 +2475 @@
         AxisAlignedBox3 box = object->GetBox();
         box.Enlarge(Vector3(spatialFilterSize/2));
-
+        
         ObjectContainer objects;
-
+        
         // $$ warning collect objects takes only unmailed ones!
         kdTree->CollectObjects(box, objects);
@@ -2502 +2502 @@
                                                            )
 {
-  // first determine the average
-
-
-
-}
+  Vector3 center = viewCell->GetBox().Center();
+  // first determine the average size of the filter
+
+
+
+  Intersectable::NewMail();
+  ObjectPvsMap::const_iterator oi;
+  // first mark all object from this pvs
+  for (oi = pvs.mEntries.begin(); oi != pvs.mEntries.end(); ++ oi) {
+        Intersectable *object = (*oi).first;
+        object->Mail();
+  }
+
+  ObjectPvs nPvs;
+  int pvsSize = 0;
+  int nPvsSize = 0;
+  int samples = pvs.mSamples;
+
+  
+  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());
+
+        // now compute the filter size
+        float radius = distance*(filterSize/(4*samples));
+        AxisAlignedBox3 box = object->GetBox();
+        box.Enlarge(Vector3(radius));
+
+        ObjectContainer objects;
+        // $$ warning collect objects takes only unmailed ones!
+        // should use VspOsp!!
+        kdTree->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!   
+          nPvs.AddSample(o, Limits::Small);
+          nPvsSize ++;
+        }
+  }
+  //  cout<<"nPvs size = "<<nPvsSize<<endl;
+  pvs.Merge(nPvs);
+}
+  
+  
+