Synchronize book 3 with source

In addition, in book 2 we use `objects` to build up the scene, where
book 3 and source still used the old `world`. This change also
synchronizes between these two versions.

Author: hollasch

books/RayTracingTheRestOfYourLife.html

@@ -757,35 +757,35 @@
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     ...
-    color ray_color(
+    color ray_color(...)
         ...
 
     hittable_list cornell_box() {
-        hittable_list world;
+        hittable_list objects;
 
         auto red   = make_shared<lambertian>(color(.65, .05, .05));
         auto white = make_shared<lambertian>(color(.73, .73, .73));
         auto green = make_shared<lambertian>(color(.12, .45, .15));
         auto light = make_shared<diffuse_light>(color(15, 15, 15));
 
-        world.add(make_shared<yz_rect>(0, 555, 0, 555, 555, green));
-        world.add(make_shared<yz_rect>(0, 555, 0, 555, 0, red));
-        world.add(make_shared<xz_rect>(213, 343, 227, 332, 554, light));
-        world.add(make_shared<xz_rect>(0, 555, 0, 555, 555, white));
-        world.add(make_shared<xz_rect>(0, 555, 0, 555, 0, white));
-        world.add(make_shared<xy_rect>(0, 555, 0, 555, 555, white));
+        objects.add(make_shared<yz_rect>(0, 555, 0, 555, 555, green));
+        objects.add(make_shared<yz_rect>(0, 555, 0, 555, 0, red));
+        objects.add(make_shared<xz_rect>(213, 343, 227, 332, 554, light));
+        objects.add(make_shared<xz_rect>(0, 555, 0, 555, 555, white));
+        objects.add(make_shared<xz_rect>(0, 555, 0, 555, 0, white));
+        objects.add(make_shared<xy_rect>(0, 555, 0, 555, 555, white));
 
         shared_ptr<hittable> box1 = make_shared<box>(point3(0,0,0), point3(165,330,165), white);
         box1 = make_shared<rotate_y>(box1, 15);
         box1 = make_shared<translate>(box1, vec3(265,0,295));
-        world.add(box1);
+        objects.add(box1);
 
         shared_ptr<hittable> box2 = make_shared<box>(point3(0,0,0), point3(165,165,165), white);
         box2 = make_shared<rotate_y>(box2, -18);
         box2 = make_shared<translate>(box2, vec3(130,0,65));
-        world.add(box2);
+        objects.add(box2);
 
-        return world;
+        return objects;
     }
 
     int main() {
@@ -1524,21 +1524,21 @@
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     hittable_list cornell_box() {
-        hittable_list world;
+        hittable_list objects;
 
         auto red   = make_shared<lambertian>(color(.65, .05, .05));
         auto white = make_shared<lambertian>(color(.73, .73, .73));
         auto green = make_shared<lambertian>(color(.12, .45, .15));
         auto light = make_shared<diffuse_light>(color(15, 15, 15));
 
-        world.add(make_shared<yz_rect>(0, 555, 0, 555, 555, green));
-        world.add(make_shared<yz_rect>(0, 555, 0, 555, 0, red));
+        objects.add(make_shared<yz_rect>(0, 555, 0, 555, 555, green));
+        objects.add(make_shared<yz_rect>(0, 555, 0, 555, 0, red));
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
-        world.add(make_shared<flip_face>(make_shared<xz_rect>(213, 343, 227, 332, 554, light)));
+        objects.add(make_shared<flip_face>(make_shared<xz_rect>(213, 343, 227, 332, 554, light)));
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
-        world.add(make_shared<xz_rect>(0, 555, 0, 555, 555, white));
-        world.add(make_shared<xz_rect>(0, 555, 0, 555, 0, white));
-        world.add(make_shared<xy_rect>(0, 555, 0, 555, 555, white));
+        objects.add(make_shared<xz_rect>(0, 555, 0, 555, 555, white));
+        objects.add(make_shared<xz_rect>(0, 555, 0, 555, 0, white));
+        objects.add(make_shared<xy_rect>(0, 555, 0, 555, 555, white));
 
         ...
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2227,23 +2227,23 @@
 </div>
 
 <div class='together'>
-We also need to change the block to metal.
+We also need to change the block to metal. We'll also swap out the short block for a glass sphere.
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
-    hittable_list cornell_box(camera& cam, double aspect) {
-        hittable_list world;
+    hittable_list cornell_box() {
+        hittable_list objects;
 
         auto red   = make_shared<lambertian>(color(.65, .05, .05));
         auto white = make_shared<lambertian>(color(.73, .73, .73));
         auto green = make_shared<lambertian>(color(.12, .45, .15));
         auto light = make_shared<diffuse_light>(color(15, 15, 15));
 
-        world.add(make_shared<yz_rect>(0, 555, 0, 555, 555, green));
-        world.add(make_shared<yz_rect>(0, 555, 0, 555, 0, red));
-        world.add(make_shared<xz_rect>(213, 343, 227, 332, 554, light));
-        world.add(make_shared<xz_rect>(0, 555, 0, 555, 555, white));
-        world.add(make_shared<xz_rect>(0, 555, 0, 555, 0, white));
-        world.add(make_shared<xy_rect>(0, 555, 0, 555, 555, white));
+        objects.add(make_shared<yz_rect>(0, 555, 0, 555, 555, green));
+        objects.add(make_shared<yz_rect>(0, 555, 0, 555, 0, red));
+        objects.add(make_shared<flip_face>(make_shared<xz_rect>(213, 343, 227, 332, 554, light)));
+        objects.add(make_shared<xz_rect>(0, 555, 0, 555, 555, white));
+        objects.add(make_shared<xz_rect>(0, 555, 0, 555, 0, white));
+        objects.add(make_shared<xy_rect>(0, 555, 0, 555, 555, white));
 
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
@@ -2252,25 +2252,14 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
         box1 = make_shared<rotate_y>(box1, 15);
         box1 = make_shared<translate>(box1, vec3(265,0,295));
-        world.add(box1);
-
-        shared_ptr<hittable> box2 = make_shared<box>(point3(0,0,0), point3(165,165,165), white);
-        box2 = make_shared<rotate_y>(box2, -18);
-        box2 = make_shared<translate>(box2, vec3(130,0,65);
-        world.add(box2);
-
-        point3 lookfrom(278, 278, -800);
-        point3 lookat(278, 278, 0);
-        vec3 vup(0, 1, 0);
-        auto dist_to_focus = 10.0;
-        auto aperture = 0.0;
-        auto vfov = 40.0;
-        auto time0 = 0.0;
-        auto time1 = 1.0;
+        objects.add(box1);
 
-        cam = camera(lookfrom, lookat, vup, vfov, aspect, aperture, dist_to_focus, time0, time1);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
+        auto glass = make_shared<dielectric>(1.5);
+        objects.add(make_shared<sphere>(point3(190,90,190), 90 , glass));
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
 
-        return world;
+        return objects;
     }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [scene-cornell-al]: <kbd>[main.cc]</kbd> Cornell box scene with aluminum material]

src/TheNextWeek/main.cc

@@ -150,7 +150,7 @@ hittable_list cornell_box() {
     auto red   = make_shared<lambertian>(color(.65, .05, .05));
     auto white = make_shared<lambertian>(color(.73, .73, .73));
     auto green = make_shared<lambertian>(color(.12, .45, .15));
-    auto light = make_shared<diffuse_light>(color(15,15,15));
+    auto light = make_shared<diffuse_light>(color(15, 15, 15));
 
     objects.add(make_shared<yz_rect>(0, 555, 0, 555, 555, green));
     objects.add(make_shared<yz_rect>(0, 555, 0, 555, 0, red));

src/TheRestOfYourLife/main.cc

@@ -63,29 +63,30 @@ color ray_color(
 
 
 hittable_list cornell_box() {
-    hittable_list world;
+    hittable_list objects;
 
     auto red   = make_shared<lambertian>(color(.65, .05, .05));
     auto white = make_shared<lambertian>(color(.73, .73, .73));
     auto green = make_shared<lambertian>(color(.12, .45, .15));
     auto light = make_shared<diffuse_light>(color(15, 15, 15));
 
-    world.add(make_shared<yz_rect>(0, 555, 0, 555, 555, green));
-    world.add(make_shared<yz_rect>(0, 555, 0, 555, 0, red));
-    world.add(make_shared<flip_face>(make_shared<xz_rect>(213, 343, 227, 332, 554, light)));
-    world.add(make_shared<xz_rect>(0, 555, 0, 555, 555, white));
-    world.add(make_shared<xz_rect>(0, 555, 0, 555, 0, white));
-    world.add(make_shared<xy_rect>(0, 555, 0, 555, 555, white));
+    objects.add(make_shared<yz_rect>(0, 555, 0, 555, 555, green));
+    objects.add(make_shared<yz_rect>(0, 555, 0, 555, 0, red));
+    objects.add(make_shared<flip_face>(make_shared<xz_rect>(213, 343, 227, 332, 554, light)));
+    objects.add(make_shared<xz_rect>(0, 555, 0, 555, 555, white));
+    objects.add(make_shared<xz_rect>(0, 555, 0, 555, 0, white));
+    objects.add(make_shared<xy_rect>(0, 555, 0, 555, 555, white));
 
-    shared_ptr<hittable> box1 = make_shared<box>(point3(0,0,0), point3(165,330,165), white);
+    shared_ptr<material> aluminum = make_shared<metal>(color(0.8, 0.85, 0.88), 0.0);
+    shared_ptr<hittable> box1 = make_shared<box>(point3(0,0,0), point3(165,330,165), aluminum);
     box1 = make_shared<rotate_y>(box1, 15);
     box1 = make_shared<translate>(box1, vec3(265,0,295));
-    world.add(box1);
+    objects.add(box1);
 
     auto glass = make_shared<dielectric>(1.5);
-    world.add(make_shared<sphere>(point3(190,90,190), 90 , glass));
+    objects.add(make_shared<sphere>(point3(190,90,190), 90 , glass));
 
-    return world;
+    return objects;
 }
 
 
@@ -120,7 +121,7 @@ int main() {
     auto time1 = 1.0;
 
     camera cam(lookfrom, lookat, vup, vfov, aspect_ratio, aperture, dist_to_focus, time0, time1);
-    
+
     // Render
 
     std::cout << "P3\n" << image_width << ' ' << image_height << "\n255\n";