oceanbox/Oceanbox.FvcomKit
6
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 80 Wiki Activity

Merge branch 'fix/inside-triangle' into 'main'

Browse Source 
fix: bug in isInsideTriangle

See merge request oceanbox/Oceanbox.FvcomKit!29
This commit was merged in pull request #30.
This commit is contained in:
Stig Rune Jensen
2024-02-23 13:55:26 +00:00
parent ff283cd910 8d7ab4164c
commit ef172fa883
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Grid.fs
View File

@@ -429,7 +429,7 @@ module Util =
let neg = (d1 <= 0.) || (d2 <= 0.) || (d3 <= 0.) let neg = (d1 <= 0.) || (d2 <= 0.) || (d3 <= 0.)
let pos = (d1 >= 0.) || (d2 >= 0.) || (d3 >= 0.) let pos = (d1 >= 0.) || (d2 >= 0.) || (d3 >= 0.)
neg && pos |> not (neg && pos) |> not
let inline isInsideTriangle_dbl (x, y, z) p = let inline isInsideTriangle_dbl (x, y, z) p =
let sign (p1x, p1y) (p2x, p2y) (p3x, p3y) = let sign (p1x, p1y) (p2x, p2y) (p3x, p3y) =
@@ -443,7 +443,7 @@ module Util =
let neg = (d1 <= 0.0) || (d2 <= 0.0) || (d3 <= 0.0) let neg = (d1 <= 0.0) || (d2 <= 0.0) || (d3 <= 0.0)
let pos = (d1 >= 0.0) || (d2 >= 0.0) || (d3 >= 0.0) let pos = (d1 >= 0.0) || (d2 >= 0.0) || (d3 >= 0.0)
neg && pos |> not (neg && pos) |> not
// make a kd-tree for looking up nearest node // make a kd-tree for looking up nearest node
let buildNearestNodeTree (grid: IGrid) = let buildNearestNodeTree (grid: IGrid) =
@@ -670,4 +670,4 @@ type ExtendedGrid(grid: IGrid) =
elementTree <- binarySerializer.UnPickle<IdxTree> pickle |> Some elementTree <- binarySerializer.UnPickle<IdxTree> pickle |> Some
true true
else else
false false