Merge pull request #707 from estshorter/fix-issue-692

Fix: Listing 33, 34, 38: Change implicit casts to explicit ones (#692)

Author: hollasch

CHANGELOG.md

@@ -12,7 +12,8 @@ Change Log -- Ray Tracing in One Weekend
 
 ### _The Next Week_
   - Delete: remove unused u,v,w variables in initial `perlin::noise()` function (#684)
-  - Fix: Listing 15 and `bvh.h`: Add missing `hittable_list.h` include (#690)
+  - Fix: Listing 15: In `bvh.h`, add missing `hittable_list.h` include (#690)
+  - Fix: Listing 33, 34, 38: Change implicit casts to explicit ones (#692)
 
 
 ----------------------------------------------------------------------------------------------------

books/RayTracingTheNextWeek.html

@@ -1592,9 +1592,9 @@
                 auto v = p.y() - floor(p.y());
                 auto w = p.z() - floor(p.z());
 
-                int i = floor(p.x());
-                int j = floor(p.y());
-                int k = floor(p.z());
+                auto i = static_cast<int>(floor(p.x()));
+                auto j = static_cast<int>(floor(p.y()));
+                auto k = static_cast<int>(floor(p.z()));
                 double c[2][2][2];
 
                 for (int di=0; di < 2; di++)
@@ -1646,9 +1646,9 @@
                 w = w*w*(3-2*w);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
 
-                int i = floor(p.x());
-                int j = floor(p.y());
-                int k = floor(p.z());
+                auto i = static_cast<int>(floor(p.x()));
+                auto j = static_cast<int>(floor(p.y()));
+                auto k = static_cast<int>(floor(p.z()));
                 ...
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [perlin-smoothed]: <kbd>[perlin.h]</kbd> Perlin smoothed]
@@ -1781,9 +1781,9 @@
                 auto v = p.y() - floor(p.y());
                 auto w = p.z() - floor(p.z());
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
-                int i = floor(p.x());
-                int j = floor(p.y());
-                int k = floor(p.z());
+                auto i = static_cast<int>(floor(p.x()));
+                auto j = static_cast<int>(floor(p.y()));
+                auto k = static_cast<int>(floor(p.z()));
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
                 vec3 c[2][2][2];
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++