From 49c6adb0db70ffc30eaac33b66eacf7574b34e26 Mon Sep 17 00:00:00 2001 From: Julian T Date: Wed, 10 Feb 2021 23:06:48 +0100 Subject: Fixed most clippy warnings --- src/world/scene.rs | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 src/world/scene.rs (limited to 'src/world/scene.rs') diff --git a/src/world/scene.rs b/src/world/scene.rs new file mode 100644 index 0000000..444e915 --- /dev/null +++ b/src/world/scene.rs @@ -0,0 +1,52 @@ +use crate::core::{Ray, Intersection}; +use crate::material::Material; + +use super::Object; + +pub struct Scene { + objs: Vec, +} + +pub struct SceneIntersect<'a> { + pub mat: &'a dyn Material, + pub i: Intersection, +} + +impl Scene { + pub fn new() -> Self { + Self::default() + } + + pub fn add_object(&mut self, obj: Object) { + self.objs.push(obj); + } + + pub fn add_objects(&mut self, objs: Vec) { + for obj in objs { + self.add_object(obj); + } + } + + pub fn intersect(&self, ray: &Ray) -> Option { + let mut min: Option = None; + + for obj in self.objs.iter() { + if let Some(i) = obj.shape.intersect(&ray) { + match min { + Some(ref si) if si.i.t < i.t => (), + _ => min = Some(SceneIntersect {i, mat: obj.mat.as_ref() }), + } + } + } + + min + } +} + +impl Default for Scene { + fn default() -> Self { + Self { + objs: Vec::new(), + } + } +} -- cgit v1.2.3