Move aspect_ratio to image parameters

Author: hollasch

books/RayTracingInOneWeekend.html

@@ -2452,7 +2452,8 @@
 This allows us to change the viewpoint:
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
-    auto aspect_ratio = double(image_width) / image_height;
+    const auto aspect_ratio = double(image_width) / image_height;
+    ...
     camera cam(vec3(-2,2,1), vec3(0,0,-1), vup, 90, aspect_ratio);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [scene-free-view]: <kbd>[main.cc]</kbd> Scene with alternate viewpoint]
@@ -2586,13 +2587,14 @@
 Using a big aperture:
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
+    const auto aspect_ratio = double(image_width) / image_height;
+    ...
     vec3 lookfrom(3,3,2);
     vec3 lookat(0,0,-1);
     vec3 vup(0,1,0);
     auto dist_to_focus = (lookfrom-lookat).length();
     auto aperture = 2.0;
 
-    auto aspect_ratio = double(image_width) / image_height;
     camera cam(lookfrom, lookat, vup, 20, aspect_ratio, aperture, dist_to_focus);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [scene-camera-dof]: <kbd>[main.cc]</kbd> Scene camera with depth-of-field]

books/RayTracingTheNextWeek.html

@@ -318,13 +318,14 @@
 And with these viewing parameters:
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
+    const auto aspect_ratio = double(image_width) / image_height;
+    ...
     vec3 lookfrom(13,2,3);
     vec3 lookat(0,0,0);
     vec3 vup(0,1,0);
     auto dist_to_focus = 10.0;
     auto aperture = 0.0;
 
-    auto aspect_ratio = double(image_width) / image_height;
     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]
@@ -1009,13 +1010,14 @@
 With camera:
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
+    const auto aspect_ratio = double(image_width) / image_height;
+    ...
     vec3 lookfrom(13,2,3);
     vec3 lookat(0,0,0);
     vec3 vup(0,1,0);
     auto dist_to_focus = 10.0;
     auto aperture = 0.0;
 
-    auto aspect_ratio = double(image_width) / image_height;
     camera cam(lookfrom, lookat, vup, 20, aspect_ratio, aperture, dist_to_focus, 0.0, 1.0);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [scene-two-checker-view]: <kbd>[main.cc]</kbd> Viewing parameters]
@@ -1165,13 +1167,14 @@
 With the same camera as before:
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
+    const auto aspect_ratio = double(image_width) / image_height;
+    ...
     vec3 lookfrom(13,2,3);
     vec3 lookat(0,0,0);
     vec3 vup(0,1,0);
     auto dist_to_focus = 10.0;
     auto aperture = 0.0;
 
-    auto aspect_ratio = double(image_width) / image_height;
     camera cam(lookfrom, lookat, vup, 20, aspect_ratio, aperture, dist_to_focus, 0.0, 1.0);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [scene-perlin-view]: <kbd>[main.cc]</kbd> Viewing parameters]
@@ -1989,16 +1992,16 @@
 And the view info:
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
+    const auto aspect_ratio = double(image_width) / image_height;
+    ...
     vec3 lookfrom(278, 278, -800);
     vec3 lookat(278,278,0);
     vec3 vup(0,1,0);
     auto dist_to_focus = 10.0;
     auto aperture = 0.0;
     auto vfov = 40.0;
 
-    auto aspect_ratio = double(image_width) / image_height;
-    camera cam(
-        lookfrom, lookat, vup, vfov, aspect_ratio, aperture, dist_to_focus, 0.0, 1.0);
+    camera cam(lookfrom, lookat, vup, vfov, aspect_ratio, aperture, dist_to_focus, 0.0, 1.0);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [cornell-box-view]: <kbd>[main.cc]</kbd> Viewing parameters]
 </div>

src/InOneWeekend/main.cc

@@ -86,6 +86,7 @@ int main() {
     const int image_height = 800;
     const int samples_per_pixel = 10;
     const int max_depth = 50;
+    const auto aspect_ratio = double(image_width) / image_height;
 
     std::cout << "P3\n" << image_width << ' ' << image_height << "\n255\n";
 
@@ -97,7 +98,6 @@ int main() {
     auto dist_to_focus = 10.0;
     auto aperture = 0.1;
 
-    auto aspect_ratio = double(image_width) / image_height;
     camera cam(lookfrom, lookat, vup, 20, aspect_ratio, aperture, dist_to_focus);
 
     for (int j = image_height-1; j >= 0; --j) {

src/TheNextWeek/main.cc

@@ -350,6 +350,7 @@ int main() {
     const int image_height = 600;
     const int samples_per_pixel = 100;
     const int max_depth = 50;
+    const auto aspect_ratio = double(image_width) / image_height;
 
     hittable_list world;
 
@@ -363,7 +364,6 @@ int main() {
     auto aperture = 0.0;
     auto vfov = 40.0;
 
-    auto aspect_ratio = double(image_width) / image_height;
     camera cam(lookfrom, lookat, vup, vfov, aspect_ratio, aperture, dist_to_focus, 0.0, 1.0);
 
     switch (0) {

src/TheRestOfYourLife/main.cc

@@ -95,11 +95,11 @@ int main() {
     const int image_height = 600;
     const int samples_per_pixel = 100;
     const int max_depth = 50;
+    const auto aspect_ratio = double(image_width) / image_height;
 
     std::cout << "P3\n" << image_width << ' ' << image_height << "\n255\n";
 
     camera cam;
-    auto aspect_ratio = double(image_width) / image_height;
     auto world = cornell_box(cam, aspect_ratio);
 
     auto lights = make_shared<hittable_list>();