Merge pull request #612 from RayTracing/fix-608

Book 3 listg 30: mixture_pdf needs shared_ptr args

Author: hollasch

CHANGELOG.md

@@ -10,6 +10,7 @@ Change Log -- Ray Tracing in One Weekend
   - 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/RayTracingTheRestOfYourLife.html

@@ -1801,9 +1801,9 @@
         shared_ptr<hittable> light_shape =
             make_shared<xz_rect>(213, 343, 227, 332, 554, make_shared<material>());
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
-        hittable_pdf p0(light_shape, 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());