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

Timestamp:

11/18/06 23:15:55 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -316 +316 @@
 
         // create one third of each type
-        int stype;
-        
-        const int numStrategies = 3;
-
-        stype = SamplingStrategy::OBJECT_BASED_DISTRIBUTION;
-        mPreprocessor->GenerateRays(samplesPerPass / numStrategies, sampleType, simpleRays);
-        
-        stype = SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION;
-        mPreprocessor->GenerateRays(samplesPerPass / numStrategies, sampleType, simpleRays);
-        
-        if (0)
-        {
-                stype = SamplingStrategy::DIRECTION_BASED_DISTRIBUTION;
-                mPreprocessor->GenerateRays(samplesPerPass / numStrategies, sampleType, simpleRays);
-        }
-
-        stype = SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION;
-        mPreprocessor->GenerateRays(samplesPerPass / numStrategies, sampleType, simpleRays);
+        int castRays = 0;
+        
+        vector<int> strategies;
+         
+        strategies.push_back(SamplingStrategy::OBJECT_BASED_DISTRIBUTION);
+        strategies.push_back(SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION);
+        strategies.push_back(SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION);
+
+        const int numRaysPerPass = samplesPerPass / (int)strategies.size();
+
+        vector<int>::const_iterator iit, iit_end = strategies.end();
+
+        for (iit = strategies.begin(); iit != iit_end; ++ iit)
+        {
+                int stype = *iit;
+                const int newRays = 
+                        mPreprocessor->GenerateRays(numRaysPerPass, stype, simpleRays);
+        
+                cout << "cast " << newRays << " rays of strategy " << stype << endl;
+                castRays += newRays;
+        }
 
         cout << "generated " << samplesPerPass << " samples in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
@@ -2708 +2711 @@
                         if (vcValid)
                         {
-                                m.mDiffuseColor.r = 0.5f + RandomValue(0.0f, 0.5f);
-                                m.mDiffuseColor.g = 0.5f + RandomValue(0.0f, 0.5f);
-                                m.mDiffuseColor.b = 0.5f + RandomValue(0.f, 0.5f);
+                                m.mDiffuseColor.r = 0.2f + RandomValue(0.0f, 0.8f);
+                                m.mDiffuseColor.g = 0.2f + RandomValue(0.0f, 0.8f);
+                                m.mDiffuseColor.b = 0.2f + RandomValue(0.0f, 0.8f);
                         }
                         else
@@ -2753 +2756 @@
         // special color code for invalid view cells
         m.mDiffuseColor.r = importance;
-        m.mDiffuseColor.g = 1.0f - m.mDiffuseColor.r;
-        m.mDiffuseColor.b = vcValid ? 1.0f : 0.0f;
+        m.mDiffuseColor.g = vcValid ? 0.0f : 1.0f;
+        m.mDiffuseColor.b = 1.0f - importance;
 
         //Debug << "importance: " << importance << endl;
@@ -5435 +5438 @@
         Exporter *exporter = Exporter::GetExporter("final_view_cells.wrl");
 
-        Vector3 scale(1.0f, 0.9f, 1.0f);
+        Vector3 scale(0.9f, 0.9f, 0.9f);
         if (exporter)
         {