Changeset 2707 for GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

Timestamp:

05/24/08 22:40:42 (16 years ago)

Author:

bittner

Message:

shaft culling for dynamic updates

File:

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

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

@@ -25 +25 @@
 #include "GlobalLinesRenderer.h"
 #include "ObjectsParser.h"
+#include "SepPlanesBox3.h"
 
 
@@ -1658 +1659 @@
 /** Object has moved - must dynamically update all affected PVSs */
 void
-Preprocessor::ObjectMoved(SceneGraphLeaf *object)
+Preprocessor::ObjectMoved(SceneGraphLeaf *leaf)
 {
   // first invalidate all PVS from which this object is visible
   ViewCellContainer::const_iterator vit, vit_end = mViewCellsManager->GetViewCells().end();
-
-  AxisAlignedBox3 box = object->GetBox();
-
-  ObjectContainer objects;
-
-  if (0) 
-        {
-          // simplified computation taking only the objects intersecting the box
-                KdNode::NewMail();
-
-                // first mail all kDObjects which are intersected by the object
-                preprocessor->mKdTree->CollectKdObjects(box, objects);
-
-        } 
-        else 
-        {
-                ViewCellContainer viewCells;
-                mViewCellsManager->ComputeBoxIntersections(box, viewCells);
-
-                // add object to all viewcells that intersect the bounding box
-                ObjectPvs pvs;
-
-                ViewCellContainer::const_iterator it = viewCells.begin(), it_end = viewCells.end();
-
-                for (int i = 0; it != it_end; ++ it, ++ i) 
-                {
-                        //cout<<"v"<<i<<" pvs="<<(*it)->GetPvs().mEntries.size()<<endl;
-                        pvs.MergeInPlace((*it)->GetPvs());
-                }
-
-                ObjectPvsIterator pit = pvs.GetIterator();
-                while (pit.HasMoreEntries())  
-                {               
-                        PvsData pvsData;
-                        Intersectable *object = pit.Next(pvsData);
-                        objects.push_back(object);
-                }
-        }
-
-        int pvsCounter = 0;
-
-        // now search for pvss which contained any mailed node
-        for (vit = mViewCellsManager->GetViewCells().begin(); vit != vit_end; ++ vit) 
-        {
-                ObjectPvs &pvs = (*vit)->GetPvs();
-
-                for (int i=0; i < objects.size(); i++) 
-                {
-                        vector<PvsEntry<Intersectable *,PvsData> >::iterator v;
+  
+  AxisAlignedBox3 box = leaf->GetBox();
+  Intersectable *inter = leaf->GetIntersectable();
+  int removedEntries = 0;
+  
+  // now search for pvss which contained any mailed node
+  for (vit = mViewCellsManager->GetViewCells().begin(); vit != vit_end; ++ vit) {
+        ObjectPvs &pvs = (*vit)->GetPvs();
+        if (Overlap(box, (*vit)->GetBox())) {
+          pvs.Clear();
+          removedEntries += pvs.GetSize();
+        } else {
+          CSeparatingAxisTester shadowVolume;
+          
+          //    cout<<(*vit)->GetBox()<<" "<<box<<endl;
+          shadowVolume.Init((*vit)->GetBox(), box);
+          
+          int j = 0;
+          for (int i=0; i < pvs.mEntries.size(); i++) {
+                Intersectable *o = pvs.mEntries[i].mObject;
                 
-                        if (pvs.Find(objects[i], v)) {
-                                // clear the pvs
-                                pvs.Clear();
-                                pvsCounter++;
-                                break;
-                        }
-                }
-        }
-
-        cout<<"Number of affected objects "<<objects.size()<<endl;
-        cout<<"Cleared "<<pvsCounter<<" PVSs ("<<mViewCellsManager->GetViewCells().size()/
-                (float)pvsCounter*100.0f<<"%) "<<endl;
-
+                if (!shadowVolume.TestIsInsideShaft(o->GetBox())) {
+                  if (j != i)
+                        pvs.mEntries[j] = pvs.mEntries[i];
+                  j++;
+                } else {
+                  removedEntries++;
+                }
+          }
+          pvs.mLastSorted = 0;
+          if (j==0)
+                pvs.mEntries.clear();
+          else {
+                pvs.mEntries.resize(j);
+                pvs.SimpleSort();
+          }
+        }
+  }
+  
+  cerr<<"Number of removed pvs entries = "<<removedEntries<<endl;
+  //    cout<<"Cleared "<<pvsCounter<<" PVSs ("<<mViewCellsManager->GetViewCells().size()/
+  //      (float)pvsCounter*100.0f<<"%) "<<endl;
+  
 }
 
@@ -1745 +1726 @@
                         cout<<"done."<<endl;
                         
-                        cout<<"Updating affected PVSs..."<<endl;
+                        cerr<<"Updating affected PVSs..."<<endl;
                         preprocessor->ObjectMoved(l);
-                        cout<<"done."<<endl;      
+                        cerr<<"done."<<endl;      
                 }