Some refactoring in get_medium_vec()

alexmeli100 · Mar 18, 2021 · 79fffca · 79fffca
1 parent fd3bea2
commit 79fffca
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/core/interaction.rs b/src/core/interaction.rs
@@ -53,11 +53,15 @@ pub trait Interaction {
 
     fn get_medium_vec(&self, w: &Vector3f) -> Option<Arc<Mediums>> {
         if w.dot_norm(&self.n()) > 0.0 {
-            self.medium_interface()
-                .map_or_else(|| None, |m| m.outside)
+            if let Some(ref med_interface) = self.medium_interface() {
+                med_interface.outside.clone()
+            } else {
+                None
+            }
+        } else if let Some(ref med_interface) = self.medium_interface() {
+            med_interface.inside.clone()
         } else {
-            self.medium_interface()
-                .map_or_else(|| None, |m| m.inside)
+            None
         }
     }