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

Author: hollasch

CHANGELOG.md

@@ -12,8 +12,10 @@ 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)
 
+
 ----------------------------------------------------------------------------------------------------
 # v3.2.0 (2020-07-18)
 

books/RayTracingTheNextWeek.html

@@ -862,6 +862,7 @@
 
     #include "rtweekend.h"
     #include "hittable.h"
+    #include "hittable_list.h"
 
 
     class bvh_node : public hittable {

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>