From 3f78cacdd93036dbd51bae77d5d8e5430a0bc75f Mon Sep 17 00:00:00 2001 From: Julian T Date: Sat, 6 Mar 2021 16:15:26 +0100 Subject: Several changes to bounding boxes For instance removed support for shapes without a bounding box, such as planes --- src/world/container/list.rs | 56 +++++++++++++++++++++++++++++++++++++++++++++ src/world/container/mod.rs | 3 +++ 2 files changed, 59 insertions(+) create mode 100644 src/world/container/list.rs create 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 new file mode 100644 index 0000000..c8e3fdd --- /dev/null +++ b/src/world/container/list.rs @@ -0,0 +1,56 @@ +use crate::world::{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: Box) { + 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 new file mode 100644 index 0000000..35d4693 --- /dev/null +++ b/src/world/container/mod.rs @@ -0,0 +1,3 @@ +mod list; + +pub use list::HittableList; -- cgit v1.2.3