Merge pull request RayTracing#821 from RayTracing/book3_chapter1-3_edits

Book 3 Chapter 1-3 First Draft with Figures

Author: hollasch

CMakeLists.txt

@@ -80,6 +80,7 @@ add_executable(cos_cubed         src/TheRestOfYourLife/cos_cubed.cc         ${CO
 add_executable(cos_density       src/TheRestOfYourLife/cos_density.cc       ${COMMON_ALL})
 add_executable(integrate_x_sq    src/TheRestOfYourLife/integrate_x_sq.cc    ${COMMON_ALL})
 add_executable(pi                src/TheRestOfYourLife/pi.cc                ${COMMON_ALL})
+add_executable(estimate_halfway  src/TheRestOfYourLife/estimate_halfway.cc  ${COMMON_ALL})
 add_executable(sphere_importance src/TheRestOfYourLife/sphere_importance.cc ${COMMON_ALL})
 add_executable(sphere_plot       src/TheRestOfYourLife/sphere_plot.cc       ${COMMON_ALL})
 

books/RayTracingInOneWeekend.html

@@ -79,7 +79,7 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     #include <iostream>
 
-    void main() {
+    int main() {
 
         // Image
 
@@ -391,7 +391,7 @@
 
     #include <iostream>
 
-    void main() {
+    int main() {
 
         // Image
 
@@ -523,7 +523,7 @@
     }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
 
-    void main() {
+    int main() {
 
         // Image
 
@@ -1223,7 +1223,7 @@
         return (1.0-t)*color(1.0, 1.0, 1.0) + t*color(0.5, 0.7, 1.0);
     }
 
-    void main() {
+    int main() {
 
         // Image
 
@@ -1554,7 +1554,7 @@
 
     ...
 
-    void main() {
+    int main() {
 
         // Image
 
@@ -1744,7 +1744,7 @@
 
     ...
 
-    void main() {
+    int main() {
 
         // Image
 
@@ -2299,7 +2299,7 @@
 
     ...
 
-    void main() {
+    int main() {
 
         // Image
 
@@ -2409,7 +2409,7 @@
 We can try that out by adding fuzziness 0.3 and 1.0 to the metals:
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
-    void main() {
+    int main() {
         ...
         // World
 
@@ -2862,7 +2862,7 @@
     #include "scene.h"
     #include "sphere.h"
 
-    void main() {
+    int main() {
         scene scene_desc;
 
         const double aspect_ratio = 16.0 / 9.0;
@@ -2983,7 +2983,7 @@
 And a small change to our `main()` routine defines the aspect ratio in the scene:
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
-    void main() {
+    int main() {
         scene scene_desc;
 
 
@@ -3066,7 +3066,7 @@
 Now update `main()` to use a 90° field of view, looking at the point where two spheres touch.
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
-    void main() {
+    int main() {
         scene scene_desc;
 
         scene_desc.aspect_ratio = 16.0 / 9.0;
@@ -3171,7 +3171,7 @@
 We'll change back to the prior scene, and use the new viewpoint:
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
-    void main() {
+    int main() {
         scene scene_desc;
 
         scene_desc.aspect_ratio = 16.0 / 9.0;
@@ -3441,7 +3441,7 @@
     }
 
 
-    void main() {
+    int main() {
         scene scene_desc;
         random_spheres(scene_desc);
         scene_desc.render();

books/RayTracingTheNextWeek.html

@@ -1350,7 +1350,7 @@
         world.add(make_shared<sphere>(point3(0, 10, 0), 10, make_shared<lambertian>(checker)));
     }
 
-    void main() {
+    int main() {
         scene scene_desc;
 
         scene_desc.cam.vup = vec3(0,1,0);
@@ -1522,7 +1522,7 @@
         world.add(make_shared<sphere>(point3(0, 2, 0), 2, make_shared<lambertian>(pertext)));
     }
 
-    void main() {
+    int main() {
         ...
         switch (0) {
             case 1:  random_spheres(scene_desc);     break;
@@ -2156,7 +2156,7 @@
         scene_desc.world = hittable_list(globe);
     }
 
-    void main() {
+    int main() {
         ...
         switch (0) {
             case 1:  random_spheres(scene_desc);     break;
@@ -2298,7 +2298,7 @@
 `main()` is updated to set the background color for the prior scenes:
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
-    void main() {
+    int main() {
         scene scene_desc;
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
@@ -2441,7 +2441,7 @@
         world.add(make_shared<xy_rect>(3, 5, 1, 3, -2, difflight));
     }
 
-    void main() {
+    int main() {
         ...
         switch (0) {
             case 1:  random_spheres(scene_desc);     break;
@@ -2605,7 +2605,7 @@
         world.add(make_shared<xy_rect>(0, 555, 0, 555, 555, white));
     }
 
-    void main() {
+    int main() {
         ...
         switch (0) {
             case 1:  random_spheres(scene_desc);     break;
@@ -3153,7 +3153,7 @@
     }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
 
-    void main() {
+    int main() {
         ...
         switch (0) {
             case 1:  random_spheres(scene_desc);     break;
@@ -3275,7 +3275,7 @@
     }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
 
-    void main() {
+    int main() {
         ...
         switch (0) {
             case 1:  random_spheres(scene_desc);     break;
@@ -3293,7 +3293,6 @@
 
         scene_desc.render();
     }
-    }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [scene-final]: <kbd>[main.cc]</kbd> Final scene]