[samplestats] Code cleanup

Author: sherholz-intel

openpgl/data/SampleStatistics.h

@@ -5,8 +5,6 @@
 
 #include "../openpgl_common.h"
 
-#define INTERGER_V2
-
 namespace openpgl
 {
 struct SampleStatistics
@@ -229,11 +227,11 @@ struct IntegerSampleStatistics
     Vector3 sampleBoundsMax{0};
     Vector3 sampleBoundsExtend{0};
     Vector3 invSampleBoundsExtend{0};
-#ifdef INTERGER_V2
+    // sample bound stats to center the collected samples before discretization
     Vector3 sampleBoundsCenter{0};
     Vector3 sampleBoundsHalfExtend{0};
     Vector3 invSampleBoundsHalfExtend{0};
-#endif
+
     IntegerSampleStatistics()
     {
         mean = Point3i(0);
@@ -245,11 +243,9 @@ struct IntegerSampleStatistics
         sampleBoundsMax = Vector3(0);
         sampleBoundsExtend = Vector3(0);
         invSampleBoundsExtend = Vector3(0);
-#ifdef INTERGER_V2
         sampleBoundsCenter = Vector3(0);
         sampleBoundsHalfExtend = Vector3(0);
         invSampleBoundsHalfExtend = Vector3(0);
-#endif
     }
 
     IntegerSampleStatistics(const BBox &bounds)
@@ -270,11 +266,9 @@ struct IntegerSampleStatistics
         sampleBoundsMax = scaledBounds.upper;
         sampleBoundsExtend = scaledBounds.upper - scaledBounds.lower;
         invSampleBoundsExtend = embree::rcp(sampleBoundsExtend);
-#ifdef INTERGER_V2
         sampleBoundsHalfExtend = sampleBoundsExtend * 0.5f;
         invSampleBoundsHalfExtend = embree::rcp(sampleBoundsHalfExtend);
         sampleBoundsCenter = sampleBoundsMin + sampleBoundsHalfExtend;
-#endif
     }
 
     void clear()
@@ -289,21 +283,15 @@ struct IntegerSampleStatistics
         sampleBoundsMax = Vector3(0);
         sampleBoundsExtend = Vector3(0);
         invSampleBoundsExtend = Vector3(0);
-#ifdef INTERGER_V2
         sampleBoundsCenter = Vector3(0);
         sampleBoundsHalfExtend = Vector3(0);
         invSampleBoundsHalfExtend = Vector3(0);
-#endif
     }
 
     inline void addSample(const Point3 sample)
     {
         numSamples++;
-#ifdef INTERGER_V2
-        Point3 tmpSample = ((sample - sampleBoundsCenter) * invSampleBoundsHalfExtend);  //* INTEGER_BINS;
-#else
-        Point3 tmpSample = ((sample - sampleBoundsMin) * invSampleBoundsExtend);  //* INTEGER_BINS;
-#endif
+        Point3 tmpSample = ((sample - sampleBoundsCenter) * invSampleBoundsHalfExtend);
         Vector3 tmpVariance = (tmpSample * tmpSample) * INTEGER_BINS;
         tmpSample *= INTEGER_BINS;
 
@@ -345,15 +333,11 @@ struct IntegerSampleStatistics
             Vector3 sampleVariance = (Vector3(variance.x, variance.y, variance.z) / (INTEGER_BINS)) * invNumSamples;
             sampleVariance -= sampleMean * sampleMean;
             sampleVariance = Vector3(std::fabs(sampleVariance.x), std::fabs(sampleVariance.y), std::fabs(sampleVariance.z));
-#ifdef INTERGER_V2
+
             sampleMean = sampleMean * sampleBoundsHalfExtend;
             sampleMean += sampleBoundsCenter;
             sampleVariance = sampleVariance * (sampleBoundsHalfExtend * sampleBoundsHalfExtend);
-#else
-            sampleMean = sampleMean * sampleBoundsExtend;
-            sampleMean += sampleBoundsMin;
-            sampleVariance = sampleVariance * (sampleBoundsExtend * sampleBoundsExtend);
-#endif
+
             sampleStats.mean = sampleMean;
             sampleStats.numSamples = numSamples;
             sampleStats.sampleVariance = sampleVariance * float(numSamples);