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

Timestamp:

01/10/07 21:32:50 (18 years ago)

Author:

bittner

Message:

samplign preprocessor updates, merge

File:

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

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

@@ -697 +697 @@
         int histoMaxVal;
         Environment::GetSingleton()->GetIntValue("Preprocessor.histogram.maxValue", histoMaxVal);
-        maxRenderCost = max((float)histoMaxVal, maxRenderCost);
+        maxRenderCost = min((float)histoMaxVal, maxRenderCost);
 
         
@@ -2039 +2039 @@
                   PvsFilterStatistics fstat = ApplyFilter2(viewcell,
                                                                                                    false,
-                                                                                                   4.0f,
+                                                                                                   1.0f,
                                                                                                    filteredPvs);
                   
@@ -2305 +2305 @@
         {       
           // copy viewcells memory efficiently
+#if VSS_STORE_VIEWCELLS
           ray.mViewCells.reserve(viewCells.size());
           ray.mViewCells = viewCells;
+#else
+          cerr<<"Vss store viewcells not supported."<<endl;
+          exit(1);
+#endif
         }
 
@@ -2966 +2971 @@
 #else
           radius = 0.5f*globalRadius + 0.5f*localRadius;
-          stats.mLocalFilterCount++;
-          stats.mGlobalFilterCount++;
+
+          if (localRadius > globalRadius) 
+                stats.mLocalFilterCount++;
+          else
+                stats.mGlobalFilterCount++;
 #endif