Changeset 2713

Timestamp:

05/26/08 14:54:07 (16 years ago)

Author:

bittner

Message:

updates changes

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Makefile (modified) (2 diffs)
• MutualVisibility.cpp (modified) (1 diff)
• Preprocessor.cpp (modified) (4 diffs)
• Pvs.h (modified) (1 diff)
• SepPlanesBox3.h (modified) (1 diff)
• default.env (modified) (3 diffs)
• run_test2 (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: so 24. V 23:11:10 2008
+# Generated by qmake (2.00a) (Qt 4.1.2) on: po 26. V 10:26:06 2008
 # Project:  preprocessor.pro
 # Template: app
@@ -63 +63 @@
         $(MAKE) -f $(MAKEFILE).Debug uninstall
 
-Makefile: preprocessor.pro  C:/Qt/4.1.2/mkspecs/win32-msvc.net\qmake.conf C:/Qt/4.1.2/mkspecs/qconfig.pri \
+Makefile: preprocessor.pro  C:/Qt/4.1.2/mkspecs/win32-msvc2005\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/MutualVisibility.cpp

@@ -703 +703 @@
                                          const float solidAngleThreshold)
 {
-        MutualVisibilitySampler
-                sampler(sceneGraph, kdTree, source, target, solidAngleThreshold);
-
-        int visibility = sampler.ComputeVisibility();
-
-        return visibility;
-
-}
-
-}
+  MutualVisibilitySampler
+        sampler(sceneGraph, kdTree, source, target, solidAngleThreshold);
+  
+  int visibility = sampler.ComputeVisibility();
+  
+  return visibility;
+  
+}
+
+}

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

@@ -1701 +1701 @@
   Intersectable *inter = leaf->GetIntersectable();
   int removedEntries = 0;
+  int removedSelfEntries = 0;
   CSeparatingAxisTester shadowVolume;
-
+  int maxPlanes = 0;
+  int allEntries = 0;
   // now search for pvss which contained any mailed node
   for (vit = mViewCellsManager->GetViewCells().begin(); vit != vit_end; ++ vit) {
@@ -1710 +1712 @@
           removedEntries += pvs.GetSize();
         } else {
-          
           //    cout<<(*vit)->GetBox()<<" "<<box<<endl;
           shadowVolume.Init((*vit)->GetBox(), box);
+          if (shadowVolume.CntPlanes() > maxPlanes)
+                maxPlanes = shadowVolume.CntPlanes();
           
           int j = 0;
           for (int i=0; i < pvs.mEntries.size(); i++) {
+                allEntries++;
                 Intersectable *o = pvs.mEntries[i].mObject;
-                
-                if (!shadowVolume.TestIsInsideShaft(o->GetBox())) {
-                  if (j != i)
-                        pvs.mEntries[j] = pvs.mEntries[i];
-                  j++;
+                if (o == inter) {
+                  removedSelfEntries++;
                 } else {
-                  removedEntries++;
+                  if (!shadowVolume.TestIsInsideShaft(o->GetBox())) {
+                        if (j != i)
+                          pvs.mEntries[j] = pvs.mEntries[i];
+                        j++;
+                  } else {
+                        removedEntries++;
+                  }
                 }
           }
+          // now the pvs has to be resorted
           pvs.mLastSorted = 0;
           if (j==0)
@@ -1731 +1739 @@
           else {
                 pvs.mEntries.resize(j);
-                pvs.SimpleSort();
+                if (j>1)
+                  pvs.SimpleSort();
           }
         }
   }
   
-  cerr<<"Number of removed pvs entries = "<<removedEntries<<endl;
+  cerr<<"Number of removed pvs entries = "<<removedEntries<<" ("<<
+        100.0f*removedEntries/(float)allEntries<<"%)"<<endl;
+  cerr<<"Number of removed pvs self-entries = "<<removedSelfEntries<<endl;
+  cerr<<"Max shadow planes used:"<<maxPlanes<<endl;
   //    cout<<"Cleared "<<pvsCounter<<" PVSs ("<<mViewCellsManager->GetViewCells().size()/
   //      (float)pvsCounter*100.0f<<"%) "<<endl;
