Changeset 667 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

Timestamp:

03/01/06 10:31:49 (18 years ago)

Author:

mattausch

Message:

test version
build script for testing. code is set uo for testing also

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp (modified) (10 diffs)

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

@@ -16 +16 @@
 #include "RssPreprocessor.h"
 
-#define SAMPLE_AFTER_SUBDIVISION 0
+#define SAMPLE_AFTER_SUBDIVISION 1
 
 
@@ -210 +210 @@
 
         // rays can be passed or deleted
-        if (0) // remove!!
         disposeRays(initialSamples, outRays);
         
@@ -216 +215 @@
         // -- stats after contruction
         ResetViewCells();
-        Debug << "\nView cells after initial sampling: " << mCurrentViewCellsStats << endl;
+
+        Debug << "\nView cells after initial sampling:\n" << mCurrentViewCellsStats << endl;
 
         if (0) // export initial view cells
@@ -247 +247 @@
                 VssRayContainer constructionSamples;
 
-                const int samplingType = mSamplingType;
-/*                      dirSamples ? 
+                const int samplingType =
+                        dirSamples ? 
                                                 Preprocessor::DIRECTION_BASED_DISTRIBUTION :
                                                 Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION;
-*/
+
                 if (0)
                         dirSamples = !dirSamples; // toggle sampling method
+
                 numSamples += CastPassSamples(mSamplesPerPass, 
                                                                           samplingType,
@@ -333 +334 @@
         }
         
-        ViewCellContainer leaves;
-        mViewCellsTree->CollectLeaves(mViewCellsTree->GetRoot(), leaves);
-        mViewCellsTree->ResetPvs();
-        VssRayContainer dummyRays;
-        CastPassSamples(mInitialSamples, mSamplingType, dummyRays);
-        
-        //ComputeSampleContributions(initialSamples, true, false);
-        ComputeSampleContributions(dummyRays, true, false);
-
-        ViewCellContainer::const_iterator it, it_end = leaves.end();
-
-        for (it = leaves.begin(); it != it_end; ++ it)
-        {
-                mViewCellsTree->PropagatePvs(*it);
-        }
-
-        mViewCellsTree->ExportStats("dummy.log");
+        if (0)
+        {
+                ViewCellContainer leaves;
+                mViewCellsTree->CollectLeaves(mViewCellsTree->GetRoot(), leaves);
+                mViewCellsTree->ResetPvs();
+                VssRayContainer dummyRays;
+                CastPassSamples(mInitialSamples, mSamplingType, dummyRays);
+        
+                //ComputeSampleContributions(initialSamples, true, false);
+                ComputeSampleContributions(dummyRays, true, false);
+
+                ViewCellContainer::const_iterator it, it_end = leaves.end();
+
+                for (it = leaves.begin(); it != it_end; ++ it)
+                {
+                        mViewCellsTree->PropagatePvs(*it);
+                }
+
+                mViewCellsTree->ExportStats("dummy.log");
+        }
 
         return numSamples;
@@ -428 +432 @@
 
                 // output stats
-                sprintf(s, "Stats-%09d-eval.log", castSamples);
+                sprintf(s, "-%09d-eval.log", castSamples);
                 string fileName = string(statsPrefix) + string(s);
 
@@ -899 +903 @@
 {
         int axis = 0;
-
-        const float factor = 0.65f;
-        Vector3 point = mViewSpaceBox.Min() +  mViewSpaceBox.Size() * factor;
+        float pos;
+
+        environment->GetFloatValue("ViewCells.Visualization.clipPlanePos", pos);
+
+        Vector3 point = mViewSpaceBox.Min() +  mViewSpaceBox.Size() * pos;
 
         if (mUseClipPlaneForViz)
@@ -2663 +2669 @@
 
         //TODO: remove
-        if(0)
-        mVspBspTree->Construct(constructionRays, &mViewSpaceBox);
+        if (1)
+                mVspBspTree->Construct(constructionRays, &mViewSpaceBox);
         else
-mVspBspTree->Construct(rays, &mViewSpaceBox);
+                mVspBspTree->Construct(rays, &mViewSpaceBox);
+
         // collapse invalid regions
         cout << "collapsing invalid tree regions ... ";
@@ -2747 +2754 @@
 
         //BspLeaf::NewMail();
-        if (0) // export merged view cells
+        if (1) // export merged view cells
         {
                 mColorCode = 0;
@@ -2778 +2785 @@
         }
 
-        if (0) // export merged view cells using pvs coding
+        if (1) // export merged view cells using pvs coding
         {
                 mColorCode = 1;