Skip to content

Make intersect return type option #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
santerioksanen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make intersect return type option #54

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/prelude/aabb.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,14 @@ impl AxisAlignedBoundingBox {
}

/// Returns the intersection between this and the other given bounding box.
pub fn intersection(self, other: Self) -> Self {
pub fn intersection(self, other: Self) -> Option<Self> {
let min_a = self.min();
let max_a = self.max();
let min_b = other.min();
let max_b = other.max();

if min_a.x >= max_b.x || min_a.y >= max_b.y || min_b.x >= max_a.x || min_b.y >= max_a.y {
return Self::EMPTY;
return None;
}

let min = vec3(
Expand All @@ -139,7 +139,7 @@ impl AxisAlignedBoundingBox {
max_a.z.min(max_b.z),
);

Self::new_with_positions(&[min, max])
Some(Self::new_with_positions(&[min, max]))
}

///
Expand Down