diff options
author | Julian T <julian@jtle.dk> | 2021-08-06 12:39:51 +0200 |
---|---|---|
committer | Julian T <julian@jtle.dk> | 2021-08-06 12:39:51 +0200 |
commit | 8e3bc57bf03457c33088e62c9d30da0565730257 (patch) | |
tree | 6aba7020638f6060ff0bd033ef72ea557b6a2203 /src/main.rs | |
parent | 978580ff9464f7470c46f3084ee26021b71933c8 (diff) |
Diffstat (limited to 'src/main.rs')
-rw-r--r-- | src/main.rs | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/main.rs b/src/main.rs index a288689..aa39677 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,5 @@ use rendering::camera::{Camera, Film, CameraSettings}; -use rendering::world::{Scene, Object, shapes::{Rect, Plane, Sphere}, Instancable}; +use rendering::world::{Scene, Object, shapes::{Rect, Plane, Sphere, BoxShp}, Instancable}; use rendering::trace::DefaultTracer; use rendering::core::{Vector2i, Vector3f, Spectrum}; use rendering::render::{RenderContext, RenderCoord}; @@ -12,10 +12,10 @@ fn main() { let res = Vector2i::new_xy(500, 500); let cam = Camera::new(&CameraSettings { - target: Vector3f::new_xyz(0.0, 0.0, 0.0), - origin: Vector3f::new_xyz(0.0, 0.0, 5.0), + target: Vector3f::new_xyz(278.0, 278.0, 0.0), + origin: Vector3f::new_xyz(278.0, 278.0, -800.0), up: Vector3f::new_xyz(0.0, 1.0, 0.0), - fov: 85.0, + fov: 40.0, filmsize: res, focus: None, aperture: None, @@ -31,18 +31,19 @@ fn main() { let mut scn = Scene::new(); scn.add_objects(vec![ - 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)), + Object::new(green.clone(), Rect::new(555.0, 555.0, Plane::YZ).translate(555.0, 277.5, 277.5)), + Object::new(red.clone(), Rect::new(555.0, 555.0, Plane::YZ).translate(0.0, 277.5, 277.5)), + Object::new(white.clone(), Rect::new(555.0, 555.0, Plane::XZ).translate(277.5, 0.0, 277.5)), + Object::new(white.clone(), Rect::new(555.0, 555.0, Plane::XZ).translate(277.5, 555.0, 277.5)), + Object::new(white.clone(), Rect::new(555.0, 555.0, Plane::XY).translate(277.5, 277.5, 555.0)), + Object::new(sun, Rect::new(130.0, 105.0, Plane::XZ).translate(278.0, 554.0, 279.5)), + Object::new(white.clone(), BoxShp::new(Vector3f::new(165.0)).translate(212.5, 82.5, 147.5)), + Object::new(white.clone(), BoxShp::new(Vector3f::new_xyz(165.0, 330.0, 165.0)).translate(347.5, 165.0, 377.5)), ]); let tracer = DefaultTracer::new(&scn, Some(5), - Some(Box::new(SkyLight::new())) - //None + //Some(Box::new(SkyLight::new())) + None ); let mut sampler = UniformSampler::new(); @@ -51,7 +52,7 @@ fn main() { let mut film = Film::new(res); { - let coord = RenderCoord::new(&mut film, Vector2i::new_xy(50, 50), 500); + let coord = RenderCoord::new(&mut film, Vector2i::new_xy(50, 50), 50); coord.run_threaded(&ctx, &mut sampler, 8); //coord.work(&ctx, &mut sampler); |