Merge pull request #667 from RayTracing/drop-scenes-79

Pull scenes 7 & 9 from book 2

Author: hollasch

CHANGELOG.md

@@ -9,17 +9,6 @@ Change Log -- Ray Tracing in One Weekend
   - Change: Added header guards to the text of all three books whenever a new header file was
     introduced
 
-### _The Next Week_
-  - Removed: Deleted the section covering the old `flip_face` class, renumbered images as this
-    eliminated the rendering with missing Cornell box faces (#482, #661)
-  - Change: Renamed and explicitly numbered book images and figures (#495)
-  - Fix: Reduced code duplication in dielectric::scatter() function
-  - New: Added alternative constructors that take color arguments in addition to the constructors
-    that take `shared_ptr<texture>` arguments, simplifying calling code. This applies to the
-    following classes: `checker_texture`, `constant_medium`, `diffuse_light`, and `lambertian`.
-    (#516)
-  - Fix: "Intance" typo in Chapter 8.1 to "Instance" (#629)
-
 ### _In One Weekend_
   - Change: Updated all rendered images except for 1.13, 1.14 (#179, #547, #548, #549, #550, #551,
     #552, #553, #554, #555, #556, #557, #560, #561, #562, #563, #564, #565, #566)
@@ -46,9 +35,20 @@ Change Log -- Ray Tracing in One Weekend
   - New: Add new isotropic constructor taking color argument (#644)
 
 ### _The Next Week_
+  - Removed: Deleted the section covering the old `flip_face` class, renumbered images as this
+    eliminated the rendering with missing Cornell box faces (#482, #661)
+  - Change: Renamed and explicitly numbered book images and figures (#495)
+  - Fix: Reduced code duplication in dielectric::scatter() function
+  - New: Added alternative constructors that take color arguments in addition to the constructors
+    that take `shared_ptr<texture>` arguments, simplifying calling code. This applies to the
+    following classes: `checker_texture`, `constant_medium`, `diffuse_light`, and `lambertian`.
+    (#516)
+  - Fix: "Intance" typo in Chapter 8.1 to "Instance" (#629)
   - Fix: Listing 7: Show reverted viewing parameters from book 1 final scene
   - Change: Listing 10: Separate out world & camera definitions in main (#646)
   - New: Add new isotropic constructor taking color argument (#644)
+  - Removed: scenes 7 & 9 from the original (`cornell_balls` and `cornell_final`). There are now a
+    total of eight scenes for the second book (#653, #620)
 
 
 ----------------------------------------------------------------------------------------------------

books/RayTracingTheNextWeek.html

@@ -2969,7 +2969,7 @@
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     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<rotate_y>(box1, 15);
     box1 = make_shared<translate>(box1, vec3(265,0,295));
     objects.add(box1);
 
@@ -3180,7 +3180,7 @@
         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<rotate_y>(box1, 15);
         box1 = make_shared<translate>(box1, vec3(265,0,295));
 
         shared_ptr<hittable> box2 = make_shared<box>(point3(0,0,0), point3(165,165,165), white);
@@ -3192,6 +3192,22 @@
 
         return objects;
     }
+
+    ...
+
+    int main() {
+        ...
+        switch (0) {
+            ...
+            default:
+            case 7:
+                world = cornell_smoke();
+                lookfrom = point3(278, 278, -800);
+                lookat = point3(278, 278, 0);
+                vfov = 40.0;
+                break;
+        ...
+    }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [cornell-smoke]: <kbd>[main.cc]</kbd> Cornell box, with smoke]
 </div>

src/TheNextWeek/main.cc

@@ -160,7 +160,7 @@ hittable_list cornell_box() {
     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<rotate_y>(box1, 15);
     box1 = make_shared<translate>(box1, vec3(265,0,295));
     objects.add(box1);
 
@@ -173,34 +173,6 @@ hittable_list cornell_box() {
 }
 
 
-hittable_list cornell_balls() {
-    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(5, 5, 5));
-
-    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>(113, 443, 127, 432, 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));
-
-    auto boundary = make_shared<sphere>(point3(160,100,145), 100, make_shared<dielectric>(1.5));
-    objects.add(boundary);
-    objects.add(make_shared<constant_medium>(boundary, 0.1, color(1,1,1)));
-
-    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));
-    objects.add(box1);
-
-    return objects;
-}
-
-
 hittable_list cornell_smoke() {
     hittable_list objects;
 
@@ -217,7 +189,7 @@ hittable_list cornell_smoke() {
     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<rotate_y>(box1, 15);
     box1 = make_shared<translate>(box1, vec3(265,0,295));
 
     shared_ptr<hittable> box2 = make_shared<box>(point3(0,0,0), point3(165,165,165), white);
@@ -231,37 +203,6 @@ hittable_list cornell_smoke() {
 }
 
 
-hittable_list cornell_final() {
-    hittable_list objects;
-
-    auto pertext = make_shared<noise_texture>(0.1);
-
-    auto mat = make_shared<lambertian>(make_shared<image_texture>("earthmap.jpg"));
-
-    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(7, 7, 7));
-
-    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>(123, 423, 147, 412, 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> boundary2 =
-        make_shared<box>(point3(0,0,0), point3(165,165,165), make_shared<dielectric>(1.5));
-    boundary2 = make_shared<rotate_y>(boundary2, -18);
-    boundary2 = make_shared<translate>(boundary2, vec3(130,0,65));
-
-    objects.add(boundary2);
-    objects.add(make_shared<constant_medium>(boundary2, 0.2, color(0.9, 0.9, 0.9)));
-
-    return objects;
-}
-
-
 hittable_list final_scene() {
     hittable_list boxes1;
     auto ground = make_shared<lambertian>(color(0.48, 0.83, 0.53));
@@ -397,27 +338,13 @@ int main() {
             break;
 
         case 7:
-            world = cornell_balls();
-            lookfrom = point3(278, 278, -800);
-            lookat = point3(278, 278, 0);
-            vfov = 40.0;
-            break;
-
-        case 8:
             world = cornell_smoke();
             lookfrom = point3(278, 278, -800);
             lookat = point3(278, 278, 0);
             vfov = 40.0;
             break;
 
-        case 9:
-            world = cornell_final();
-            lookfrom = point3(278, 278, -800);
-            lookat = point3(278, 278, 0);
-            vfov = 40.0;
-            break;
-
-        case 10:
+        case 8:
             world = final_scene();
             lookfrom = point3(478, 278, -600);
             lookat = point3(278, 278, 0);