Bump linesweeper version and fix paths

This commit is contained in:
Dennis Kobert 2025-05-25 13:12:22 +02:00
parent dd45af48f4
commit e3caf379ee
No known key found for this signature in database
GPG key ID: 5A4358CB9530F933
3 changed files with 31 additions and 4 deletions

27
Cargo.lock generated
View file

@ -214,6 +214,9 @@ name = "arrayvec"
version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
dependencies = [
"serde",
]
[[package]]
name = "as-raw-xcb-connection"
@ -2317,6 +2320,7 @@ dependencies = [
"image",
"image-compare",
"js-sys",
"linesweeper 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"log",
"ndarray",
"node-macro",
@ -3362,7 +3366,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
dependencies = [
"cfg-if",
"windows-targets 0.48.5",
"windows-targets 0.52.6",
]
[[package]]
@ -3382,6 +3386,25 @@ dependencies = [
"redox_syscall 0.5.10",
]
[[package]]
name = "linesweeper"
version = "0.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cce9ea4ee3d12ddbb8b92e511a40945183962dc9257ec857768b7108986cd4aa"
dependencies = [
"arrayvec",
"kurbo",
]
[[package]]
name = "linesweeper"
version = "0.0.4"
source = "git+https://github.com/jneem/linesweeper#3a9c0fd69c1e02d397e2dff7551818041d4a719f"
dependencies = [
"arrayvec",
"kurbo",
]
[[package]]
name = "linux-raw-sys"
version = "0.4.15"
@ -4254,6 +4277,8 @@ dependencies = [
"glam",
"glob",
"image",
"kurbo",
"linesweeper 0.0.4 (git+https://github.com/jneem/linesweeper)",
"regex",
"resvg",
"slotmap",

View file

@ -26,7 +26,7 @@ default = ["parsing"]
[dependencies]
glam = "0.29.0"
kurbo.version = "=0.11"
linesweeper = "0.0.4"
linesweeper = {git = "https://github.com/jneem/linesweeper"}
regex = "1.10.6"
slotmap = "1.0.7"

View file

@ -62,9 +62,11 @@ fn from_kurbo_path(a: &linesweeper::topology::Contours) -> Vec<Path> {
a_new.push(PathSegment::Quadratic(last, k(p2), k(p3)));
last = k(p3)
}
kurbo::PathEl::LineTo(p) => a_new.push(PathSegment::Cubic(last, last, k(p), k(p))),
kurbo::PathEl::LineTo(p) => {
a_new.push(PathSegment::Cubic(last, last, k(p), k(p)));
last = k(p);
}
kurbo::PathEl::ClosePath => a_new.push(PathSegment::Cubic(last, last, start, start)),
_ => panic!("{:?}", segment),
};
}
output.push(a_new);