From 3ef8f4d918406eec6bdc29e0ebd883fabfac9b2e Mon Sep 17 00:00:00 2001 From: Julian T Date: Thu, 5 Aug 2021 15:44:40 +0200 Subject: Add picture for c5505ab84820248c6dba35fc06aef9e0ced183de --- src/world/container/list.rs | 56 --------------------------------------------- src/world/container/mod.rs | 3 --- 2 files changed, 59 deletions(-) delete mode 100644 src/world/container/list.rs delete mode 100644 src/world/container/mod.rs (limited to 'src/world/container') diff --git a/src/world/container/list.rs b/src/world/container/list.rs deleted file mode 100644 index 22b6d88..0000000 --- a/src/world/container/list.rs +++ /dev/null @@ -1,56 +0,0 @@ -use crate::world::{Object, Hittable, Intersection}; -use crate::core::{Bound3f, Ray}; - - -pub struct HittableList { - elems: Vec, -} - -impl HittableList { - pub fn new() -> Self { - Self::default() - } - - pub fn add(&mut self, h: Object) { - self.elems.push(h); - } -} - -impl Hittable for HittableList { - fn intersect(&self, ray: &Ray) -> Option { - let mut min: Option = None; - - for e in self.elems.iter() { - if let Some(i) = e.intersect(&ray) { - match min { - // Do nothing if distance is bigger than min - Some(ref min_i) if min_i.t < i.t => {}, - // If no existing min or closer than - _ => min = Some(i), - } - } - } - - min - } - - fn bounding_box(&self) -> Bound3f { - let mut bound: Bound3f = Bound3f::EMPTY; - - for e in self.elems.iter() { - let eb = e.bounding_box(); - bound = bound.combine(&eb); - } - - bound - } -} - -impl Default for HittableList { - fn default() -> Self { - Self { - elems: Vec::new(), - } - } -} - diff --git a/src/world/container/mod.rs b/src/world/container/mod.rs deleted file mode 100644 index 35d4693..0000000 --- a/src/world/container/mod.rs +++ /dev/null @@ -1,3 +0,0 @@ -mod list; - -pub use list::HittableList; -- cgit v1.2.3