Skip to content

Commit

Permalink
Merge pull request #284 from raptortech-js/update-docs
Browse files Browse the repository at this point in the history
Add additional documentation for Haskell eDSL
  • Loading branch information
julialongtin authored Nov 3, 2020
2 parents 60c66a5 + a40b9f8 commit ccefdb3
Showing 1 changed file with 14 additions and 12 deletions.
26 changes: 14 additions & 12 deletions Graphics/Implicit/Primitives.hs
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ circle ::
circle = Circle

rectR ::
-- ^ Rounding of corners
-> ℝ2 -- ^ Bottom left corner
-> ℝ2 -- ^ Top right corner
-> SymbolicObj2 -- ^ Resulting square (bottom right = (0,0) )
Expand Down Expand Up @@ -241,23 +241,25 @@ intersect = intersectR 0
extrudeR :: -> SymbolicObj2 -> -> SymbolicObj3
extrudeR = ExtrudeR

-- | This function is not implemented

This comment has been minimized.

Copy link
@isovector

isovector Nov 14, 2020

Contributor

What does "not implemented" mean here? @raptortech-js @julialongtin

This comment has been minimized.

Copy link
@jackie-scholl

jackie-scholl Nov 14, 2020

Contributor

It means that if you ever try to evaluate the implicit function on extrudeRotateR, you will get an error; https://github.com/colah/ImplicitCAD/blob/ccefdb33714a815bc8f1f664c11709ba70bb020b/Graphics/Implicit/ObjectUtil/GetImplicit3.hs#L226

This comment has been minimized.

Copy link
@isovector

isovector Nov 14, 2020

Contributor

Thanks! What an odd API choice. I've removed it from being exported in #287

extrudeRotateR :: -> -> SymbolicObj2 -> -> SymbolicObj3
extrudeRotateR = ExtrudeRotateR

extrudeRM ::
-> Either ( -> )
-> ExtrudeRMScale
-> Either ℝ2 ( -> ℝ2)
-> SymbolicObj2
-> Either (ℝ2 -> )
extrudeRM :: -- ^ rounding radius
-> Either ( -> ) -- ^ twist
-> ExtrudeRMScale -- ^ scale
-> Either ℝ2 ( -> ℝ2) -- ^ translate
-> SymbolicObj2 -- ^ object to extrude
-> Either (ℝ2 -> ) -- ^ height to extrude to
-> SymbolicObj3
extrudeRM = ExtrudeRM

rotateExtrude ::
-> Maybe
-> Either ℝ2 ( -> ℝ2)
-> Either ( -> )
-> SymbolicObj2

rotateExtrude :: -- ^ Angle to sweep to
-> (Maybe ) -- ^ Loop or path (rounded corner)
-> (Either ℝ2 ( -> ℝ2)) -- ^ translate
-> (Either ( -> )) -- ^ rotate
-> SymbolicObj2 -- ^ object to extrude
-> SymbolicObj3
rotateExtrude = RotateExtrude

Expand Down

0 comments on commit ccefdb3

Please sign in to comment.