More streaming refactoring

2022-06-25 22:31:49 +01:00
parent 4eaa31bf32
commit 3c7ea4d73b
12 changed files with 88 additions and 28 deletions
@@ -81,6 +81,16 @@ circOnSegNoEndpoints :: Point2 -> Point2 -> Point2 -> Float -> Bool
 circOnSegNoEndpoints !p1 !p2 !c !rad = intersectSegSegTest p1 p2 (c -.- thenormal) (c +.+ thenormal)
  where 
    thenormal = rad *.* vNormal (normalizeV $ p1 -.- p2)
+-- | Test whether a circle is on a segment by intersecting a normal and testing
+-- the distance to the endpoints of the segment.
+-- Perhaps a better order of arguments.
+circOnSeg' :: Point2 -> Float -> Point2 -> Point2 -> Bool
+{-# INLINE circOnSeg' #-}
+circOnSeg' !c !rad !p1 !p2 = magV (p1 -.- c) <= rad 
+    || magV (p2 -.- c) <= rad
+    || intersectSegSegTest p1 p2 (c -.- thenormal) (c +.+ thenormal)
+  where 
+    thenormal = rad *.* vNormal (normalizeV $ p1 -.- p2)

 -- | Test whether a circle is on a segment by intersecting a normal and testing
 -- the distance to the endpoints of the segment.