chapter 11, 12, 13 api cleanup

Author: 4ydx

08.5/src/main.rs

@@ -44,7 +44,7 @@ fn main() {
                 let ray = camera.ray(u, v);
                 pixel_color = pixel_color + ray.color_08_5(&world, max_depth, &mut rng);
             }
-            write_color(&output, pixel_color, samples_per_pixel, false);
+            write_color(&output, pixel_color, samples_per_pixel, true);
         }
     }
     println!("DONE")

08.6/src/main.rs

@@ -44,7 +44,7 @@ fn main() {
                 let ray = camera.ray(u, v);
                 pixel_color = pixel_color + ray.color_08_6(&world, max_depth, &mut rng);
             }
-            write_color(&output, pixel_color, samples_per_pixel, false);
+            write_color(&output, pixel_color, samples_per_pixel, true);
         }
     }
     println!("DONE")

09.5/src/main.rs

@@ -70,7 +70,7 @@ fn main() {
                 let ray = camera.ray(u, v);
                 pixel_color = pixel_color + ray.color_09_4(&world, max_depth, &mut rng);
             }
-            write_color(&output, pixel_color, samples_per_pixel, false);
+            write_color(&output, pixel_color, samples_per_pixel, true);
         }
     }
     println!("DONE")

09.6/src/main.rs

@@ -70,7 +70,7 @@ fn main() {
                 let ray = camera.ray(u, v);
                 pixel_color = pixel_color + ray.color_09_4(&world, max_depth, &mut rng);
             }
-            write_color(&output, pixel_color, samples_per_pixel, false);
+            write_color(&output, pixel_color, samples_per_pixel, true);
         }
     }
     println!("DONE")

10.3/src/main.rs

@@ -66,7 +66,7 @@ fn main() {
                 let ray = camera.ray(u, v);
                 pixel_color = pixel_color + ray.color_09_4(&world, max_depth, &mut rng);
             }
-            write_color(&output, pixel_color, samples_per_pixel, false);
+            write_color(&output, pixel_color, samples_per_pixel, true);
         }
     }
     println!("DONE")

10.4/src/main.rs

@@ -66,7 +66,7 @@ fn main() {
                 let ray = camera.ray(u, v);
                 pixel_color = pixel_color + ray.color_09_4(&world, max_depth, &mut rng);
             }
-            write_color(&output, pixel_color, samples_per_pixel, false);
+            write_color(&output, pixel_color, samples_per_pixel, true);
         }
     }
     println!("DONE")

10.5/src/main.rs

@@ -72,7 +72,7 @@ fn main() {
                 let ray = camera.ray(u, v);
                 pixel_color = pixel_color + ray.color_09_4(&world, max_depth, &mut rng);
             }
-            write_color(&output, pixel_color, samples_per_pixel, false);
+            write_color(&output, pixel_color, samples_per_pixel, true);
         }
     }
     println!("DONE")

11.1/Cargo.lock

@@ -7,3 +7,4 @@ edition = "2018"
 
 [dependencies]
 raylib = { path = "../raylib" }
+rand = "0.8.4"

11.1/Cargo.toml

@@ -1,11 +1,14 @@
 extern crate raylib;
 
+use rand::prelude::*;
 use raylib::{
     camera::Camera, file::File, hittable::Hittables, lambertian::Lambertian, random,
-    random_unit_vector, sphere::Sphere, vec::Vec3, write_color,
+    sphere::Sphere, vec::Vec3, write_color,
 };
 
 fn main() {
+    let mut rng = thread_rng();
+
     // image
     let aspect_ratio = 16.0 / 9.0;
     let width = 400;
@@ -15,15 +18,11 @@ fn main() {
     println!("image h {} w {}", height, width);
 
     // camera
-    let camera = Camera::with_vfov(90.0, aspect_ratio);
+    let camera = Camera::new11_1(90.0, aspect_ratio);
 
     // world
-    let left = Lambertian {
-        albedo: Vec3::new(0.0, 0.0, 1.0),
-    };
-    let right = Lambertian {
-        albedo: Vec3::new(1.0, 0.0, 0.0),
-    };
+    let left = Lambertian::new(Vec3::new(0.0, 0.0, 1.0));
+    let right = Lambertian::new(Vec3::new(1.0, 0.0, 0.0));
 
     let mut world: Hittables = Hittables {
         list: std::vec::Vec::new(),
@@ -49,19 +48,12 @@ fn main() {
         for w in 0..width {
             let mut pixel_color = Vec3::new(0.0, 0.0, 0.0);
             for _ in 0..samples_per_pixel {
-                let u: f64 = (w as f64 + random()) / (width as f64 - 1.0);
-                let v: f64 = (h as f64 + random()) / (height as f64 - 1.0);
+                let u: f64 = (w as f64 + random(&mut rng)) / (width as f64 - 1.0);
+                let v: f64 = (h as f64 + random(&mut rng)) / (height as f64 - 1.0);
                 let ray = camera.ray(u, v);
-                let world_hit_t_min = 0.001;
-                pixel_color = pixel_color
-                    + ray.diffused_world_color(
-                        &world,
-                        max_depth,
-                        world_hit_t_min,
-                        random_unit_vector,
-                    );
+                pixel_color = pixel_color + ray.color_09_4(&world, max_depth, &mut rng);
             }
-            write_color(&output, pixel_color, samples_per_pixel, false);
+            write_color(&output, pixel_color, samples_per_pixel, true);
         }
     }
     println!("DONE")