More updates from book 1 progression

Small remaining tweaks to book 1.

In general, update source code to match updates from book 1.

material.h: Fix material metal fuzz missed conversions from
random_in_unit_sphere() to random_unit_vector(). See PR #1159.

Carried source updates from book 1 forward to the other two books'
source code.

Author: hollasch

books/RayTracingInOneWeekend.html

@@ -1128,7 +1128,9 @@
             auto c = oc.length_squared() - radius*radius;
 
             auto discriminant = h*h - a*c;
-            if (discriminant < 0) return false;
+            if (discriminant < 0)
+                return false;
+
             auto sqrtd = sqrt(discriminant);
 
             // Find the nearest root that lies in the acceptable range.
@@ -1436,8 +1438,6 @@
 assumption in mind.
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ delete
-    #include "vec3.h"
-
     #include <iostream>
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [assume-rtw-color]: <kbd>[color.h]</kbd> Assume rtweekend.h inclusion for color.h]
@@ -1490,6 +1490,8 @@
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ delete
     #include "color.h"
+    #include "ray.h"
+    #include "vec3.h"
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
     #include "hittable.h"
     #include "hittable_list.h"
@@ -2042,7 +2044,9 @@
         return distribution(generator);
     }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    [Listing [random-double-alt]: <kbd>[rtweekend.h]</kbd> random_double(), alternate implemenation]
+    [Listing [random-double-alt]: <kbd>[rtweekend.h]</kbd>
+        random_double(), alternate implementation
+    ]
 
 
 Generating Pixels with Multiple Samples
@@ -3147,6 +3151,7 @@
     #include "rtweekend.h"
 
     #include "camera.h"
+    #include "hittable.h"
     #include "hittable_list.h"
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
     #include "material.h"
@@ -3412,7 +3417,7 @@
     auto material_ground = make_shared<lambertian>(color(0.8, 0.8, 0.0));
     auto material_center = make_shared<lambertian>(color(0.1, 0.2, 0.5));
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
-    auto material_left   = make_shared<dielectric>(1.5);
+    auto material_left   = make_shared<dielectric>(1.50);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     auto material_right  = make_shared<metal>(color(0.8, 0.6, 0.2), 1.0);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -3655,9 +3660,9 @@
     ...
     auto material_ground = make_shared<lambertian>(color(0.8, 0.8, 0.0));
     auto material_center = make_shared<lambertian>(color(0.1, 0.2, 0.5));
-    auto material_left   = make_shared<dielectric>(1.50);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
-    auto material_bubble = make_shared<dielectric>(0.67);
+    auto material_left   = make_shared<dielectric>(1.50);
+    auto material_bubble = make_shared<dielectric>(1.00 / 1.50);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     auto material_right  = make_shared<metal>(color(0.8, 0.6, 0.2), 0.0);
 
@@ -3926,8 +3931,8 @@
         auto material_ground = make_shared<lambertian>(color(0.8, 0.8, 0.0));
         auto material_center = make_shared<lambertian>(color(0.1, 0.2, 0.5));
         auto material_left   = make_shared<dielectric>(1.50);
-        auto material_bubble = make_shared<dielectric>(0.67);
-        auto material_right  = make_shared<metal>(color(0.8, 0.6, 0.2), 0.0);
+        auto material_bubble = make_shared<dielectric>(1.00 / 1.50);
+        auto material_right  = make_shared<metal>(color(0.8, 0.6, 0.2), 1.0);
 
         world.add(make_shared<sphere>(point3( 0.0, -100.5, -1.0), 100.0, material_ground));
         world.add(make_shared<sphere>(point3( 0.0,    0.0, -1.2),   0.5, material_center));
@@ -3944,8 +3949,8 @@
         cam.max_depth         = 50;
 
 
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
         cam.vfov     = 90;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
         cam.lookfrom = point3(-2,2,1);
         cam.lookat   = point3(0,0,-1);
         cam.vup      = vec3(0,1,0);
@@ -4201,7 +4206,7 @@
         }
     };
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    [Listing [camera-dof]: <kbd>[camera.h]</kbd> Camera with adjustable depth-of-field (dof)]
+    [Listing [camera-dof]: <kbd>[camera.h]</kbd> Camera with adjustable depth-of-field]
 
 <div class='together'>
 Using a large aperture:

