Merge pull request #367 from RayTracing/tweak-color-calc

Improve color [0,1]->[0,255] mapping

Author: hollasch

books/RayTracingInOneWeekend.html

@@ -1053,12 +1053,6 @@
     inline double ffmin(double a, double b) { return a <= b ? a : b; }
     inline double ffmax(double a, double b) { return a >= b ? a : b; }
 
-    inline double clamp(double x, double min, double max) {
-        if (x < min) return min;
-        if (x > max) return max;
-        return x;
-    }
-
     // Common Headers
 
     #include "common/ray.h"
@@ -1266,9 +1260,9 @@
         auto b = scale * e[2];
 
         // Write the translated [0,255] value of each color component.
-        out << static_cast<int>(256.0 * clamp(r, 0.0, 0.999999)) << ' '
-            << static_cast<int>(256.0 * clamp(g, 0.0, 0.999999)) << ' '
-            << static_cast<int>(256.0 * clamp(b, 0.0, 0.999999)) << '\n';
+        out << static_cast<int>(256 * clamp(r, 0.0, 0.999)) << ' '
+            << static_cast<int>(256 * clamp(g, 0.0, 0.999)) << ' '
+            << static_cast<int>(256 * clamp(b, 0.0, 0.999)) << '\n';
     }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [write-color-clamped]: <kbd>[vec3.h]</kbd> The write_color() function]
@@ -1502,9 +1496,9 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
 
         // Write the translated [0,255] value of each color component.
-        out << static_cast<int>(256.0 * clamp(r, 0.0, 0.999999)) << ' '
-            << static_cast<int>(256.0 * clamp(g, 0.0, 0.999999)) << ' '
-            << static_cast<int>(256.0 * clamp(b, 0.0, 0.999999)) << '\n';
+        out << static_cast<int>(256 * clamp(r, 0.0, 0.999)) << ' '
+            << static_cast<int>(256 * clamp(g, 0.0, 0.999)) << ' '
+            << static_cast<int>(256 * clamp(b, 0.0, 0.999)) << '\n';
     }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [write-color-gamma]: <kbd>[vec3.h]</kbd> write_color(), with gamma correction]

books/RayTracingTheRestOfYourLife.html

@@ -2305,9 +2305,9 @@
         auto b = sqrt(scale * e[2]);
 
         // Write the translated [0,255] value of each color component.
-        out << static_cast<int>(255.999 * clamp(r, 0.0, 1.0)) << ' '
-            << static_cast<int>(255.999 * clamp(g, 0.0, 1.0)) << ' '
-            << static_cast<int>(255.999 * clamp(b, 0.0, 1.0)) << '\n';
+        out << static_cast<int>(256 * clamp(r, 0.0, 0.999)) << ' '
+            << static_cast<int>(256 * clamp(g, 0.0, 0.999)) << ' '
+            << static_cast<int>(256 * clamp(b, 0.0, 0.999)) << '\n';
     }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [write-color-nan]: <kbd>[common/vec3.h]</kbd> NaN-tolerant write_color function]

src/common/vec3.h

@@ -68,9 +68,9 @@ class vec3 {
             auto b = sqrt(scale * e[2]);
 
             // Write the translated [0,255] value of each color component.
-            out << static_cast<int>(255.999 * clamp(r, 0.0, 1.0)) << ' '
-                << static_cast<int>(255.999 * clamp(g, 0.0, 1.0)) << ' '
-                << static_cast<int>(255.999 * clamp(b, 0.0, 1.0)) << '\n';
+            out << static_cast<int>(256 * clamp(r, 0.0, 0.999)) << ' '
+                << static_cast<int>(256 * clamp(g, 0.0, 0.999)) << ' '
+                << static_cast<int>(256 * clamp(b, 0.0, 0.999)) << '\n';
         }
 
         inline static vec3 random() {