Changeset 378 for trunk/VUT

Timestamp:

11/04/05 03:47:27 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/Preprocessor.vcproj (modified) (2 diffs)
• scripts/default.env (modified) (6 diffs)
• src/Environment.cpp (modified) (2 diffs)
• src/SamplingPreprocessor.cpp (modified) (6 diffs)
• src/ViewCellBsp.cpp (modified) (4 diffs)
• src/ViewCellBsp.h (modified) (1 diff)
• src/X3dExporter.cpp (modified) (1 diff)

trunk/VUT/GtpVisibilityPreprocessor/scripts/Preprocessor.vcproj

@@ -20 +20 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\support;..\support\devil\include;..\support\zlib\include;"$(QTDIR)\include";"$(QTDIR)\include\Qt";..\include"
+                                AdditionalIncludeDirectories="..\include"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
                                 MinimalRebuild="TRUE"
@@ -255 +255 @@
                         </File>
                         <File
-                                RelativePath="..\src\Statistics.h">
-                        </File>
-                        <File
                                 RelativePath="..\src\Triangle3.cpp">
                         </File>

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -56 +56 @@
 
 Sampling {
-        totalSamples    1000000
+        totalSamples    400000
         samplesPerPass  3
 }
@@ -68 +68 @@
         maxViewCells 0
         
-        minPvsDif 1000
-#       maxPvsSize 200
+        
+        PostProcessing {
+                minPvsDif 100
+                minPvs 10
+                maxPvs 300
+                samples 100000
+        }
+
         
 #       filename ../data/atlanta/atlanta_viewcells_large.x3d
@@ -82 +88 @@
         #       input fromViewCells
         #       input fromSceneGeometry
-                samples 100000
+                samples 200000
                 sideTolerance 0.005
         }
@@ -126 +132 @@
         Termination {
                 # autopartition
-                maxRays 200
-                maxPolygons 5
+                maxRays 30
+                maxPolygons 1
                 maxDepth 50
                 
@@ -134 +140 @@
                         maxPolys 5000
                         maxRays 600
-                        maxObjects 20
+                        maxObjects 10
                         maxCostRatio 0.9
                         ct_div_ci 0.5
@@ -144 +150 @@
         }
         
-        PostProcessing {
-                samples 200000
-        }
                 
         # if split polys are stored for visualization

trunk/VUT/GtpVisibilityPreprocessor/src/Environment.cpp

@@ -1165 +1165 @@
                  "bspTree");
 
-  RegisterOption("ViewCells.minPvsDif",
+  RegisterOption("ViewCells.PostProcessing.minPvsDif",
+                 optInt,
+                 "-view_cells_min_pvs_dif",
+                 "10");
+  
+  RegisterOption("ViewCells.PostProcessing.maxPvs",
+                 optInt,
+                 "-view_cells_max_pvs",
+                 "300");
+
+  RegisterOption("ViewCells.PostProcessing.minPvs",
                  optString,
-                 "-view_cells_min_pvs_dif",
+                 "-view_cells_min_pvs",
                  "10");
 
@@ -1190 +1200 @@
           "100000");
 
