hashirama/metabrush
1
0
Fork 0
mirror of https://gitlab.com/sheaf/metabrush.git synced 2024-11-27 17:34:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

draw Bézier curves and connecting lines

Browse source
This commit is contained in:
sheaf 2020-08-12 23:23:19 +02:00
parent 2bd6847e78
commit ae0ac23910
2 changed files with 44 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/app/MetaBrush/Render/Document.hs
View file

@ -66,9 +66,11 @@ renderStroke cols zoom ( Stroke strokePts ) = go True strokePts
drawPoints, drawNextPoints, drawPath, drawNextPath :: Cairo.Render () drawPoints, drawNextPoints, drawPath, drawNextPath :: Cairo.Render ()
( drawNextPoints, drawNextPath ) = go False ( p2 : ps ) ( drawNextPoints, drawNextPath ) = go False ( p2 : ps )
drawPoints = do drawPoints = do
when drawFirstPoint ( drawPoint cols zoom p0 )
drawControl cols zoom p1 drawControl cols zoom p1
drawPoint cols zoom p2 drawLine cols zoom p0 p1
drawLine cols zoom p1 p2
when drawFirstPoint ( drawPoint cols zoom p0 )
drawPoint cols zoom p2
drawNextPoints drawNextPoints
drawPath = do drawPath = do
drawQuadraticBezier cols zoom ( Quadratic.Bezier p0 p1 p2 ) drawQuadraticBezier cols zoom ( Quadratic.Bezier p0 p1 p2 )
@ -85,7 +87,7 @@ drawPoint ( Colours { pathPoint, pathPointOutline } ) zoom ( Point2D x y ) = do
Cairo.save Cairo.save
Cairo.translate x y Cairo.translate x y
Cairo.scale ( 4 / zoom ) ( 4 / zoom ) Cairo.scale ( 3 / zoom ) ( 3 / zoom )
Cairo.moveTo 1 0 Cairo.moveTo 1 0
Cairo.lineTo 0.5 hsqrt3 Cairo.lineTo 0.5 hsqrt3
@ -95,7 +97,7 @@ drawPoint ( Colours { pathPoint, pathPointOutline } ) zoom ( Point2D x y ) = do
Cairo.lineTo 0.5 (-hsqrt3) Cairo.lineTo 0.5 (-hsqrt3)
Cairo.closePath Cairo.closePath
Cairo.setLineWidth 1 Cairo.setLineWidth 0.8
withRGBA pathPointOutline Cairo.setSourceRGBA withRGBA pathPointOutline Cairo.setSourceRGBA
Cairo.strokePreserve Cairo.strokePreserve
@ -108,11 +110,11 @@ drawControl ( Colours { controlPoint, controlPointOutline } ) zoom ( Point2D x y
Cairo.save Cairo.save
Cairo.translate x y Cairo.translate x y
Cairo.scale ( 4 / zoom ) ( 4 / zoom ) Cairo.scale ( 3 / zoom ) ( 3 / zoom )
Cairo.arc 0 0 1 0 ( 2 * pi ) Cairo.arc 0 0 1 0 ( 2 * pi )
Cairo.setLineWidth 1 Cairo.setLineWidth 0.8
withRGBA controlPointOutline Cairo.setSourceRGBA withRGBA controlPointOutline Cairo.setSourceRGBA
Cairo.strokePreserve Cairo.strokePreserve
@ -121,5 +123,39 @@ drawControl ( Colours { controlPoint, controlPointOutline } ) zoom ( Point2D x y
Cairo.restore Cairo.restore
drawLine :: Colours -> Double -> Point2D Double -> Point2D Double -> Cairo.Render ()
drawLine ( Colours { controlPoint } ) zoom ( Point2D x1 y1 ) ( Point2D x2 y2 ) = do
Cairo.save
Cairo.moveTo x1 y1
Cairo.lineTo x2 y2
Cairo.setLineWidth ( 3 / zoom )
withRGBA controlPoint Cairo.setSourceRGBA
Cairo.stroke
Cairo.restore
drawQuadraticBezier :: Colours -> Double -> Quadratic.Bezier ( Point2D Double ) -> Cairo.Render () drawQuadraticBezier :: Colours -> Double -> Quadratic.Bezier ( Point2D Double ) -> Cairo.Render ()
drawQuadraticBezier _ _ _ = pure () drawQuadraticBezier ( Colours { path } ) zoom
( Quadratic.Bezier
{ p0 = Point2D x0 y0
, p1 = Point2D x1 y1
, p2 = Point2D x2 y2
}
)
= do
Cairo.save
Cairo.moveTo x0 y0
Cairo.curveTo
( ( 2 * x1 + x0 ) / 3 ) ( ( 2 * y1 + y0 ) / 3 )
( ( 2 * x1 + x2 ) / 3 ) ( ( 2 * y1 + y2 ) / 3 )
x2 y2
Cairo.setLineWidth ( 6 / zoom )
withRGBA path Cairo.setSourceRGBA
Cairo.stroke
Cairo.restore

1
src/app/MetaBrush/UI/Viewport.hs
View file

@ -114,6 +114,7 @@ createViewport colours activeDocumentTVar openDocumentsTVar viewportGrid = do
GTK.setContainerChild viewportOverlay viewportDrawingArea GTK.setContainerChild viewportOverlay viewportDrawingArea
GTK.widgetAddEvents viewportDrawingArea GTK.widgetAddEvents viewportDrawingArea
[ GDK.EventMaskPointerMotionMask [ GDK.EventMaskPointerMotionMask
, GDK.EventMaskButtonPressMask, GDK.EventMaskButtonReleaseMask
, GDK.EventMaskScrollMask, GDK.EventMaskSmoothScrollMask , GDK.EventMaskScrollMask, GDK.EventMaskSmoothScrollMask
] ]