Skip to content

Fixing winding when out of order #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 15, 2023
Merged

Fixing winding when out of order #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 16 additions & 3 deletions SwiftDraw/LayerTree.Path+Reversed.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,17 @@ private extension LayerTree.Path {
var nodes = [SubPathNode]()

for p in subpaths {
let node = SubPathNode(p)
var node = SubPathNode(p)
if let idx = nodes.firstIndex(where: { $0.containsNode(node) }) {
nodes[idx].append(node)
} else {
nodes.append(node)
if let idx = nodes.firstIndex(where: { node.containsNode($0) }) {
// existing node is inside new node
node.append(nodes[idx])
nodes[idx] = node
} else {
nodes.append(node)
}
}
}
return nodes
Expand Down Expand Up @@ -105,7 +111,14 @@ private struct SubPathNode {
if let idx = children.firstIndex(where: { $0.containsNode(node) }) {
children[idx].append(node)
} else {
children.append(node)
if let idx = children.firstIndex(where: { node.containsNode($0) }) {
// existing node is inside new node
var node = node
node.append(children[idx])
children[idx] = node
} else {
children.append(node)
}
}
}

Expand Down