Changeset 597 for trunk

Timestamp:

02/05/06 04:15:02 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (3 diffs)
• src/ViewCellsManager.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -196 +196 @@
         height 5.0
         maxViewCells 3000
+
         #percentage of total visible objects where pvs is considered invalid
         maxPvsRatio 1.0
@@ -300 +301 @@
         # pvs                  = 1024
         
-        splitPlaneStrategy 1026
+        splitPlaneStrategy 1024
         
         # maximal candidates for split planes
-        maxPolyCandidates 100
+        maxPolyCandidates 0
 
         
@@ -332 +333 @@
                 #maxAccRayLength        100
                 
-                maxViewCells            5000
+                maxViewCells            512
                 
                 # used for pvs criterium

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -2464 +2464 @@
         //-- merge or subdivide view cells
         int merged = 0;
-
-        cout << "starting merge using " << mPostProcessSamples << " samples ... " << endl;
-        long startTime = GetTime();
+        if (mMergeViewCells)
+        {
+                cout << "starting merge using " << mPostProcessSamples << " samples ... " << endl;
+                long startTime = GetTime();
 
         
-        // TODO: should be done BEFORE the ray casting
-        merged = mViewCellsTree->ConstructMergeTree(rays, objects);
-
-        //-- stats and visualizations
-        cout << "finished merging" << endl;
-        cout << "merged " << merged << " view cells in "
-                 << TimeDiff(startTime, GetTime()) *1e-3 << " secs" << endl;
-
-        Debug << "Postprocessing: Merged " << merged << " view cells in "
-                  << TimeDiff(startTime, GetTime()) *1e-3 << " secs" << endl << endl;
-
+                // TODO: should be done BEFORE the ray casting
+                merged = mViewCellsTree->ConstructMergeTree(rays, objects);
+
+                //-- stats and visualizations
+                cout << "finished merging" << endl;
+                cout << "merged " << merged << " view cells in "
+                         << TimeDiff(startTime, GetTime()) *1e-3 << " secs" << endl;
+
+                Debug << "Postprocessing: Merged " << merged << " view cells in "
+                          << TimeDiff(startTime, GetTime()) *1e-3 << " secs" << endl << endl;
+        }
 
         //BspLeaf::NewMail();
         if (1) // export merged view cells
         {
-
                 cout << "reseting view cells ... ";
                 ResetViewCells();
@@ -2592 +2592 @@
         }
 
-        if (mMergeViewCells)
-        {
-                //-- merge the individual view cells
-                MergeViewCells(postProcessRays, objects);
+        //-- merge the individual view cells
+        MergeViewCells(postProcessRays, objects);
         
 
-                //-- refines the merged view cells
-                if (0)
-                        RefineViewCells(postProcessRays, objects);
-
-                if (mCompressViewCells)
-                {
-                        int pvsEntries = mViewCellsTree->GetNumPvsEntries(mViewCellsTree->GetRoot());
-                        Debug << "number of entries before compress: " << pvsEntries << endl;
-
-                        mViewCellsTree->CompressViewCellsPvs();
-
-                        pvsEntries = mViewCellsTree->GetNumPvsEntries(mViewCellsTree->GetRoot());
-                        Debug << "number of entries after compress: " << pvsEntries << endl;
-                }
+        //-- refines the merged view cells
+        if (0)
+                RefineViewCells(postProcessRays, objects);
+
+        if (mCompressViewCells)
+        {
+                int pvsEntries = mViewCellsTree->GetNumPvsEntries(mViewCellsTree->GetRoot());
+                Debug << "number of entries before compress: " << pvsEntries << endl;
+
+                mViewCellsTree->CompressViewCellsPvs();
+
+                pvsEntries = mViewCellsTree->GetNumPvsEntries(mViewCellsTree->GetRoot());
+                Debug << "number of entries after compress: " << pvsEntries << endl;
         }