Merge branch 'dev-patch' into dev-patch

Author: hollasch

CHANGELOG.md

@@ -5,11 +5,14 @@ Change Log -- Ray Tracing in One Weekend
 
 ### _In One Weekend_
   - Fix: Correct typo: "Intance Translation" -> "Instance Translation"
+  - Fix: Corrected geometry type when computing distance between two points, final scene (#609)
 
 ### _The Rest of Your Life_
   - Fix: Missing closing parenthesis in listing 10 (#603)
   - Fix: Tiny improvements to the lambertian::scatter() development (#604)
   - Fix: Correct geometry type and unit vector method in `ray_color()`, listing 20 (#606)
+  - Fix: Listing 30, `mixture_pdf` needs `shared_ptr` arguments (#608)
+  - Fix: Listing 28, 30: `light_shape` should have default material, not `0` (#607)
 
 
 ----------------------------------------------------------------------------------------------------

books/RayTracingInOneWeekend.html

@@ -2889,7 +2889,7 @@
                 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) {
+                if ((center - point3(4, 0.2, 0)).length() > 0.9) {
                     shared_ptr<material> sphere_material;
 
                     if (choose_mat < 0.8) {

books/RayTracingTheRestOfYourLife.html

@@ -1710,7 +1710,8 @@
 
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
-        shared_ptr<hittable> light_shape = make_shared<xz_rect>(213, 343, 227, 332, 554, 0);
+        shared_ptr<hittable> light_shape =
+            make_shared<xz_rect>(213, 343, 227, 332, 554, shared_ptr<material>());
         hittable_pdf p(light_shape, rec.p);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
 
@@ -1797,13 +1798,12 @@
         if (!rec.mat_ptr->scatter(r, rec, albedo, scattered, pdf_val))
             return emitted;
 
-
+        shared_ptr<hittable> light_shape =
+            make_shared<xz_rect>(213, 343, 227, 332, 554, make_shared<material>());
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
-        shared_ptr<hittable> light_ptr = make_shared<xz_rect>(213, 343, 227, 332, 554, 0);
-        hittable_pdf p0(light_ptr, rec.p);
-
-        cosine_pdf p1(rec.normal);
-        mixture_pdf p(&p0, &p1);
+        auto p0 = make_shared<hittable_pdf>(light_shape, rec.p);
+        auto p1 = make_shared<cosine_pdf>(rec.normal);
+        mixture_pdf p(p0, p1);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
 
         scattered = ray(rec.p, p.generate(), r.time());

src/InOneWeekend/main.cc

@@ -52,7 +52,7 @@ hittable_list random_scene() {
             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) {
+            if ((center - point3(4, 0.2, 0)).length() > 0.9) {
                 shared_ptr<material> sphere_material;
 
                 if (choose_mat < 0.8) {