Changeset 2707

Timestamp:

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

Author:

bittner

Message:

shaft culling for dynamic updates

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Makefile (modified) (2 diffs)
• Preprocessor.cpp (modified) (3 diffs)
• Pvs.h (modified) (1 diff)
• PvsBase.h (modified) (4 diffs)
• QtInterface/QtGlRenderer.cpp (modified) (5 diffs)
• SepPlanesBox3.cpp (added)
• SepPlanesBox3.h (added)
• main.cpp (modified) (2 diffs)
• preprocessor.pro (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/src/Makefile

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (2.00a) (Qt 4.1.2) on: pá 23. V 15:20:40 2008
+# Generated by qmake (2.00a) (Qt 4.1.2) on: so 24. V 22:09:30 2008
 # Project:  preprocessor.pro
 # Template: app
@@ -63 +63 @@
         $(MAKE) -f $(MAKEFILE).Debug uninstall
 
-Makefile: preprocessor.pro  C:/Qt/4.1.2/mkspecs/win32-msvc2005\qmake.conf C:/Qt/4.1.2/mkspecs/qconfig.pri \
+Makefile: preprocessor.pro  C:/Qt/4.1.2/mkspecs/win32-msvc.net\qmake.conf C:/Qt/4.1.2/mkspecs/qconfig.pri \
                 C:\Qt\4.1.2\mkspecs\features\qt_config.prf \
                 C:\Qt\4.1.2\mkspecs\features\exclusive_builds.prf \

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;      
                 }
         

GTP/trunk/Lib/Vis/Preprocessing/src/Pvs.h

@@ -442 +442 @@
 }
 
+template <typename T, typename S>
+void VerbosePvs<T, S>::Remove(typename vector<PvsEntry<T, S> >::iterator &it)
+{
+
+  mEntries.erase(it);
+  -- mLastSorted; // wrong if sample was in tail!!
+  // $$JB decrement only if the sample found
+  -- mSamples;
+  
+}
 
 template <typename T, typename S>

GTP/trunk/Lib/Vis/Preprocessing/src/PvsBase.h

@@ -4 +4 @@
 #include "common.h"
 #include "Containers.h"
-
+#include <vector>
 
 namespace GtpVisibilityPreprocessor {
@@ -145 +145 @@
         }
 
+  
         inline T Next() { return (*(mItCurrent ++)).mObject; }
 
-
-private:
-        
-        typename vector<PvsEntry<T, S> >::const_iterator mItCurrent;
-        typename vector<PvsEntry<T, S> >::const_iterator mItEnd;
+  inline T Current(S &pdf) {
+        pdf = (*mItCurrent).mData;
+        return (*(mItCurrent)).mObject;
+  }
+
+  //private:
+        
+  typename vector<PvsEntry<T, S> >::const_iterator mItCurrent;
+  typename vector<PvsEntry<T, S> >::const_iterator mItEnd;
 };
 
@@ -261 +266 @@
         @param visibleSamples number of references to be removed
         */
-        bool RemoveSample(T sample, const float pdf);
+  bool RemoveSample(T sample, const float pdf);
+
+  void Remove(typename vector<PvsEntry<T, S> >::iterator &it);
 
         /** Compute continuous PVS difference 
@@ -334 +341 @@
         VerbosePvsStats mStats;
 
-protected:
+  //protected:
 
         /** Merge pvs 1 from begin iterator to end iterator with

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp

@@ -333 +333 @@
                         char filename[256];
                         //sprintf(filename, "error-frame-%04d-%0.5f.png", mFrame, pErrorPixels);
-                        sprintf_s(filename, "error-frame-%04d-%04d-%08d.png", mFrame, viewcell->GetId(), pixelCount);
+                        sprintf(filename, "error-frame-%04d-%04d-%08d.png", mFrame, viewcell->GetId(), pixelCount);
                         QImage im = toImage();
                         string str = mSnapPrefix + filename;
@@ -367 +367 @@
 
                                 im = toImage();
-                                sprintf_s(filename, "error-frame-%04d-%04d-%08d-pvs.png", mFrame, viewcell->GetId(), pixelCount);
+                                sprintf(filename, "error-frame-%04d-%04d-%08d-pvs.png", mFrame, viewcell->GetId(), pixelCount);
                                 str = mSnapPrefix + filename;
                                 qstr = str.c_str();
@@ -1043 +1043 @@
                         break;
 
-                if (sscanf_s(text.toAscii(), "%f %f %f", &mViewPoint.x, &mViewPoint.y, &mViewPoint.z) == 3) {
+                if (sscanf(text.toAscii(), "%f %f %f", &mViewPoint.x, &mViewPoint.y, &mViewPoint.z) == 3) {
                         text.sprintf("%f %f %f", mViewDirection.x, mViewDirection.y, mViewDirection.z);
                         text = QInputDialog::getText(this,
@@ -1053 +1053 @@
                         if (!ok)
                                 break;
-                        if (sscanf_s(text.toAscii(), "%f %f %f", &mViewDirection.x,
+                        if (sscanf(text.toAscii(), "%f %f %f", &mViewDirection.x,
                                 &mViewDirection.y, &mViewDirection.z) == 3) {
                                         updateGL();
@@ -2194 +2194 @@
 #endif
 
-#if 0
+#if 1
         QGroupBox *groupBox4 = CreateTrafoPanel(hbox);
         vh->addWidget(groupBox4, 0, 0);

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

@@ -27 +27 @@
 #include "RayCaster.h"
 #include "ViewCellsManager.h"
+#include "SepPlanesBox3.h"
 
 
@@ -169 +170 @@
         Debug.open("debug.log");
 
+        
+        TestSepAxis();
+        
         Environment::GetSingleton()->Parse(argc, argv, USE_EXE_PATH);
         MeshKdTree::ParseEnvironment();

GTP/trunk/Lib/Vis/Preprocessing/src/preprocessor.pro

@@ -125 +125 @@
 Intersectable.cpp TraversalTree.cpp ObjectPvs.cpp ObjectsParser.cpp \
 FilterBasedDistribution.cpp DifferenceSampling.cpp HavranRayCaster.cpp \
-HavranDynRayCaster.cpp OcclusionQuery.cpp RandomViewCellsHandler.cpp
+HavranDynRayCaster.cpp OcclusionQuery.cpp RandomViewCellsHandler.cpp \
+SepPlanesBox3.cpp