Changeset 1811 for GTP/trunk/Lib

Timestamp:

11/27/06 18:33:08 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (1 diff)
• TestPreprocessor.vcproj (modified) (1 diff)
• ViewCellsManager.cpp (modified) (2 diffs)

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

@@ -1556 +1556 @@
                         if (0 &&
                                 (tData.mNode->GetBoundingBox().Size(axis) < Limits::Small))
-                                        nCostRatio[axis] += 9999;
+                        {
+                                nCostRatio[axis] += 9999;
+                        }
 
                         if ((bestAxis == -1) || (nCostRatio[axis] < nCostRatio[bestAxis]))

GTP/trunk/Lib/Vis/Preprocessing/src/TestPreprocessor.vcproj

@@ -206 +206 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="xerces-c_2.lib glew32.lib zdll.lib zziplib.lib devil.lib glut32.lib OpenGL32.Lib glu32.lib Preprocessor.lib RTScene.lib RTWorld.lib QtCore4.lib qtmain.lib QtOpenGL4.lib Qt3Support4.lib QtTest4.lib QtGui4.lib QtGlRenderer.lib"
-                                OutputFile="../bin/release/Preprocessor2.exe"
+                                OutputFile="../bin/release/Preprocessor.exe"
                                 LinkIncremental="1"
                                 AdditionalLibraryDirectories="..\src\GL;..\lib\release;..\..\Preprocessing\lib\release;..\..\..\..\..\..\NonGTP\Boost\lib;..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\..\NonGTP\Devil\lib;..\MultiLevelRayTracing\RTScene\Release;..\MultiLevelRayTracing\RTWorld\Release;"$(QTDIR)\lib";.\QtGlRenderer\Release"

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

@@ -6182 +6182 @@
     cout << "Evaluating view cell partition ... " << endl;
 
+        vector<int> evalStrats;
+
+        // mix of sampling strategies
+        if (0)
+        {
+                evalStrats.push_back(SamplingStrategy::OBJECT_BASED_DISTRIBUTION);
+                evalStrats.push_back(SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION);
+                evalStrats.push_back(SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION);
+
+                Debug << "casting volume strategies" << endl;
+                cout << "casting volume strategies" << endl;
+        }
+        else
+        {
+                //evalStrats.push_back(SamplingStrategy::VIEWSPACE_BORDER_BASED_DISTRIBUTION);
+                evalStrats.push_back(SamplingStrategy::OBJECT_BASED_DISTRIBUTION);
+
+                // ratio 3:1
+                evalStrats.push_back(SamplingStrategy::REVERSE_VIEWSPACE_BORDER_BASED_DISTRIBUTION);
+                //evalStrats.push_back(SamplingStrategy::REVERSE_VIEWSPACE_BORDER_BASED_DISTRIBUTION);
+                //evalStrats.push_back(SamplingStrategy::REVERSE_VIEWSPACE_BORDER_BASED_DISTRIBUTION);
+
+                Debug << "casting surface strategies" << endl;
+                cout << "casting surface strategies" << endl;
+        }
+
         while (castSamples < numSamples)
         {               
@@ -6194 +6220 @@
                 cout << "casting " << samplesPerPass << " samples ... ";
                 Debug << "casting " << samplesPerPass << " samples ... ";
-
-                vector<int>dummyStrat;
-        
-                dummyStrat.push_back(SamplingStrategy::OBJECT_BASED_DISTRIBUTION);
-                dummyStrat.push_back(SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION);
-                dummyStrat.push_back(SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION);
-                //dummyStrat.push_back(SamplingStrategy::REVERSE_VIEWSPACE_BORDER_BASED_DISTRIBUTION);
-
-                CastPassSamples(samplesPerPass, dummyStrat, evaluationSamples);
+        
+                CastPassSamples(samplesPerPass, evalStrats, evaluationSamples);
                 //CastPassSamples(samplesPerPass, mStrategies, evaluationSamples);