@@ -1755 +1767 @@
                 // delete ALL dynamic stuff and rebuild using the new trafos
                 preprocessor->mRayCaster->DeleteDynamicObjects();
-        
+
+                
+
                 for (size_t i = 0; i < mDynamicObjects.size(); ++ i) 
                 {
                         SceneGraphLeaf *l = mDynamicObjects[i];
 
-                        UpdateObjectInRayCaster(l);
+                        
 
                         if (l->HasChanged())
                         {
-                                cout<<"Updating affected PVSs..."<<endl;
-                                preprocessor->ObjectMoved(l);
-                                cout<<"done."<<endl;    
-                                l->SetHasChanged(false);
+                          UpdateObjectInRayCaster(l);
+                          
+                          cout<<"Updating affected PVSs..."<<endl;
+                          preprocessor->ObjectMoved(l);
+                          cout<<"done."<<endl;  
+                          l->SetHasChanged(false);
                         }
                 }

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

@@ -56 +56 @@
 void VerbosePvs<T, S>::SimpleSort()
 {
-        //  sort(mEntries.begin(), mEntries.end());
-        typename vector<PvsEntry<T, S> >::iterator it = mEntries.begin() + mLastSorted;
-
-        sort(it, mEntries.end());
-        inplace_merge(mEntries.begin(), it, mEntries.end());
+  //  sort(mEntries.begin(), mEntries.end());
+  typename vector<PvsEntry<T, S> >::iterator it = mEntries.begin() + mLastSorted;
   
-        mLastSorted = (int)mEntries.size();
-        mQueriesSinceSort = 0;
+  sort(it, mEntries.end());
+  inplace_merge(mEntries.begin(), it, mEntries.end());
+  
+  mLastSorted = (int)mEntries.size();
+  mQueriesSinceSort = 0;
 }
 

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

@@ -25 +25 @@
   // the number of separating planes
   int cntPlanes;
-  Plane3 planes[180];
+  Plane3 planes[32];
   AxisAlignedBox3 origBox;
   AxisAlignedBox3 shadBox;

GTP/trunk/Lib/Vis/Preprocessing/src/default.env

@@ -44 +44 @@
         totalSamples 250000000
 #       totalSamples 2000000
-        samplesPerPass 100000
+        samplesPerPass 300000
         samplesPerEvaluation 5000000
 
@@ -521 +521 @@
 
 BSP {
-   termCrit       auto
+  # termCrit      auto
   # termCrit      auto2
-  # termCrit      adhoc
+   termCrit       adhoc
   # For Arena
   #maxDepthAllowed 15
   #maxListLength    8
   # For Vienna
-  # maxDepthAllowed 22
-  # maxListLength    6
+   maxDepthAllowed 22
+   maxListLength    6
   # For Powerplant
   # maxDepthAllowed  27
@@ -557 +557 @@
   # rayCastMethod 0
   # Intel
-  rayCastMethod 1
+  # rayCastMethod 1
   # Havran - 2 - static scene
   # rayCastMethod 2
   # Havran - 3 - dynamic scene
-  # rayCastMethod 3
+  rayCastMethod 3
 
   loadMeshes false

GTP/trunk/Lib/Vis/Preprocessing/src/run_test2

@@ -4 +4 @@
 
 #COMMAND="./release/preprocessor.exe -preprocessor_quit_on_finish+"
-COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish- -preprocessor_use_gl_renderer+ -preprocessor_evaluate_filter- -samples_per_evaluation=50000000 -samples_per_pass=100000 -total_samples=20000000 -mutation_use_pass_importance- -mutation_silhouette_search_steps=3 -preprocessor_detect_empty_viewspace+ -total_time=1400"
+COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish- -preprocessor_use_gl_renderer+ -preprocessor_evaluate_filter- -samples_per_evaluation=50000000 -samples_per_pass=300000 -total_samples=20000000 -mutation_use_pass_importance- -mutation_silhouette_search_steps=3 -preprocessor_detect_empty_viewspace+ -total_time=1400"
 
 #SCENE="../data/vienna/vienna-buildings.x3d;../data/vienna/vienna-roofs.x3d;../data/vienna/vienna-roads.x3d"