Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ray issue after max_iteration

Browse Source 
Former-commit-id: 55afdeeb0358934e3874ab3ca573e8cc71904ea1
This commit is contained in:
timokoesters 2019-04-24 19:33:04 +02:00 committed by Joshua Barretto
parent c37db43580
commit 927f3a12ba
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/ray.rs
View File

@ -37,7 +37,7 @@ impl<'a, V: ReadVol, F: RayUntil<V::Vox>> Ray<'a, V, F> {
self 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! // TODO: Fully test this!
const PLANCK: f32 = 0.001; const PLANCK: f32 = 0.001;
@ -56,7 +56,7 @@ impl<'a, V: ReadVol, F: RayUntil<V::Vox>> Ray<'a, V, F> {
.get(ipos) .get(ipos)
.map(|vox| (vox, (self.until)(vox))) .map(|vox| (vox, (self.until)(vox)))
{ {
Ok((vox, true)) => return (dist, Ok(vox)), Ok((vox, true)) => return (dist, Ok(Some(vox))),
Ok((_, false)) => {}, Ok((_, false)) => {},
Err(err) => return (dist, Err(err)), 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 += deltas.reduce(f32::min).max(PLANCK);
} }
(dist, self.vol.get(ipos)) (dist, Ok(None))
} }
} }