From 52da1bc952a2cd73ce4dc2bf6173b0e7b0d52af0 Mon Sep 17 00:00:00 2001 From: Matthew Gordon Date: Sat, 7 Dec 2019 10:31:14 -0500 Subject: [PATCH] Clean up a long if-else sequence. No change in functionality. --- src/raycasting.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/raycasting.rs b/src/raycasting.rs index 03cc799..e478911 100644 --- a/src/raycasting.rs +++ b/src/raycasting.rs @@ -121,14 +121,10 @@ impl Intersect for Sphere { let one_over_2_a = T::one() / (two * a); let t1 = (-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 - } else if t2 < T::zero() { - t1 - } else if t1 < t2 { - t1 } else { - t2 + t1 }; if distance <= T::zero() { None