aboutsummaryrefslogtreecommitdiff
path: root/src/world/container
diff options
context:
space:
mode:
authorJulian T <julian@jtle.dk>2021-03-06 16:15:26 +0100
committerJulian T <julian@jtle.dk>2021-03-06 16:15:26 +0100
commit3f78cacdd93036dbd51bae77d5d8e5430a0bc75f (patch)
tree13d5e08607f44f30664ee9ced3fb139faeb5a67d /src/world/container
parentda1c3949a449f3fafe579c62ff6b14ffd993a197 (diff)
Several changes to bounding boxes
For instance removed support for shapes without a bounding box, such as planes
Diffstat (limited to 'src/world/container')
-rw-r--r--src/world/container/list.rs56
-rw-r--r--src/world/container/mod.rs3
2 files changed, 59 insertions, 0 deletions
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<Box<dyn Hittable>>,
+}
+
+impl HittableList {
+ pub fn new() -> Self {
+ Self::default()
+ }
+
+ pub fn add(&mut self, h: Box<dyn Hittable>) {
+ self.elems.push(h);
+ }
+}
+
+impl Hittable for HittableList {
+ fn intersect(&self, ray: &Ray) -> Option<Intersection> {
+ let mut min: Option<Intersection> = 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;