Abstracted lambertian into material

1 files changed, 12 insertions, 6 deletions

diff --git a/src/main.rs b/src/main.rs
index 1604ae3..759cbf9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,10 +1,13 @@
 use pathtrace::camera::{Camera, Film, CameraSettings};
-use pathtrace::scene::Scene;
+use pathtrace::scene::{Scene, Object};
 use pathtrace::trace::DefaultTracer;
 use pathtrace::scene::shapes::Sphere;
-use pathtrace::core::{Vector2i, Vector3f};
+use pathtrace::core::{Vector2i, Vector3f, Spectrum};
 use pathtrace::render::{RenderContext, RenderTask};
 use pathtrace::sample::UniformSampler;
+use pathtrace::material::Lambertian;
+
+use std::rc::Rc;
 
 fn main() {
     let res = Vector2i::new_xy(500, 500);
@@ -17,10 +20,13 @@ fn main() {
         screensize: res,
     });
 
+    let brown = Rc::new(Lambertian::new(Spectrum::new_rgb(0.5, 0.3, 0.0)));
+    let blue = Rc::new(Lambertian::new(Spectrum::new_rgb(0.0, 0.3, 0.7)));
+
     let mut scn = Scene::new();
-    scn.add_shapes(vec![
-        Box::new(Sphere::new(0.5, Vector3f::new_xyz(0.0, 0.0, -1.0))),
-        Box::new(Sphere::new(100.0, Vector3f::new_xyz(0.0, -100.5, -1.0))),
+    scn.add_objects(vec![
+        Object::new(blue.clone(), Box::new(Sphere::new(0.5, Vector3f::new_xyz(0.0, 0.0, -1.0)))),
+        Object::new(brown.clone(), Box::new(Sphere::new(100.0, Vector3f::new_xyz(0.0, -100.5, -1.0)))),
     ]);
 
     let tracer = DefaultTracer::new(&scn, None);
@@ -32,7 +38,7 @@ fn main() {
     let mut film = Film::new(res);
     let tile = film.get_tile(&film.frame);
 
-    let mut task = RenderTask::new(Box::new(tile), 100);
+    let mut task = RenderTask::new(Box::new(tile), 10);
     task.render(&ctx, &mut sampler);
 
     film.commit_tile(&task.tile);