Skip to content

Minor improvements #496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
julialongtin wants to merge 2 commits into
base: master
Choose a base branch
from
+5 −4
Open

Minor improvements #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4925410
use negate, rather than multiplying.
julialongtin Feb 22, 2026
4178b08
fix comment.
julialongtin Feb 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Graphics/Implicit/Definitions.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ instance Monoid SymbolicObj2 where
-- | A symbolic 3D format!
data SymbolicObj3 =
-- Primitives
Cube ℝ3 -- rounding, size.
Cube ℝ3 -- size
| Sphere ℝ -- radius
| Cylinder ℝ ℝ ℝ --
-- Simple transforms
Expand Down
7 changes: 4 additions & 3 deletions Graphics/Implicit/ObjectUtil/GetImplicit2.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

module Graphics.Implicit.ObjectUtil.GetImplicit2 (getImplicit2) where

import Prelude(cycle, (/=), uncurry, fst, Eq, zip, drop, abs, (-), (/), sqrt, (*), (+), length, fmap, (<=), (&&), (>=), (||), odd, ($), (>), filter, (<), minimum, (.), sin, cos)
import Prelude(cycle, negate, (/=), uncurry, fst, Eq, zip, drop, abs, (-), (/), sqrt, (*), (+), length, fmap, (<=), (&&), (>=), (||), odd, ($), (>), filter, (<), minimum, (.), sin, cos)

import Graphics.Implicit.Definitions
( objectRounding, ObjectContext, SymbolicObj2(Square, Circle, Polygon, Rotate2, Slice, Transform2, Shared2), SharedObj (Empty), Obj2, ℝ2, ℝ )
Expand Down Expand Up @@ -54,11 +54,12 @@ getImplicit2 _ (Polygon (scanUniqueCircular -> points@(_:_:_:_))) =
-- FIXME: use partition instead?
seemsInRight = odd . length . filter (>0) $ nub crossing_points
seemsInLeft = odd . length . filter (<0) $ nub crossing_points
isIn = seemsInRight && seemsInLeft
dists :: [ℝ]
dists = fmap (distFromLineSeg p) pairs
in
minimum dists * if isIn then -1 else 1
if seemsInRight && seemsInLeft
then negate $ minimum dists
else minimum dists
getImplicit2 ctx (Polygon _) = getImplicitShared @SymbolicObj2 ctx Empty
-- Simple transforms
getImplicit2 ctx (Rotate2 θ symbObj) =
Expand Down