patrick/ray-tracing-fsharp
1
0
Fork 0
mirror of https://github.com/Smaug123/ray-tracing-fsharp synced 2025-10-05 20:08:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Last ValueOption (#12)

Browse Source
This commit is contained in:
Patrick Stevens
2023-01-07 11:18:24 +00:00
committed by GitHub
parent a07ff8f852
commit 2cf9dd0bdb
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
RayTracing/Sphere.fs
View File

@@ -358,8 +358,8 @@ module Sphere =
let intersectionPoint =
match Float.compare discriminantOverFour 0.0 with
| Comparison.Equal -> Some (-b)
| Comparison.Less -> None
| Comparison.Equal -> ValueSome (-b)
| Comparison.Less -> ValueNone
| Comparison.Greater ->
let intermediate = sqrt discriminantOverFour
let i1 = intermediate - b
@@ -372,16 +372,16 @@ module Sphere =
| Less -> i1
| Greater -> i2
| Equal -> i1
|> Some
|> ValueSome
elif i1Pos then
Some i1
ValueSome i1
elif i2Pos then
Some i2
ValueSome i2
else
None
ValueNone
match intersectionPoint with
| None -> ValueNone
| Some i ->
| ValueNone -> ValueNone
| ValueSome i ->
// Don't return anything that's behind us
if Float.positive i then ValueSome i else ValueNone