theNextWeek: Add custom scene image parameters

Affects scenes 5-8

Resolves #650

Author: hollasch

CHANGELOG.md

@@ -52,8 +52,9 @@ Change Log -- Ray Tracing in One Weekend
   - Delete: scenes 7 & 9 from the original (`cornell_balls` and `cornell_final`), as these were not
     covered in the book. Made the source and book consistent with each other. There are now a total
     of eight scenes for the second book (#653, #620)
-  - Change: Updated most rendered images for book 2: 2.01-2.03, 2.07-2.13, 2.15-2.22.
   - Change: Listing 10: Separate out world & camera definitions in main (#646)
+  - Change: Updated most rendered images for book 2: 2.01-2.03, 2.07-2.13, 2.15-2.22.
+  - Change: Scenes get custom image parameters (#650)
   - Fix: Reduced code duplication in `dielectric::scatter()` function
   - Fix: "Intance" typo in Chapter 8.1 to "Instance" (#629)
   - Fix: Listing 7: Show reverted viewing parameters from book 1 final scene

books/RayTracingTheNextWeek.html

@@ -375,12 +375,9 @@
 
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
-        const auto aspect_ratio = 16.0 / 9.0;
-        const int image_width = 400;
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
-        const int image_height = static_cast<int>(image_width / aspect_ratio);
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
-        const int samples_per_pixel = 100;
+        auto aspect_ratio = 16.0 / 9.0;
+        int image_width = 400;
+        int samples_per_pixel = 100;
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
         const int max_depth = 50;
 
@@ -393,9 +390,10 @@
         vec3 vup(0,1,0);
         auto dist_to_focus = 10.0;
         auto aperture = 0.1;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
+        int image_height = static_cast<int>(image_width / aspect_ratio);
 
 
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
         camera cam(lookfrom, lookat, vup, 20, aspect_ratio, aperture, dist_to_focus, 0.0, 1.0);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [scene-spheres-moving-camera]: <kbd>[main.cc]</kbd> Viewing parameters]
@@ -1364,6 +1362,7 @@
 
     vec3 vup(0,1,0);
     auto dist_to_focus = 10.0;
+    int image_height = static_cast<int>(image_width / aspect_ratio);
 
     camera cam(lookfrom, lookat, vup, vfov, aspect_ratio, aperture, dist_to_focus, 0.0, 1.0);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
@@ -2483,16 +2482,13 @@
     ...
     int main() {
         ...
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
-        const int samples_per_pixel = 400;
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
-        ...
         switch (0) {
             ...
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
             default:
             case 5:
                 world = simple_light();
+                samples_per_pixel = 400;
                 background = color(0,0,0);
                 lookfrom = point3(26,3,6);
                 lookat = point3(0,2,0);
@@ -2655,11 +2651,6 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
 
     int main() {
-        // Image
-
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
-        const auto aspect_ratio = 1.0;
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
         ...
         switch (0) {
             ...
@@ -2675,6 +2666,9 @@
             default:
             case 6:
                 world = cornell_box();
+                aspect_ratio = 1.0;
+                image_width = 600;
+                samples_per_pixel = 200;
                 background = color(0,0,0);
                 lookfrom = point3(278, 278, -800);
                 lookat = point3(278, 278, 0);
@@ -3219,6 +3213,9 @@
             default:
             case 7:
                 world = cornell_smoke();
+                aspect_ratio = 1.0;
+                image_width = 600;
+                samples_per_pixel = 200;
                 lookfrom = point3(278, 278, -800);
                 lookat = point3(278, 278, 0);
                 vfov = 40.0;
@@ -3312,23 +3309,20 @@
     }
 
     int main() {
-        // Image
-
-        const auto aspect_ratio = 1.0;
-        const int image_width = 800;
-        const int image_height = static_cast<int>(image_width / aspect_ratio);
-        const int samples_per_pixel = 10000;
-        const int max_depth = 50;
         ...
-
-        default:
-        case 8:
-            world = final_scene();
-            background = color(0,0,0);
-            lookfrom = point3(478, 278, -600);
-            lookat = point3(278, 278, 0);
-            vfov = 40.0;
-            break;
+        switch (0) {
+            ...
+            default:
+            case 8:
+                world = final_scene();
+                aspect_ratio = 1.0;
+                image_width = 800;
+                samples_per_pixel = 10000;
+                background = color(0,0,0);
+                lookfrom = point3(478, 278, -600);
+                lookat = point3(278, 278, 0);
+                vfov = 40.0;
+                break;
         ...
     }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

images/img-2.20-cornell-standard.png

@@ -272,9 +272,8 @@ int main() {
 
     // Image
 
-    const auto aspect_ratio = 16.0 / 9.0;
-    const int image_width = 400;
-    const int image_height = static_cast<int>(image_width / aspect_ratio);
+    auto aspect_ratio = 16.0 / 9.0;
+    int image_width = 400;
     int samples_per_pixel = 100;
     int max_depth = 50;
 
@@ -324,6 +323,7 @@ int main() {
 
         case 5:
             world = simple_light();
+            samples_per_pixel = 400;
             lookfrom = point3(26,3,6);
             lookat = point3(0,2,0);
             vfov = 20.0;
@@ -332,20 +332,29 @@ int main() {
         default:
         case 6:
             world = cornell_box();
+            aspect_ratio = 1.0;
+            image_width = 600;
+            samples_per_pixel = 200;
             lookfrom = point3(278, 278, -800);
             lookat = point3(278, 278, 0);
             vfov = 40.0;
             break;
 
         case 7:
             world = cornell_smoke();
+            aspect_ratio = 1.0;
+            image_width = 600;
+            samples_per_pixel = 200;
             lookfrom = point3(278, 278, -800);
             lookat = point3(278, 278, 0);
             vfov = 40.0;
             break;
 
         case 8:
             world = final_scene();
+            aspect_ratio = 1.0;
+            image_width = 800;
+            samples_per_pixel = 10000;
             lookfrom = point3(478, 278, -600);
             lookat = point3(278, 278, 0);
             vfov = 40.0;
@@ -354,8 +363,9 @@ int main() {
 
     // Camera
 
-    vec3 vup(0,1,0);
-    auto dist_to_focus = 10.0;
+    const vec3 vup(0,1,0);
+    const auto dist_to_focus = 10.0;
+    const int image_height = static_cast<int>(image_width / aspect_ratio);
 
     camera cam(lookfrom, lookat, vup, vfov, aspect_ratio, aperture, dist_to_focus, 0.0, 1.0);