Merge branch 'dev-patch' into fix-issue-694

Author: estshorter

CHANGELOG.md

@@ -12,6 +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: In `bvh.h`, add missing `hittable_list.h` include (#690)
+  - Fix: Listing 33, 34, 38: Change implicit casts to explicit ones (#692)
   - Fix: Listing 70: Add missing `bvh.h` (#694)
   - Fix: Listing 70 and `main.cc`: Change a fuzz value of a metal sphere to 1.0 which is the maximum value (#694)
 

books/RayTracingTheNextWeek.html

@@ -862,6 +862,7 @@
 
     #include "rtweekend.h"
     #include "hittable.h"
+    #include "hittable_list.h"
 
 
     class bvh_node : public hittable {
@@ -1591,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++)
@@ -1645,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]
@@ -1780,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++

books/acknowledgments.md.html

@@ -53,6 +53,7 @@
   - Phil Cristensen
   - [Ronald Wotzlaw](https://github.com/ronaldfw)
   - [Shaun P. Lee](https://github.com/shaunplee)
+  - [Shota Kawajiri](https://github.com/estshorter)
   - Tatsuya Ogawa
   - Thiago Ize
   - Vahan Sosoyan

src/TheNextWeek/bvh.h

@@ -14,6 +14,7 @@
 #include "rtweekend.h"
 
 #include "hittable.h"
+#include "hittable_list.h"
 
 #include <algorithm>