Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: jiro4989/setup-nim-action@v1
with:
nim-version: ${{ matrix.nim-version }}
repo-token: ${{ secrets.GITHUB_TOKEN }}
- run: nimble test --gc:arc -d:release -y
- run: nimble test --gc:arc -d:release -d:pixieNoSimd -y
- run: nimble test --gc:orc -d:release -y
Expand Down
9 changes: 6 additions & 3 deletions src/pixie/paths.nim
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,10 @@ proc commandsToShapes(
shape.addSegment(at, start)
result.add(shape)

proc shapesToSegments(shapes: seq[Polygon]): seq[(Segment, int16)] =
proc shapesToSegments(
shapes: seq[Polygon],
skipHorizontal = true
): seq[(Segment, int16)] =
## Converts the shapes into a set of filtered segments with winding value.

# Quantize the segment to prevent leaks
Expand All @@ -1075,7 +1078,7 @@ proc shapesToSegments(shapes: seq[Polygon]): seq[(Segment, int16)] =
segment = segment(vec1, vec2)
vec1 = vec2

if segment.at.y == segment.to.y: # Skip horizontal
if skipHorizontal and segment.at.y == segment.to.y: # Skip horizontal
continue
var
segment = segment
Expand Down Expand Up @@ -1119,7 +1122,7 @@ proc computeBounds*(
## Compute the bounds of the path.
var shapes = path.commandsToShapes(true, pixelScale(transform))
shapes.transform(transform)
computeBounds(shapes.shapesToSegments())
computeBounds(shapes.shapesToSegments(skipHorizontal = false))

proc initPartitionEntry(segment: Segment, winding: int16): PartitionEntry =
result.segment = segment
Expand Down
14 changes: 7 additions & 7 deletions tests/test_paths.nim
Original file line number Diff line number Diff line change
Expand Up @@ -746,13 +746,13 @@ block:
# let path = parsePath(pathStr)
# doAssert path.computeBounds() == rect(0, 0, 1000, 1000)

# block:
# let pathStr = """
# M 0 0
# L 100 0
# """
# let path = parsePath(pathStr)
# doAssert path.computeBounds() == rect(0, 0, 100, 0)
block:
let pathStr = """
M 0 0
L 100 0
"""
let path = parsePath(pathStr)
doAssert path.computeBounds() == rect(0, 0, 100, 0)

block:
let pathStr = """
Expand Down