Changeset 520

Timestamp:

01/12/06 02:44:17 (18 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (8 diffs)
• src/Preprocessor.cpp (modified) (1 diff)
• src/Preprocessor.h (modified) (1 diff)
• src/ViewCell.cpp (modified) (1 diff)
• src/ViewCell.h (modified) (1 diff)
• src/ViewCellsManager.cpp (modified) (7 diffs)
• src/VspBspTree.h (modified) (1 diff)
• src/VssPreprocessor.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -9 +9 @@
 #       filename vienna.x3d
 #       filename ../data/vienna/vienna-simple.x3d
-#       filename ../data/vienna/vienna-buildings.x3d
+        filename ../data/vienna/vienna-buildings.x3d
 #filename ../data/vienna/vienna-buildings.x3d;../data/vienna/vienna-roofs.x3d
 #;../data/vienna/vienna-plane.x3d
@@ -15 +15 @@
 #       filename ../data/atlanta/atlanta2.x3d
 #       filename ../data/soda/soda.dat
-        filename ../data/soda/soda5.dat
+#       filename ../data/soda/soda5.dat
 }
 
@@ -30 +30 @@
         samplesPerPass  100000
         initialSamples 300000
-        vssSamples 500000
+        vssSamples 1000000
         vssSamplesPerPass 100000
         useImportanceSampling true
@@ -169 +169 @@
 
 ViewCells {
-        loadFromFile true
+        loadFromFile false
         exportToFile false
         #type kdTree
@@ -246 +246 @@
         PostProcess {
                 maxCostRatio 0.005
-                minViewCells 200
+                minViewCells 6000
                 maxPvsSize   50000
         }
@@ -287 +287 @@
         Termination {
                 # parameters used for autopartition
-                minRays                 900
+                minRays                 1500
                 minPolygons             -1
                 maxDepth                30
@@ -293 +293 @@
                 minArea                 0.0001
                 #minArea                0.000
-                maxRayContribution      0.4
-                maxCostRatio            0.93
-                missTolerance           3
+                maxRayContribution      0.05
+                maxCostRatio            0.9
+                missTolerance           2
                 #maxAccRayLength        100
                 
@@ -318 +318 @@
         PostProcess {
                 maxCostRatio 0.1
-                minViewCells 100
+                minViewCells 150
                 maxPvsSize   1000
                 useRaysForMerge true

trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.cpp

@@ -249 +249 @@
         //-- parse view cells construction method
         environment->GetBoolValue("ViewCells.loadFromFile", mLoadViewCells);
-
-        
+        char buf[100];
+        if (mLoadViewCells)
+        {
+                environment->GetStringValue("ViewCells.filename", buf);
+                mViewCellsFilename = buf;
+        }
         if (mUseGlRenderer)
           renderer = new GlRendererBuffer(1024, 768, mSceneGraph, mViewCellsManager);

trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.h

@@ -128 +128 @@
   bool mLoadViewCells;
 
+  string mViewCellsFilename;
+
 protected:
 

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.cpp

@@ -83 +83 @@
 }
 
+
 float ViewCell::GetArea() const
 {

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.h

@@ -157 +157 @@
                 if ((int)mLeaves.size() > vcStat.maxLeaves)
                         vcStat.maxLeaves = (int)mLeaves.size();
+                vcStat.leaves += (int)mLeaves.size();
         }
 

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -100 +100 @@
 void ViewCellsManager::ComputeSampleContributions(const VssRayContainer &rays)
 {
-        Debug << "here2" << endl;
         // view cells not yet constructed
         if (!ViewCellsConstructed())
                 return;
-        Debug << "here " << rays.size() << endl;
 
         VssRayContainer::const_iterator it, it_end = rays.end();
@@ -335 +333 @@
         mViewCellsStats.Reset();
         EvaluateViewCellsStats();
-
+        // has to be recomputed
         mTotalAreaValid = false;
 }
@@ -361 +359 @@
                                   termination,
                                   viewcells);
-  Debug << "constribution: " << (int)viewcells.size() << endl;
+  //Debug << "constribution: " << (int)viewcells.size() << endl;
   // copy viewcells memory efficiently
   const bool storeViewcells = false;
@@ -1965 +1963 @@
                 return 0;
         }
-        // view cells already finished
-        else if (mViewCellsFinished)
+
+        EvaluateViewCellsStats();
+
+        // view cells already finished post processing step
+        if (mViewCellsFinished)
                 return 0;
 
@@ -1973 +1974 @@
 
         Debug << "post processing using " << (int)postProcessRays.size() << " samples" << endl;
-        EvaluateViewCellsStats();
+        
         Debug << "\nview cell partition after sampling:\n" << mViewCellsStats << endl << endl;
 
@@ -1983 +1984 @@
         // collapse sibling leaves that share the same view cell
         mVspBspTree->CollapseTree();
+
+        ResetViewCells();
 
         // real meshes are only contructed only at this stage
@@ -2372 +2375 @@
         
         bool success = parser.ParseFile(filename, mVspBspTree, this, objects);
+        mVspBspTree->RepairViewCellsLeafLists();
+        mVspBspTree->mBox = GetViewSpaceBox();
         ResetViewCells();
         CreateViewCellMeshes();

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.h

@@ -35 +35 @@
 {
         friend class ViewCellsParseHandlers;
-
+        friend class VspBspViewCellsManager;
 public:
         

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -403 +403 @@
 
   //-- load view cells from file if requested
+  // load now because otherwise bounding box is messed up
   if (mLoadViewCells)
   {
-          char buff[100];
-          environment->GetStringValue("ViewCells.filename", buff);
-          string vcFilename(buff);
-          mViewCellsManager->LoadViewCells(vcFilename, &mObjects);
+          mViewCellsManager->LoadViewCells(mViewCellsFilename, &mObjects);
   }
 
@@ -639 +637 @@
   //-- render simulation after merge
   cout << "\nevaluating bsp view cells render time after merge ... ";
-  
   mRenderSimulator->RenderScene();
-  
   SimulationStatistics ss;
   mRenderSimulator->GetStatistics(ss);