Merge branch 'dev-patch' into dev-minor

hollasch · hollasch · commit c77a07a73b13 · 2020-04-07T12:13:08.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,21 @@ Change Log -- Ray Tracing in One Weekend
 - Fix: Added `t` parameter back into `hit_record` at correct place
 
 
+----------------------------------------------------------------------------------------------------
+# v3.0.2 (in progress)
+
+### Common
+- Change: Every book source now includes from a single common acknowledgments document.
+
+### _In One Weekend_
+- Fix: Correct typo: "consine" to "cosine"
+
+### _The Next Week_
+- Fix: `shared_ptr` dereference and simplify code in `hittable_list::bounding_box()` (#435)
+- Fix: Erroneous en-dash in code block. Replace `–>` with `->` (#439)
+- Fix: Add highlight to new `hittable::bounding_box()` method (#442)
+
+
 ----------------------------------------------------------------------------------------------------
 # v3.0.1 (2020-03-31)
 
diff --git a/books/RayTracingInOneWeekend.html b/books/RayTracingInOneWeekend.html
@@ -7,7 +7,7 @@
                                            Peter Shirley
                           edited by Steve Hollasch and Trevor David Black
                                                 <br>
-                                     Version 3.1.0-wip, 2020-03-31
+                                     Version 3.1.0-wip, 2020-XX-XX
                                                 <br>
                       Copyright 2018-2020 Peter Shirley. All rights reserved.
 
@@ -53,8 +53,8 @@
 I’ll be maintaining a site related to the book including further reading and links to resources at a
 blog https://in1weekend.blogspot.com/ related to this book.
 
-Thanks to everyone who lent a hand on this project. You can find them in the [acknowledgments][] at
-the end of this book.
+Thanks to everyone who lent a hand on this project. You can find them in the acknowledgments section
+at the end of this book.
 
 Let’s get on with it!
 
@@ -2249,7 +2249,7 @@
 The rest of the book will not require you to understand the proof.
 
 We still need to solve for $\cos\theta$. It is well known that the dot product of two vectors can
-be explained in terms of the consine of the angle between them:
+be explained in terms of the cosine of the angle between them:
 
   $$ \mathbf{A} \cdot \mathbf{B} = |\mathbf{A}| |\mathbf{B}| \cos\theta $$
 
@@ -2976,72 +2976,8 @@
 
 
 
-Acknowledgments
-====================================================================================================
-
-<div class="credit-list"> **Original Manuscript Help**
-
-  - Dave Hart
-  - Jean Buckley
-</div>
-
-<div class="credit-list"> **Web Release**
-
-  - Berna Kabadayı
-  - Lorenzo Mancini
-  - Lori Whippler Hollasch
-  - Ronald Wotzlaw
-</div>
-
-<div class="credit-list"> **Corrections and Improvements**
-
-  - Aaryaman Vasishta
-  - Andrew Kensler
-  - Apoorva Joshi
-  - Aras Pranckevičius
-  - Becker
-  - Ben Kerl
-  - Benjamin Summerton
-  - Bennett Hardwick
-  - Dan Drummond
-  - David Chambers
-  - David Hart
-  - Eric Haines
-  - Fabio Sancinetti
-  - Filipe Scur
-  - Frank He
-  - Gerrit Wessendorf
-  - Grue Debry
-  - Ingo Wald
-  - Jason Stone
-  - Jean Buckley
-  - Joey Cho
-  - Lorenzo Mancini
-  - Marcus Ottosson
-  - Matthew Heimlich
-  - Nakata Daisuke
-  - Paul Melis
-  - Phil Cristensen
-  - Ronald Wotzlaw
-  - Tatsuya Ogawa
-  - Thiago Ize
-  - Vahan Sosoyan
-</div>
-
-<div class="credit-list"> **Tools**
-
-  <div class="indented">
-  Thanks to the team at [Limnu][] for help on the figures.
-
-  Huge shout out to Morgan McGuire for his fantastic [Markdeep][] library.
-  </div>
-</div>
-
-
+                               (insert acknowledgments.md.html here)
 
-[acknowledgments]: #acknowledgments
-[Limnu]: https://limnu.com/
-[Markdeep]: https://casual-effects/markdeep/
 
 
 <!-- Markdeep: https://casual-effects.com/markdeep/ -->
diff --git a/books/RayTracingTheNextWeek.html b/books/RayTracingTheNextWeek.html
@@ -7,7 +7,7 @@
                                            Peter Shirley
                           edited by Steve Hollasch and Trevor David Black
                                                 <br>
-                                     Version 3.1.0-wip, 2020-03-31
+                                     Version 3.1.0-wip, 2020-XX-XX
                                                 <br>
                       Copyright 2018-2020 Peter Shirley. All rights reserved.
 
@@ -32,8 +32,8 @@
 you want a weekend project. Order is not very important for the concepts presented in this book, and
 without BVH and Perlin texture you will still get a Cornell Box!
 
-Thanks to everyone who lent a hand on this project. You can find them in the [acknowledgments][] at
-the end of this book.
+Thanks to everyone who lent a hand on this project. You can find them in the acknowledgments section
+at the end of this book.
 
 
 
@@ -650,7 +650,9 @@
         public:
             virtual bool hit(
                 const ray& r, double t_min, double t_max, hit_record& rec) const = 0;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
             virtual bool bounding_box(double t0, double t1, aabb& output_box) const = 0;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     };
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [hittable-bbox]: <kbd>[hittable.h]</kbd> Hittable class with bounding-box]
@@ -701,17 +703,12 @@
         if (objects.empty()) return false;
 
         aabb temp_box;
-        bool first_true = objects[0]->bounding_box(t0, t1, temp_box);
-
-        if (!first_true)
-            return false;
-
-        output_box = temp_box;
+        bool first_box = true;
 
         for (const auto& object : objects) {
-            if (!objects[i]->bounding_box(t0, t1, temp_box))
-                return false;
-            output_box = surrounding_box(output_box, temp_box);
+            if (!object->bounding_box(t0, t1, temp_box)) return false;
+            output_box = first_box ? temp_box : surrounding_box(output_box, temp_box);
+            first_box = false;
         }
 
         return true;
@@ -1019,7 +1016,7 @@
             virtual color value(double u, double v, const point3& p) const {
                 auto sines = sin(10*p.x())*sin(10*p.y())*sin(10*p.z());
                 if (sines < 0)
-                    return odd—>value(u, v, p);
+                    return odd->value(u, v, p);
                 else
                     return even->value(u, v, p);
             }
@@ -2902,73 +2899,15 @@
 
 
 
-Acknowledgments
-====================================================================================================
-
-<div class="credit-list"> **Original Manuscript Help**
-
-  - Dave Hart
-  - Jean Buckley
-</div>
-
-<div class="credit-list"> **Web Release**
-
-  - Berna Kabadayı
-  - Lorenzo Mancini
-  - Lori Whippler Hollasch
-  - Ronald Wotzlaw
-</div>
-
-<div class="credit-list"> **Corrections and Improvements**
-
-  - Aaryaman Vasishta
-  - Andrew Kensler
-  - Apoorva Joshi
-  - Aras Pranckevičius
-  - Becker
-  - Ben Kerl
-  - Benjamin Summerton
-  - Bennett Hardwick
-  - Dan Drummond
-  - David Chambers
-  - David Hart
-  - Eric Haines
-  - Fabio Sancinetti
-  - Filipe Scur
-  - Frank He
-  - Gerrit Wessendorf
-  - Grue Debry
-  - Ingo Wald
-  - Jason Stone
-  - Jean Buckley
-  - Joey Cho
-  - Lorenzo Mancini
-  - Marcus Ottosson
-  - Matthew Heimlich
-  - Nakata Daisuke
-  - Paul Melis
-  - Phil Cristensen
-  - Ronald Wotzlaw
-  - Tatsuya Ogawa
-  - Thiago Ize
-  - Vahan Sosoyan
-</div>
-
-<div class="credit-list"> **Tools**
-
-  <div class="indented">
-  Thanks to the team at [Limnu][] for help on the figures.
-
-  Huge shout out to Morgan McGuire for his fantastic [Markdeep][] library.
-  </div>
-</div>
-
-
+                               (insert acknowledgments.md.html here)
 
+<<<<<<< HEAD
 [acknowledgments]: #acknowledgments
 [Limnu]:           https://limnu.com/
 [Markdeep]:        https://casual-effects/markdeep/
 [stb_image]:       https://github.com/nothings/stb
+=======
+>>>>>>> dev-patch
 
 
 <!-- Markdeep: https://casual-effects.com/markdeep/ -->
diff --git a/books/RayTracingTheRestOfYourLife.html b/books/RayTracingTheRestOfYourLife.html
@@ -7,7 +7,7 @@
                                            Peter Shirley
                           edited by Steve Hollasch and Trevor David Black
                                                 <br>
-                                     Version 3.1.0-wip, 2020-03-31
+                                     Version 3.1.0-wip, 2020-XX-XX
                                                 <br>
                       Copyright 2018-2020 Peter Shirley. All rights reserved.
 
@@ -30,8 +30,8 @@
 
 As before, https://in1weekend.blogspot.com/ will have further readings and references.
 
-Thanks to everyone who lent a hand on this project. You can find them in the [acknowledgments][] at
-the end of this book.
+Thanks to everyone who lent a hand on this project. You can find them in the acknowledgments section
+at the end of this book.
 
 
 
@@ -2512,72 +2512,8 @@
 
 
 
-Acknowledgments
-====================================================================================================
-
-<div class="credit-list"> **Original Manuscript Help**
-
-  - Dave Hart
-  - Jean Buckley
-</div>
-
-<div class="credit-list"> **Web Release**
-
-  - Berna Kabadayı
-  - Lorenzo Mancini
-  - Lori Whippler Hollasch
-  - Ronald Wotzlaw
-</div>
-
-<div class="credit-list"> **Corrections and Improvements**
-
-  - Aaryaman Vasishta
-  - Andrew Kensler
-  - Apoorva Joshi
-  - Aras Pranckevičius
-  - Becker
-  - Ben Kerl
-  - Benjamin Summerton
-  - Bennett Hardwick
-  - Dan Drummond
-  - David Chambers
-  - David Hart
-  - Eric Haines
-  - Fabio Sancinetti
-  - Filipe Scur
-  - Frank He
-  - Gerrit Wessendorf
-  - Grue Debry
-  - Ingo Wald
-  - Jason Stone
-  - Jean Buckley
-  - Joey Cho
-  - Lorenzo Mancini
-  - Marcus Ottosson
-  - Matthew Heimlich
-  - Nakata Daisuke
-  - Paul Melis
-  - Phil Cristensen
-  - Ronald Wotzlaw
-  - Tatsuya Ogawa
-  - Thiago Ize
-  - Vahan Sosoyan
-</div>
-
-<div class="credit-list"> **Tools**
-
-  <div class="indented">
-  Thanks to the team at [Limnu][] for help on the figures.
-
-  Huge shout out to Morgan McGuire for his fantastic [Markdeep][] library.
-  </div>
-</div>
-
-
+                               (insert acknowledgments.md.html here)
 
-[acknowledgments]: #acknowledgments
-[Limnu]: https://limnu.com
-[Markdeep]: https://casual-effects/markdeep/
 
 
 <!-- Markdeep: https://casual-effects.com/markdeep/ -->
diff --git a/books/acknowledgments.md.html b/books/acknowledgments.md.html
diff --git a/src/TheNextWeek/hittable_list.h b/src/TheNextWeek/hittable_list.h
