Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions src/ds/aabb.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,39 @@ impl Renderable for Aabb {
return None;
}
}
return Some(t_enter);

if t_enter >= 0.0 {
Some(t_enter)
} else if t_exit >= 0.0 {
Some(t_exit) // origin is inside the box
} else {
None // box is entirely behind the ray
}
}

fn as_any(&self) -> &dyn std::any::Any {
self
}

fn center(&self) -> crate::ds::Vector3 {
fn center(&self) -> ds::Vector3 {
ds::Vector3::new(self.x.middle(), self.y.middle(), self.z.middle())
}

fn normal(&self, pos: &ds::Vector3) -> ds::Vector3 {
let cx = self.x.middle();
let cy = self.y.middle();
let cz = self.z.middle();

let dx = (pos.x - cx).abs() / (self.x.size() / 2.0);
let dy = (pos.y - cy).abs() / (self.y.size() / 2.0);
let dz = (pos.z - cz).abs() / (self.z.size() / 2.0);

if dx >= dy && dx >= dz {
ds::Vector3::new((pos.x - cx).signum(), 0.0, 0.0)
} else if dy >= dz {
ds::Vector3::new(0.0, (pos.y - cy).signum(), 0.0)
} else {
ds::Vector3::new(0.0, 0.0, (pos.z - cz).signum())
}
}
}
6 changes: 5 additions & 1 deletion src/object/quad.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,14 @@ impl Renderable for Quad {
self
}

fn center(&self) -> crate::ds::Vector3 {
fn center(&self) -> ds::Vector3 {
self.q + self.u/2.0 + self.v/2.0
}

fn normal(&self, _pos: &ds::Vector3) -> ds::Vector3 {
return self.normal;
}

fn intersects(&self, ray: &ds::Ray) -> Option<f64> {
let denominator = self.normal.dot(&ray.direction);

Expand Down
1 change: 1 addition & 0 deletions src/object/renderable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ pub trait Renderable: Send + Sync {
fn as_any(&self) -> &dyn std::any::Any;
fn center(&self) -> crate::ds::Vector3;
fn intersects(&self, ray: &crate::ds::Ray) -> Option<f64>;
fn normal(&self, pos: &crate::ds::Vector3) -> crate::ds::Vector3;
}

pub trait ToGpu<T> {
Expand Down
4 changes: 4 additions & 0 deletions src/object/sphere.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ impl Renderable for Sphere {
self.center
}

fn normal(&self, pos: &ds::Vector3) -> ds::Vector3 {
(pos - self.center).unit_vector()
}

fn intersects(&self, ray: &ds::Ray) -> Option<f64> {
let oc = self.center - ray.origin;
let a = ray.direction.dot(&ray.direction);
Expand Down
Loading