books/RayTracingTheNextWeek.html

@@ -279,7 +279,7 @@
         const override {
             vec3 reflected = reflect(r_in.direction(), rec.normal);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
-            scattered = ray(rec.p, reflected + fuzz*random_in_unit_sphere(), r_in.time());
+            scattered = ray(rec.p, reflected + fuzz*random_unit_vector(), r_in.time());
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
             attenuation = albedo;
             return (dot(scattered.direction(), rec.normal) > 0);

books/RayTracingTheRestOfYourLife.html

@@ -3325,7 +3325,7 @@
             srec.skip_pdf = true;
 
             vec3 reflected = reflect(r_in.direction(), rec.normal);
-            srec.skip_pdf_ray = ray(rec.p, reflected + fuzz*random_in_unit_sphere(), r_in.time());
+            srec.skip_pdf_ray = ray(rec.p, reflected + fuzz*random_unit_vector(), r_in.time());
 
             return true;
         }

src/InOneWeekend/camera.h

@@ -13,12 +13,9 @@
 
 #include "rtweekend.h"
 
-#include "color.h"
 #include "hittable.h"
 #include "material.h"
 
-#include <iostream>
-
 
 class camera {
   public:
@@ -89,7 +86,7 @@ class camera {
         vec3 viewport_u = viewport_width * u;    // Vector across viewport horizontal edge
         vec3 viewport_v = viewport_height * -v;  // Vector down viewport vertical edge
 
-        // Calculate the horizontal and vertical delta vectors to the next pixel.
+        // Calculate the horizontal and vertical delta vectors from pixel to pixel.
         pixel_delta_u = viewport_u / image_width;
         pixel_delta_v = viewport_v / image_height;
 
@@ -119,7 +116,7 @@ class camera {
     }
 
     vec3 sample_square() const {
-        // Returns a random point in the square surrounding a pixel at the origin.
+        // Returns the vector to a random point in the [-.5,-.5]-[+.5,+.5] unit square.
         return vec3(random_double() - 0.5, random_double() - 0.5, 0);
     }
 

src/InOneWeekend/color.h

@@ -11,6 +11,9 @@
 // along with this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 //==============================================================================================
 
+#include "interval.h"
+#include "vec3.h"
+
 using color = vec3;
 
 inline double linear_to_gamma(double linear_component)

src/InOneWeekend/hittable_list.h

@@ -33,7 +33,7 @@ class hittable_list : public hittable {
 
     bool hit(const ray& r, interval ray_t, hit_record& rec) const override {
         hit_record temp_rec;
-        auto hit_anything = false;
+        bool hit_anything = false;
         auto closest_so_far = ray_t.max;
 
         for (const auto& object : objects) {

src/InOneWeekend/main.cc

@@ -12,7 +12,7 @@
 #include "rtweekend.h"
 
 #include "camera.h"
-#include "color.h"
+#include "hittable.h"
 #include "hittable_list.h"
 #include "material.h"
 #include "sphere.h"

src/InOneWeekend/material.h

@@ -57,9 +57,8 @@ class metal : public material {
     bool scatter(const ray& r_in, const hit_record& rec, color& attenuation, ray& scattered)
     const override {
         vec3 reflected = reflect(r_in.direction(), rec.normal);
-        scattered = ray(rec.p, reflected + fuzz*random_in_unit_sphere());
+        scattered = ray(rec.p, reflected + fuzz*random_unit_vector());
         attenuation = albedo;
-
         return (dot(scattered.direction(), rec.normal) > 0);
     }
 

src/InOneWeekend/ray.h

@@ -32,4 +32,5 @@ class ray {
     vec3 dir;
 };
 
+
 #endif

src/InOneWeekend/rtweekend.h

@@ -18,8 +18,9 @@
 
 // C++ Std Usings
 
-using std::shared_ptr;
+using std::fabs;
 using std::make_shared;
+using std::shared_ptr;
 using std::sqrt;
 
 // Constants
@@ -45,6 +46,7 @@ inline double random_double(double min, double max) {
 
 // Common Headers
 
+#include "color.h"
 #include "interval.h"
 #include "ray.h"
 #include "vec3.h"