Skip to content
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.

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

[Merged by Bors] - Improve code/comments for Ray::intersect_plane and its tests #6823

Closed
wants to merge 2 commits into from
Closed
Changes from 1 commit
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
14 changes: 7 additions & 7 deletions crates/bevy_math/src/ray.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ impl Ray {
let denominator = plane_normal.dot(self.direction);
if denominator.abs() > f32::EPSILON {
let distance = (plane_origin - self.origin).dot(plane_normal) / denominator;
if distance >= f32::EPSILON {
if distance > f32::EPSILON {
return Some(distance);
}
}
Expand All @@ -32,17 +32,17 @@ impl Ray {
}

#[cfg(test)]
mod test {
mod tests {
use super::*;

#[test]
fn intersects_plane() {
fn intersect_plane() {
let ray = Ray {
origin: Vec3::ZERO,
direction: Vec3::Z,
};

// Orthogonal, and test that plane_normal direction doesn't matter
// Orthogonal, and test that an inverse plane_normal has the same result
assert_eq!(Some(1.), ray.intersect_plane(Vec3::Z, Vec3::Z));
assert_eq!(Some(1.), ray.intersect_plane(Vec3::Z, Vec3::NEG_Z));
assert_eq!(None, ray.intersect_plane(Vec3::NEG_Z, Vec3::Z));
Expand All @@ -52,13 +52,13 @@ mod test {
assert_eq!(Some(1.), ray.intersect_plane(Vec3::Z, Vec3::ONE));
assert_eq!(None, ray.intersect_plane(Vec3::NEG_Z, Vec3::ONE));

// Parralel
// Parallel
assert_eq!(None, ray.intersect_plane(Vec3::X, Vec3::X));

// Parralel with simulated rounding error
// Parallel with simulated rounding error
assert_eq!(
None,
ray.intersect_plane(Vec3::X, Vec3::X + Vec3::Z * f32::EPSILON)
ray.intersect_plane(Vec3::X, Vec3::new(1., 0., f32::EPSILON))
tim-blackbird marked this conversation as resolved.
Show resolved Hide resolved
);
}
}