Changeset 722 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

03/31/06 20:31:55 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (4 diffs)
• ViewCellsManager.h (modified) (1 diff)

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

@@ -1279 +1279 @@
                                         "8000000");
 
+        RegisterOption("ViewCells.Evaluation.samplingType",
+                        optString,
+                        "view_cells_evaluation_sampling_type=",
+                        "box");
+
         RegisterOption("ViewCells.Evaluation.samplesPerPass",
                                         optInt,

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

@@ -97 +97 @@
         
         if (strcmp(buf, "box") == 0)
+        {
                 mSamplingType = Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION;
+        }
         else if (strcmp(buf, "directional") == 0)
+        {
                 mSamplingType = Preprocessor::DIRECTION_BASED_DISTRIBUTION;
+        }
         else 
         {
@@ -106 +110 @@
         }
 
-        environment->GetStringValue("ViewCells.Visualization.colorCode", buf);
+        environment->GetStringValue("ViewCells.Evaluation.samplingType", buf);
+        
+        if (strcmp(buf, "box") == 0)
+        {
+                mEvaluationSamplingType = Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION;
+        }
+        else if (strcmp(buf, "directional") == 0)
+        {
+                mEvaluationSamplingType = Preprocessor::DIRECTION_BASED_DISTRIBUTION;
+        }
+        else 
+        {
+                Debug << "error! wrong sampling type" << endl;
+                exit(0);
+        }
+
+    environment->GetStringValue("ViewCells.Visualization.colorCode", buf);
 
         if (strcmp(buf, "PVS") == 0)
@@ -492 +512 @@
         //VssRayContainer outRays;
         // should directional sampling be used?
-        bool dirSamples = mSamplingType == Preprocessor::DIRECTION_BASED_DISTRIBUTION;
+        bool dirSamples = (mEvaluationSamplingType == Preprocessor::DIRECTION_BASED_DISTRIBUTION);
 
         cout << "Evaluating view cell partition" << endl;
@@ -521 +541 @@
                 VssRayContainer evaluationSamples;
 
-                const int samplingType = mSamplingType;
+                const int samplingType = mEvaluationSamplingType;
                 /*      dirSamples ? 
                                                 Preprocessor::DIRECTION_BASED_DISTRIBUTION :

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

@@ -549 +549 @@
 
         int mSamplingType;
+        int mEvaluationSamplingType;
         int mNumActiveViewCells;
         bool mCompressViewCells;