Merge branch 'dev-patch' into rtweekend-include

Author: hollasch

CHANGELOG.md

@@ -4,8 +4,13 @@ Change Log -- Ray Tracing in One Weekend
 # v3.2.1 (in progress)
 
 ### _In One Weekend_
+  - Delete: remove premature `cstdlib` include; not needed until we use `rand()` (#687)
   - Fix: replace old anti-alias result image with before-and-after image (#679)
   - Fix: Listing 29: Added missing `rtweekend.h` include (#691)
+  - Fix: undefined `vup` variable in camera definition (#686)
+
+### _The Next Week_
+  - Delete: remove unused u,v,w variables in initial `perlin::noise()` function (#684)
 
 
 ----------------------------------------------------------------------------------------------------
@@ -221,7 +226,7 @@ adopting, but may warrant comparison with any current projects.
 
 ### Common
   - Fix: Display rendered images as pixelated instead of smoothed (#179)
-  - Deleted: delete old README files specific to each book (#410)
+  - Delete: delete old README files specific to each book (#410)
 
 ### _In One Weekend_
   - Fix: Remove duplicated text and reword on the camera up vector (#420)
@@ -317,7 +322,7 @@ patch-level (fix) changes and some minor-level (addition) changes.
 ### _The Rest of Your Life_
   - Change: Improved naming of auxilliary programs in _The Rest of Your Life_ source
   - Fix: Delete unused variable `p` in main() (#317)
-  - Deleted: Several unused source files from `src/TheRestOfYourLife`
+  - Delete: Several unused source files from `src/TheRestOfYourLife`
 
 
 ----------------------------------------------------------------------------------------------------

books/RayTracingInOneWeekend.html

@@ -1183,7 +1183,6 @@
     #define RTWEEKEND_H
 
     #include <cmath>
-    #include <cstdlib>
     #include <limits>
     #include <memory>
 
@@ -2848,7 +2847,7 @@
 And we can change field of view:
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
-    camera cam(point3(-2,2,1), point3(0,0,-1), vup, 20, aspect_ratio);
+    camera cam(point3(-2,2,1), point3(0,0,-1), vec3(0,1,0), 20, aspect_ratio);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [change-field-view]: <kbd>[main.cc]</kbd> Change field of view]
 

books/RayTracingTheNextWeek.html

@@ -7,7 +7,7 @@
                                          [Peter Shirley][]
                       edited by [Steve Hollasch][] and [Trevor David Black][]
                                                 <br>
-                                     Version 3.2.0, 2020-07-18
+                                     Version 3.2.1, 2020-XX-XX
                                                 <br>
                       Copyright 2018-2020 Peter Shirley. All rights reserved.
 
@@ -1445,10 +1445,6 @@
             }
 
             double noise(const point3& p) const {
-                auto u = p.x() - floor(p.x());
-                auto v = p.y() - floor(p.y());
-                auto w = p.z() - floor(p.z());
-
                 auto i = static_cast<int>(4*p.x()) & 255;
                 auto j = static_cast<int>(4*p.y()) & 255;
                 auto k = static_cast<int>(4*p.z()) & 255;
@@ -1590,10 +1586,10 @@
         public:
             ...
             double noise(point3 vec3& p) const {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
                 auto u = p.x() - floor(p.x());
                 auto v = p.y() - floor(p.y());
                 auto w = p.z() - floor(p.z());
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
 
                 int i = floor(p.x());
                 int j = floor(p.y());
@@ -3358,8 +3354,8 @@
   - **Title (book)**: “Ray Tracing: The Next Week”
   - **Author**: Peter Shirley
   - **Editors**: Steve Hollasch, Trevor David Black
-  - **Version/Edition**: v3.2.0
-  - **Date**: 2020-07-18
+  - **Version/Edition**: v3.2.1
+  - **Date**: 2020-XX-XX
   - **URL (series)**: https://raytracing.github.io/
   - **URL (book)**: https://raytracing.github.io/books/RayTracingTheNextWeek.html