Clean up a long if-else sequence. No change in functionality.

This commit is contained in:
Matthew Gordon 2019-12-07 10:31:14 -05:00
parent c0d0f81335
commit 52da1bc952
1 changed files with 2 additions and 6 deletions

View File

@ -121,14 +121,10 @@ impl<T: RealField> Intersect<T> for Sphere<T> {
let one_over_2_a = T::one() / (two * a); let one_over_2_a = T::one() / (two * a);
let t1 = (-b - delta) * one_over_2_a; let t1 = (-b - delta) * one_over_2_a;
let t2 = (-b + delta) * one_over_2_a; let t2 = (-b + delta) * one_over_2_a;
let distance = if t1 < T::zero() { let distance = if t1 < T::zero() || (t2 >= T::zero() && t1 >= t2) {
t2 t2
} else if t2 < T::zero() {
t1
} else if t1 < t2 {
t1
} else { } else {
t2 t1
}; };
if distance <= T::zero() { if distance <= T::zero() {
None None