Merge branch 'master' into dev-minor

hollasch · hollasch · commit 458eaf768731 · 2020-05-16T16:43:19.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,15 +5,30 @@ Change Log -- Ray Tracing in One Weekend
 
 
 ----------------------------------------------------------------------------------------------------
-# v3.1.1 (in progress)
+# v3.1.1 (2020-05-16)
+
+### Common
+  - Change: Camera code improvements to make it more robust when any particular value changes. Also,
+    the code develops in a smoother series of iterations as the book progresses. (#536)
 
 ### _In One Weekend_
+  - Fix: Camera initialization with explicit up vector (#537)
+  - Fix: Changed some text around the camera model and the camera defocus blur model (#536)
   - Change: The C++ `<random>` version of `random_double()` no longer depends on `<functional>`
-    header
+    header.
+  - Change: Refactored `random_scene()`. More named intermediate values, sync'ed with source.
+    (#489)
 
 ### _The Next Week_
+  - Fix: Added clarification about updating lambertian variables from `color` to `solid_color`.
+  - Fix: Corrected for-loop indices (they differed from the version in book 1) in `random_scene()`.
   - Fix: Introduce "Texture Coordinates for Spheres" in Chapter 4 to support (u,v) coordinates in
     `hit_record` (#496)
+  - Fix: Small correction: we now use `std::sort` instead of `qsort` (#490)
+  - Change: Refactored `random_scene()`. More named intermediate values, sync'ed with version in
+    _In One Weekend_ and with source. Added highlight for update from last version in book 1. (#489)
+  - Change: The C++ `<random>` version of `random_double()` no longer depends on `<functional>`
+    header
 
 
 ----------------------------------------------------------------------------------------------------
diff --git a/books/RayTracingInOneWeekend.html b/books/RayTracingInOneWeekend.html
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, 2020-05-03
+                                     Version 3.1.1, 2020-05-16
                                                 <br>
                       Copyright 2018-2020 Peter Shirley. All rights reserved.
 
@@ -108,35 +108,37 @@
     class camera {
         public:
             camera(
-                point3 lookfrom, point3 lookat, vec3 vup,
+                point3 lookfrom,
+                point3 lookat,
+                vec3   vup,
                 double vfov, // vertical field-of-view in degrees
-                double aspect_ratio, double aperture, double focus_dist,
+                double aspect_ratio,
+                double aperture,
+                double focus_dist,
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
-                double t0 = 0, double t1 = 0
+                double t0 = 0,
+                double t1 = 0
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
             ) {
-                origin = lookfrom;
-                lens_radius = aperture / 2;
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
-                time0 = t0;
-                time1 = t1;
-
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
                 auto theta = degrees_to_radians(vfov);
-                auto half_height = tan(theta/2);
-                auto half_width = aspect * half_height;
+                auto h = tan(theta/2);
+                auto viewport_height = 2.0 * h;
+                auto viewport_width = aspect_ratio * viewport_height;
 
                 w = unit_vector(lookfrom - lookat);
                 u = unit_vector(cross(vup, w));
                 v = cross(w, u);
 
-                lower_left_corner = origin
-                                  - half_width*focus_dist*u
-                                  - half_height*focus_dist*v
-                                  - focus_dist*w;
+                origin = lookfrom;
+                horizontal = focus_dist * viewport_width * u;
+                vertical = focus_dist * viewport_height * v;
+                lower_left_corner = origin - horizontal/2 - vertical/2 - focus_dist*w;
 
-                horizontal = 2*half_width*focus_dist*u;
-                vertical = 2*half_height*focus_dist*v;
+                lens_radius = aperture / 2;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
+                time0 = t0;
+                time1 = t1;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
             }
 
             ray get_ray(double s, double t) const {
@@ -292,40 +294,49 @@
     hittable_list random_scene() {
         hittable_list world;
 
-        world.add(make_shared<sphere>(
-            point3(0,-1000,0), 1000, make_shared<lambertian>(color(0.5, 0.5, 0.5))));
+        auto ground_material = make_shared<lambertian>(color(0.5, 0.5, 0.5));
+        world.add(make_shared<sphere>(point3(0,-1000,0), 1000, ground_material));
 
-        int i = 1;
-        for (int a = -10; a < 10; a++) {
-            for (int b = -10; b < 10; b++) {
+        for (int a = -11; a < 11; a++) {
+            for (int b = -11; b < 11; b++) {
                 auto choose_mat = random_double();
                 point3 center(a + 0.9*random_double(), 0.2, b + 0.9*random_double());
-                if ((center - vec3(4, .2, 0)).length() > 0.9) {
+
+                if ((center - vec3(4, 0.2, 0)).length() > 0.9) {
+                    shared_ptr<material> sphere_material;
+
                     if (choose_mat < 0.8) {
                         // diffuse
                         auto albedo = color::random() * color::random();
+                        sphere_material = make_shared<lambertian>(albedo);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
+                        auto center2 = center + vec3(0, random_double(0,.5), 0);
                         world.add(make_shared<moving_sphere>(
-                            center, center + vec3(0, random_double(0,.5), 0), 0.0, 1.0, 0.2,
-                            make_shared<lambertian>(albedo)));
+                            center, center2, 0.0, 1.0, 0.2, sphere_material));
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
                     } else if (choose_mat < 0.95) {
                         // metal
-                        auto albedo = color::random(.5, 1);
-                        auto fuzz = random_double(0, .5);
-                        world.add(
-                            make_shared<sphere>(center, 0.2, make_shared<metal>(albedo, fuzz)));
+                        auto albedo = color::random(0.5, 1);
+                        auto fuzz = random_double(0, 0.5);
+                        sphere_material = make_shared<metal>(albedo, fuzz);
+                        world.add(make_shared<sphere>(center, 0.2, sphere_material));
                     } else {
                         // glass
-                        world.add(make_shared<sphere>(center, 0.2, make_shared<dielectric>(1.5)));
+                        sphere_material = make_shared<dielectric>(1.5);
+                        world.add(make_shared<sphere>(center, 0.2, sphere_material));
                     }
                 }
             }
         }
 
-        world.add(make_shared<sphere>(point3(0, 1, 0), 1.0, make_shared<dielectric>(1.5)));
-        world.add(make_shared<sphere>(
-            point3(-4, 1, 0), 1.0, make_shared<lambertian>(color(0.4, 0.2, 0.1))));
-        world.add(make_shared<sphere>(
-            point3(4, 1, 0), 1.0, make_shared<metal>(color(0.7, 0.6, 0.5), 0.0)));
+        auto material1 = make_shared<dielectric>(1.5);
+        world.add(make_shared<sphere>(point3(0, 1, 0), 1.0, material1));
+
+        auto material2 = make_shared<lambertian>(color(0.4, 0.2, 0.1));
+        world.add(make_shared<sphere>(point3(-4, 1, 0), 1.0, material2));
+
+        auto material3 = make_shared<metal>(color(0.7, 0.6, 0.5), 0.0);
+        world.add(make_shared<sphere>(point3(4, 1, 0), 1.0, material3));
 
         return world;
     }
@@ -802,7 +813,7 @@
 list along one axis. I’ll go for simplicity:
 
   1. randomly choose an axis
-  2. sort the primitives using library qsort
+  2. sort the primitives (`using std::sort`)
   3. put half in each subtree
 
 </div>
@@ -1054,7 +1065,7 @@
 </div>
 
 <div class='together'>
-Where you used to have
+Where you used to have code like this:
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
         ...make_shared<lambertian>(color(0.5, 0.5, 0.5))
@@ -1067,6 +1078,8 @@
         ...make_shared<lambertian>(make_shared<solid_color>(0.5, 0.5, 0.5))
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [lam-textured]: <kbd>[main.cc]</kbd> Lambertian material with texture]
+
+Update all three occurrences of lambertian in the `random_scene()` function in `main.cc`.
 </div>
 
 
@@ -1107,7 +1120,8 @@
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     auto checker = make_shared<checker_texture>(
-        make_shared<solid_color>(0.2, 0.3, 0.1), make_shared<solid_color>(0.9, 0.9, 0.9)
+        make_shared<solid_color>(0.2, 0.3, 0.1),
+        make_shared<solid_color>(0.9, 0.9, 0.9)
     );
 
     world.add(make_shared<sphere>(point3(0,-1000,0), 1000, make_shared<lambertian>(checker)));
@@ -1131,7 +1145,8 @@
         hittable_list objects;
 
         auto checker = make_shared<checker_texture>(
-            make_shared<solid_color>(0.2, 0.3, 0.1), make_shared<solid_color>(0.9, 0.9, 0.9)
+            make_shared<solid_color>(0.2, 0.3, 0.1),
+            make_shared<solid_color>(0.9, 0.9, 0.9)
         );
 
         objects.add(make_shared<sphere>(point3(0,-10, 0), 10, make_shared<lambertian>(checker)));
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, 2020-05-03
+                                     Version 3.1.1, 2020-05-16
                                                 <br>
                       Copyright 2018-2020 Peter Shirley. All rights reserved.
 
diff --git a/src/InOneWeekend/main.cc b/src/InOneWeekend/main.cc
@@ -44,47 +44,45 @@ color ray_color(const ray& r, const hittable& world, int depth) {
 hittable_list random_scene() {
     hittable_list world;
 
-    world.add(
-        make_shared<sphere>(
-            point3(0,-1000,0), 1000, make_shared<lambertian>(color(0.5, 0.5, 0.5)))
-    );
+    auto ground_material = make_shared<lambertian>(color(0.5, 0.5, 0.5));
+    world.add(make_shared<sphere>(point3(0,-1000,0), 1000, ground_material));
 
-    int i = 1;
     for (int a = -11; a < 11; a++) {
         for (int b = -11; b < 11; b++) {
             auto choose_mat = random_double();
             point3 center(a + 0.9*random_double(), 0.2, b + 0.9*random_double());
+
             if ((center - vec3(4, 0.2, 0)).length() > 0.9) {
+                shared_ptr<material> sphere_material;
+
                 if (choose_mat < 0.8) {
                     // diffuse
                     auto albedo = color::random() * color::random();
-                    world.add(
-                        make_shared<sphere>(center, 0.2, make_shared<lambertian>(albedo)));
+                    sphere_material = make_shared<lambertian>(albedo);
+                    world.add(make_shared<sphere>(center, 0.2, sphere_material));
                 } else if (choose_mat < 0.95) {
                     // metal
-                    auto albedo = color::random(.5, 1);
-                    auto fuzz = random_double(0, .5);
-                    world.add(
-                        make_shared<sphere>(center, 0.2, make_shared<metal>(albedo, fuzz)));
+                    auto albedo = color::random(0.5, 1);
+                    auto fuzz = random_double(0, 0.5);
+                    sphere_material = make_shared<metal>(albedo, fuzz);
+                    world.add(make_shared<sphere>(center, 0.2, sphere_material));
                 } else {
                     // glass
-                    world.add(make_shared<sphere>(center, 0.2, make_shared<dielectric>(1.5)));
+                    sphere_material = make_shared<dielectric>(1.5);
+                    world.add(make_shared<sphere>(center, 0.2, sphere_material));
                 }
             }
         }
     }
 
-    world.add(
-        make_shared<sphere>(
-            point3(0, 1, 0), 1.0, make_shared<dielectric>(1.5)));
+    auto material1 = make_shared<dielectric>(1.5);
+    world.add(make_shared<sphere>(point3(0, 1, 0), 1.0, material1));
 
-    world.add(
-        make_shared<sphere>(
-            point3(-4, 1, 0), 1.0, make_shared<lambertian>(color(0.4, 0.2, 0.1))));
+    auto material2 = make_shared<lambertian>(color(0.4, 0.2, 0.1));
+    world.add(make_shared<sphere>(point3(-4, 1, 0), 1.0, material2));
 
-    world.add(
-        make_shared<sphere>(
-            point3(4, 1, 0), 1.0, make_shared<metal>(color(0.7, 0.6, 0.5), 0.0)));
+    auto material3 = make_shared<metal>(color(0.7, 0.6, 0.5), 0.0);
+    world.add(make_shared<sphere>(point3(4, 1, 0), 1.0, material3));
 
     return world;
 }
diff --git a/src/TheNextWeek/main.cc b/src/TheNextWeek/main.cc
@@ -57,46 +57,44 @@ hittable_list random_scene() {
 
     world.add(make_shared<sphere>(point3(0,-1000,0), 1000, make_shared<lambertian>(checker)));
 
-    for (int a = -10; a < 10; a++) {
-        for (int b = -10; b < 10; b++) {
+    for (int a = -11; a < 11; a++) {
+        for (int b = -11; b < 11; b++) {
             auto choose_mat = random_double();
             point3 center(a + 0.9*random_double(), 0.2, b + 0.9*random_double());
-            if ((center - vec3(4, .2, 0)).length() > 0.9) {
+
+            if ((center - vec3(4, 0.2, 0)).length() > 0.9) {
+                shared_ptr<material> sphere_material;
+
                 if (choose_mat < 0.8) {
                     // diffuse
                     auto albedo = color::random() * color::random();
+                    sphere_material = make_shared<lambertian>(make_shared<solid_color>(albedo));
+                    auto center2 = center + vec3(0, random_double(0,.5), 0);
                     world.add(make_shared<moving_sphere>(
-                        center, center + vec3(0, random_double(0,.5), 0), 0.0, 1.0, 0.2,
-                        make_shared<lambertian>(make_shared<solid_color>(albedo))
-                    ));
+                        center, center2, 0.0, 1.0, 0.2, sphere_material));
                 } else if (choose_mat < 0.95) {
                     // metal
-                    auto albedo = color::random(.5, 1);
-                    auto fuzz = random_double(0, .5);
-                    world.add(
-                        make_shared<sphere>(center, 0.2, make_shared<metal>(albedo, fuzz)));
+                    auto albedo = color::random(0.5, 1);
+                    auto fuzz = random_double(0, 0.5);
+                    sphere_material = make_shared<metal>(albedo, fuzz);
+                    world.add(make_shared<sphere>(center, 0.2, sphere_material));
                 } else {
                     // glass
-                    world.add(make_shared<sphere>(center, 0.2, make_shared<dielectric>(1.5)));
+                    sphere_material = make_shared<dielectric>(1.5);
+                    world.add(make_shared<sphere>(center, 0.2, sphere_material));
                 }
             }
         }
     }
 
-    world.add(make_shared<sphere>(point3(0,1,0), 1.0, make_shared<dielectric>(1.5)));
+    auto material1 = make_shared<dielectric>(1.5);
+    world.add(make_shared<sphere>(point3(0, 1, 0), 1.0, material1));
 
-    world.add(
-        make_shared<sphere>(
-            point3(-4,1,0), 1.0,
-            make_shared<lambertian>(make_shared<solid_color>(0.4, 0.2, 0.1))
-        )
-    );
+    auto material2 = make_shared<lambertian>(make_shared<solid_color>(color(0.4, 0.2, 0.1)));
+    world.add(make_shared<sphere>(point3(-4, 1, 0), 1.0, material2));
 
-    world.add(
-        make_shared<sphere>(
-            point3(4,1,0), 1.0, make_shared<metal>(color(0.7, 0.6, 0.5), 0.0)
-        )
-    );
+    auto material3 = make_shared<metal>(color(0.7, 0.6, 0.5), 0.0);
+    world.add(make_shared<sphere>(point3(4, 1, 0), 1.0, material3));
 
     return hittable_list(make_shared<bvh_node>(world, 0.0, 1.0));
 }
@@ -106,7 +104,8 @@ hittable_list two_spheres() {
     hittable_list objects;
 
     auto checker = make_shared<checker_texture>(
-        make_shared<solid_color>(0.2, 0.3, 0.1), make_shared<solid_color>(0.9, 0.9, 0.9)
+        make_shared<solid_color>(0.2, 0.3, 0.1),
+        make_shared<solid_color>(0.9, 0.9, 0.9)
     );
 
     objects.add(make_shared<sphere>(point3(0,-10, 0), 10, make_shared<lambertian>(checker)));
diff --git a/src/common/camera.h b/src/common/camera.h