-  RegisterOption("BspTree.PostProcessing.samples",
+  RegisterOption("ViewCells.PostProcessing.samples",
           optInt,
           "-bsp_postprocessing_samples=",

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -14 +14 @@
   environment->GetIntValue("Sampling.totalSamples", mTotalSamples);
   environment->GetIntValue("BspTree.Construction.samples", mBspConstructionSamples);
-  environment->GetIntValue("BspTree.PostProcessing.samples", mPostProcessSamples);
+  environment->GetIntValue("ViewCells.PostProcessing.samples", mPostProcessSamples);
   mKdPvsDepth = 100;
   mStats.open("stats.log");
@@ -531 +531 @@
                 cout << "#totalPvsSize=" << mKdTree->CollectLeafPvs() << endl;
   
-        //-- post processing of bsp view cells
         if (mBspTree)
         {
-                int vcSize = 0;
+                //-- render simulation
+                cout << "\nevaluating render time before merge ... ";
+                Real rt = SimulateRendering();
+                
+                cout << "avg render time: " << rt * 1e-3 << endl;
+                Debug << "avg render time: " << rt * 1e-3 << endl;
+
+                //-- post processing of bsp view cells
+        int vcSize = 0;
                 int pvsSize = 0;
 
@@ -553 +560 @@
                          << TimeDiff(startTime, GetTime()) *1e-3 << " secs" << endl;
 
-                cout << "evaluating render time heuristics ... ";
-
                 //-- recount pvs
                 mBspTree->EvaluateViewCellsStats(stat);
@@ -560 +565 @@
                 Debug << "after post processing:\n" << stat << endl;
 
-                Real rt = SimulateRendering();
-                cout << "finished" << endl;
-
+                //-- render simulation
+                cout << "\nevaluating render time after merge ... ";
+                        
+                rt = SimulateRendering();
+
+                cout << "render time: " << rt * 1e-3 << endl;
                 Debug << "render time: " << rt * 1e-3 << endl;
         }
@@ -917 +925 @@
 
 
-
 Real SamplingPreprocessor::RenderPvs(ViewCell &viewCell, 
                                                                          const float objRenderTime) const
@@ -959 +966 @@
         renderTime /= totalArea;
 
+        Debug << "render time without overhead: " << renderTime * 1e-3 << endl;
+        
         renderTime += (float)viewCells.size() * vcOverhead;
-        
+
         return renderTime;
 }

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -24 +24 @@
 int BspTree::sTermMaxRays = -1;
 int BspTree::sMinPvsDif = 10;
+int BspTree::sMinPvs = 10;
+int BspTree::sMaxPvs = 500;
 
 float BspTree::sCt_div_ci = 1.0f;
@@ -349 +351 @@
         app << setprecision(4);
 
+        app << "#N_OVERALLPVS ( objects in PVS )\n" << pvs << endl;
+
         app << "#N_PMAXPVS ( largest PVS )\n" << maxPvs << endl;
 
@@ -1482 +1486 @@
         Vector3::sDistToleranceSqrt = Vector3::sDistTolerance * Vector3::sDistTolerance;
 
-        environment->GetIntValue("ViewCells.minPvsDif", sMinPvsDif);
+        // post processing stuff
+        environment->GetIntValue("ViewCells.PostProcessing.minPvsDif", sMinPvsDif);
+        environment->GetIntValue("ViewCells.PostProcessing.minPvs", sMinPvs);
+        environment->GetIntValue("ViewCells.PostProcessing.maxPvs", sMaxPvs);
 
     Debug << "BSP max depth: " << sTermMaxDepth << endl;
@@ -1814 +1821 @@
                 return false;
 
-        /*Debug << "merge (" << sMinPvsDif << ")" << endl;
-        Debug << "size f: " << fvc->GetPvs().GetSize() << ", "
-                  << "size b: " << bvc->GetPvs().GetSize() << endl;
-        
-        Debug << "diff f: " << fvc->GetPvs().Diff(bvc->GetPvs()) << ", "
-                  << "diff b: " << bvc->GetPvs().Diff(fvc->GetPvs()) << endl;*/
-
-    if ((fvc->GetPvs().Diff(bvc->GetPvs()) < sMinPvsDif) &&
-            (bvc->GetPvs().Diff(fvc->GetPvs()) < sMinPvsDif))
-                return true;
-
+        int fdiff = fvc->GetPvs().Diff(bvc->GetPvs());
+
+        if (fvc->GetPvs().GetSize() + fdiff < sMaxPvs)
+        {
+                if ((fvc->GetPvs().GetSize() < sMinPvs) ||      
+                        (bvc->GetPvs().GetSize() < sMinPvs) ||
+                        ((fdiff < sMinPvsDif) && (bvc->GetPvs().Diff(fvc->GetPvs()) < sMinPvsDif)))
+                {
+                        return true;
+                }
+        }
+        
         return false;
 }

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.h

@@ -793 +793 @@
         static bool sStoreSplitPolys;
 
-        /// threshold where view cells are merged
+        //-- thresholds used for view cells are merging
         static int sMinPvsDif;
+        static int sMinPvs;
+        static int sMaxPvs;
 
 private:

trunk/VUT/GtpVisibilityPreprocessor/src/X3dExporter.cpp

@@ -267 +267 @@
     for (; vi != face->mVertexIndices.end(); vi++)
       stream<<*vi<<" ";
+        if (mWireframe) // final line to finish polygon
+                stream << (*face->mVertexIndices.begin()) << " ";
+
     stream<<"-1"<<endl;
   }