MyouProject/pixie
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #112 from guzba/master

Browse source 
remove windingrule param from stroke proc
This commit is contained in:
treeform 2021-02-18 11:25:37 -08:00 committed by GitHub
parent c3cfc456f4 0548152c66
commit bdf8e5601d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pixie.nimble
View file

@ -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"

39
src/pixie/paths.nim
View file

@ -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