Add other axis rectangles and render empty box

1 files changed, 17 insertions, 16 deletions

diff --git a/src/main.rs b/src/main.rs
index 9cd2fc2..a288689 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -12,35 +12,35 @@ fn main() {
     let res = Vector2i::new_xy(500, 500);
 
     let cam = Camera::new(&CameraSettings {
-        target: Vector3f::new_xyz(0.0, 0.0, -1.0),
-        origin: Vector3f::new_xyz(0.0, 0.0, 1.0),
+        target: Vector3f::new_xyz(0.0, 0.0, 0.0),
+        origin: Vector3f::new_xyz(0.0, 0.0, 5.0),
         up: Vector3f::new_xyz(0.0, 1.0, 0.0),
-        fov: 50.0, 
+        fov: 85.0, 
         filmsize: res,
         focus: None,
         aperture: None,
     });
 
-    let brown = Arc::new(Lambertian::new(Spectrum::new_rgb(0.5, 0.3, 0.0)));
-    let blue = Arc::new(Lambertian::new(Spectrum::new_rgb(0.0, 0.3, 0.7)));
-    let green = Arc::new(Lambertian::new(Spectrum::new_rgb(0.0, 0.7, 0.3)));
+    let red = Arc::new(Lambertian::new(Spectrum::new_rgb(0.65, 0.05, 0.05)));
+    let white = Arc::new(Lambertian::new(Spectrum::new_rgb(0.73, 0.73, 0.73)));
+    let green = Arc::new(Lambertian::new(Spectrum::new_rgb(0.12, 0.45, 0.15)));
     let metal = Arc::new(Reflectant::new(Spectrum::new_rgb(0.8, 0.8, 0.9), Some(1.0)));
     let mirror = Arc::new(Reflectant::new(Spectrum::new_rgb(1.0, 1.0, 1.0), None));
     let glass = Arc::new(Dielectric::new(1.5));
-    let sun = Arc::new(DiffuseLight::new_white(14.0));
+    let sun = Arc::new(DiffuseLight::new_white(15.0));
 
     let mut scn = Scene::new();
     scn.add_objects(vec![
-        Object::new(glass, Sphere::new(0.2).translate(0.0, 0.0, -1.0)),
-        Object::new(blue, Sphere::new(0.5).translate(1.0, 0.0, -1.5)),
-        Object::new(mirror, Rect::new(0.4, 0.7, Plane::XY).translate(0.5, 0.0, -2.5)),
-        Object::new(brown.clone(), Rect::new(10.0, 2.0, Plane::XY).translate(0.5, 0.0, -2.6)),
-        Object::new(brown, Sphere::new(100.0).translate(0.0, -100.5, -1.0)),
-        Object::new(green, Sphere::new(0.4).translate(-0.5, 0.0, -2.0)),
-        //Object::new(sun, Sphere::new(0.4).translate(-1.0, 6.0, 0.0)),
+        Object::new(white.clone(), Rect::new_with_offset(10.0, 10.0, -5.0, Plane::XY)),
+        Object::new(white.clone(), Rect::new_with_offset(10.0, 10.0, 5.0, Plane::XY)),
+        Object::new(white.clone(), Rect::new_with_offset(10.0, 10.0, -5.0, Plane::XZ)),
+        Object::new(white.clone(), Rect::new_with_offset(10.0, 10.0, 5.0, Plane::XZ)),
+        Object::new(red.clone(), Rect::new_with_offset(10.0, 10.0, -5.0, Plane::YZ)),
+        Object::new(green.clone(), Rect::new_with_offset(10.0, 10.0, 5.0, Plane::YZ)),
+        Object::new(sun, Rect::new(1.4, 1.0, Plane::XZ).translate(0.0, 4.99, -2.5)),
     ]);
 
-    let tracer = DefaultTracer::new(&scn, Some(10), 
+    let tracer = DefaultTracer::new(&scn, Some(5), 
                                     Some(Box::new(SkyLight::new()))
                                     //None
                                     );
@@ -51,9 +51,10 @@ fn main() {
 
     let mut film = Film::new(res);
     {
-        let coord = RenderCoord::new(&mut film, Vector2i::new_xy(50, 50), 200);
+        let coord = RenderCoord::new(&mut film, Vector2i::new_xy(50, 50), 500);
 
         coord.run_threaded(&ctx, &mut sampler, 8);
+        //coord.work(&ctx, &mut sampler);
     }
 
     let image = film.finalize_image();