Refactor: define & use camera up vector

Author: hollasch

books/RayTracingInOneWeekend.html

@@ -2450,7 +2450,7 @@
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     auto aspect_ratio = double(image_width) / image_height;
-    camera cam(vec3(-2,2,1), vec3(0,0,-1), vec3(0,1,0), 90, aspect_ratio);
+    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]
 
@@ -2585,11 +2585,12 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     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, vec3(0,1,0), 20, aspect_ratio, aperture, dist_to_focus);
+    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

@@ -320,11 +320,12 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     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, vec3(0,1,0), 20, aspect_ratio, aperture, dist_to_focus, 0.0, 1.0);
+    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]
 
@@ -1010,11 +1011,12 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     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, vec3(0,1,0), 20, aspect_ratio, aperture, dist_to_focus, 0.0, 1.0);
+    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,11 +1167,12 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     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, vec3(0,1,0), 20, aspect_ratio, aperture, dist_to_focus, 0.0, 1.0);
+    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]
 </div>
@@ -1988,13 +1991,14 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     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, vec3(0,1,0), vfov, aspect_ratio, aperture, dist_to_focus, 0.0, 1.0);
+        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>

books/RayTracingTheRestOfYourLife.html

@@ -755,14 +755,14 @@
 
         vec3 lookfrom(278, 278, -800);
         vec3 lookat(278, 278, 0);
-        vec3 up(0, 1, 0);
+        vec3 vup(0, 1, 0);
         auto dist_to_focus = 10.0;
         auto aperture = 0.0;
         auto vfov = 40.0;
         auto t0 = 0.0;
         auto t1 = 1.0;
 
-        cam = camera(lookfrom, lookat, up, vfov, aspect, aperture, dist_to_focus, t0, t1);
+        cam = camera(lookfrom, lookat, vup, vfov, aspect, aperture, dist_to_focus, t0, t1);
 
         return world;
     }
@@ -2029,14 +2029,14 @@
 
         vec3 lookfrom(278, 278, -800);
         vec3 lookat(278, 278, 0);
-        vec3 up(0, 1, 0);
+        vec3 vup(0, 1, 0);
         auto dist_to_focus = 10.0;
         auto aperture = 0.0;
         auto vfov = 40.0;
         auto t0 = 0.0;
         auto t1 = 1.0;
 
-        cam = camera(lookfrom, lookat, up, vfov, aspect, aperture, dist_to_focus, t0, t1);
+        cam = camera(lookfrom, lookat, vup, vfov, aspect, aperture, dist_to_focus, t0, t1);
 
         return world;
     }

src/InOneWeekend/main.cc

@@ -93,11 +93,12 @@ int main() {
 
     vec3 lookfrom(13,2,3);
     vec3 lookat(0,0,0);
+    vec3 vup(0,1,0);
     auto dist_to_focus = 10.0;
     auto aperture = 0.1;
 
     auto aspect_ratio = double(image_width) / image_height;
-    camera cam(lookfrom, lookat, vec3(0,1,0), 20, aspect_ratio, aperture, dist_to_focus);
+    camera cam(lookfrom, lookat, vup, 20, aspect_ratio, aperture, dist_to_focus);
 
     for (int j = image_height-1; j >= 0; --j) {
         std::cerr << "\rScanlines remaining: " << j << ' ' << std::flush;

src/TheNextWeek/main.cc

@@ -374,16 +374,16 @@ int main() {
 
     vec3 lookfrom(278, 278, -800);
     //vec3 lookfrom(478, 278, -600);
-    vec3 lookat(278,278,0);
     //vec3 lookfrom(0, 0, 6);
+    vec3 lookat(278,278,0);
     //vec3 lookat(0,0,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, vec3(0,1,0), 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);
 
     for (int j = image_height-1; j >= 0; --j) {
         std::cerr << "\rScanlines remaining: " << j << ' ' << std::flush;