From 618b29b93b00b1fc859f6b40d6f9ea63b2178aba Mon Sep 17 00:00:00 2001
From: timokoesters <timo@koesters.xyz>
Date: Wed, 24 Apr 2019 19:33:04 +0200
Subject: [PATCH] Fix ray issue after max_iteration

Former-commit-id: 55afdeeb0358934e3874ab3ca573e8cc71904ea1
---
 common/src/ray.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/src/ray.rs b/common/src/ray.rs
index 1c7f37628d..2017c3c53d 100644
--- a/common/src/ray.rs
+++ b/common/src/ray.rs
@@ -37,7 +37,7 @@ impl<'a, V: ReadVol, F: RayUntil<V::Vox>> Ray<'a, V, F> {
         self
     }
 
-    pub fn cast(mut self) -> (f32, Result<&'a V::Vox, V::Err>) {
+    pub fn cast(mut self) -> (f32, Result<Option<&'a V::Vox>, V::Err>) {
         // TODO: Fully test this!
 
         const PLANCK: f32 = 0.001;
@@ -56,7 +56,7 @@ impl<'a, V: ReadVol, F: RayUntil<V::Vox>> Ray<'a, V, F> {
                 .get(ipos)
                 .map(|vox| (vox, (self.until)(vox)))
             {
-                Ok((vox, true)) => return (dist, Ok(vox)),
+                Ok((vox, true)) => return (dist, Ok(Some(vox))),
                 Ok((_, false)) => {},
                 Err(err) => return (dist, Err(err)),
             }
@@ -69,6 +69,6 @@ impl<'a, V: ReadVol, F: RayUntil<V::Vox>> Ray<'a, V, F> {
             dist += deltas.reduce(f32::min).max(PLANCK);
         }
 
-        (dist, self.vol.get(ipos))
+        (dist, Ok(None))
     }
 }