From 76ed801aa7cade93b3d4cc7eb0756c83eec43748 Mon Sep 17 00:00:00 2001 From: Ryan Oldenburg Date: Thu, 18 Feb 2021 12:15:53 -0600 Subject: [PATCH 1/2] remove windingrule param from stroke proc --- src/pixie/paths.nim | 39 +++++++-------------------------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/src/pixie/paths.nim b/src/pixie/paths.nim index b009ad4..76ad11d 100644 --- a/src/pixie/paths.nim +++ b/src/pixie/paths.nim @@ -1165,8 +1165,7 @@ proc fillShapes( proc strokeShapes( shapes: seq[seq[Vec2]], - strokeWidth: float32, - windingRule: WindingRule + strokeWidth: float32 ): seq[seq[Vec2]] = if strokeWidth == 0: return @@ -1288,11 +1287,7 @@ proc strokePath*( windingRule = wrNonZero, blendMode = bmNormal ) = - let strokeShapes = strokeShapes( - parseSomePath(path), - strokeWidth, - windingRule - ) + let strokeShapes = strokeShapes(parseSomePath(path), strokeWidth) image.fillShapes(strokeShapes, color, windingRule, blendMode) proc strokePath*( @@ -1304,11 +1299,7 @@ proc strokePath*( windingRule = wrNonZero, blendMode = bmNormal ) = - var strokeShapes = strokeShapes( - parseSomePath(path), - strokeWidth, - windingRule - ) + var strokeShapes = strokeShapes(parseSomePath(path), strokeWidth) for shape in strokeShapes.mitems: for segment in shape.mitems: segment += pos @@ -1323,11 +1314,7 @@ proc strokePath*( windingRule = wrNonZero, blendMode = bmNormal ) = - var strokeShapes = strokeShapes( - parseSomePath(path), - strokeWidth, - windingRule - ) + var strokeShapes = strokeShapes(parseSomePath(path), strokeWidth) for shape in strokeShapes.mitems: for segment in shape.mitems: segment = mat * segment @@ -1339,11 +1326,7 @@ proc strokePath*( strokeWidth = 1.0, windingRule = wrNonZero ) = - let strokeShapes = strokeShapes( - parseSomePath(path), - strokeWidth, - windingRule - ) + let strokeShapes = strokeShapes(parseSomePath(path), strokeWidth) mask.fillShapes(strokeShapes, windingRule) proc strokePath*( @@ -1353,11 +1336,7 @@ proc strokePath*( pos: Vec2, windingRule = wrNonZero ) = - var strokeShapes = strokeShapes( - parseSomePath(path), - strokeWidth, - windingRule - ) + var strokeShapes = strokeShapes(parseSomePath(path), strokeWidth) for shape in strokeShapes.mitems: for segment in shape.mitems: segment += pos @@ -1370,11 +1349,7 @@ proc strokePath*( mat: Mat3, windingRule = wrNonZero ) = - var strokeShapes = strokeShapes( - parseSomePath(path), - strokeWidth, - windingRule - ) + var strokeShapes = strokeShapes(parseSomePath(path), strokeWidth) for shape in strokeShapes.mitems: for segment in shape.mitems: segment = mat * segment From 0548152c66c666cc2b6379a5f7c8d5660060a93e Mon Sep 17 00:00:00 2001 From: Ryan Oldenburg Date: Thu, 18 Feb 2021 13:24:08 -0600 Subject: [PATCH 2/2] 0.0.21 --- pixie.nimble | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pixie.nimble b/pixie.nimble index 8fe5f3f..b7886b3 100644 --- a/pixie.nimble +++ b/pixie.nimble @@ -1,4 +1,4 @@ -version = "0.0.20" +version = "0.0.21" author = "Andre von Houck and Ryan Oldenburg" description = "Full-featured 2d graphics library for Nim." license = "MIT"