diff --git a/Cargo.lock b/Cargo.lock index 51e77f0..dd3208a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1019,7 +1019,7 @@ dependencies = [ [[package]] name = "egui-wgpu" version = "0.36.2" -source = "git+https://github.com/bherbruck/solidcraft?rev=de1479029dd6821cffd28b70688a58e7f61f0cfd#de1479029dd6821cffd28b70688a58e7f61f0cfd" +source = "git+https://github.com/bherbruck/solidcraft?rev=a629236650c44ee73edf36fab0dcd2385103a610#a629236650c44ee73edf36fab0dcd2385103a610" dependencies = [ "ahash", "bytemuck", @@ -1170,7 +1170,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -1864,6 +1864,8 @@ dependencies = [ "num-traits", "png", "tiff", + "zune-core", + "zune-jpeg", ] [[package]] @@ -2101,7 +2103,7 @@ checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" [[package]] name = "matext4cgmath" version = "0.1.0" -source = "git+https://github.com/bherbruck/solidcraft?rev=de1479029dd6821cffd28b70688a58e7f61f0cfd#de1479029dd6821cffd28b70688a58e7f61f0cfd" +source = "git+https://github.com/bherbruck/solidcraft?rev=a629236650c44ee73edf36fab0dcd2385103a610#a629236650c44ee73edf36fab0dcd2385103a610" dependencies = [ "cgmath", "katexit", @@ -3204,7 +3206,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -3489,8 +3491,8 @@ dependencies = [ [[package]] name = "solidcraft-doc" -version = "0.8.0" -source = "git+https://github.com/bherbruck/solidcraft?rev=de1479029dd6821cffd28b70688a58e7f61f0cfd#de1479029dd6821cffd28b70688a58e7f61f0cfd" +version = "0.11.0" +source = "git+https://github.com/bherbruck/solidcraft?rev=a629236650c44ee73edf36fab0dcd2385103a610#a629236650c44ee73edf36fab0dcd2385103a610" dependencies = [ "log", "serde", @@ -3498,6 +3500,7 @@ dependencies = [ "sha2 0.10.9", "solidcraft-geom", "solidcraft-kernel", + "solidcraft-render", "solidcraft-sketch", "thiserror 2.0.21", "web-time", @@ -3505,8 +3508,8 @@ dependencies = [ [[package]] name = "solidcraft-engine" -version = "0.8.0" -source = "git+https://github.com/bherbruck/solidcraft?rev=de1479029dd6821cffd28b70688a58e7f61f0cfd#de1479029dd6821cffd28b70688a58e7f61f0cfd" +version = "0.11.0" +source = "git+https://github.com/bherbruck/solidcraft?rev=a629236650c44ee73edf36fab0dcd2385103a610#a629236650c44ee73edf36fab0dcd2385103a610" dependencies = [ "log", "serde", @@ -3522,8 +3525,8 @@ dependencies = [ [[package]] name = "solidcraft-geom" -version = "0.8.0" -source = "git+https://github.com/bherbruck/solidcraft?rev=de1479029dd6821cffd28b70688a58e7f61f0cfd#de1479029dd6821cffd28b70688a58e7f61f0cfd" +version = "0.11.0" +source = "git+https://github.com/bherbruck/solidcraft?rev=a629236650c44ee73edf36fab0dcd2385103a610#a629236650c44ee73edf36fab0dcd2385103a610" dependencies = [ "serde", "thiserror 2.0.21", @@ -3531,8 +3534,8 @@ dependencies = [ [[package]] name = "solidcraft-io" -version = "0.8.0" -source = "git+https://github.com/bherbruck/solidcraft?rev=de1479029dd6821cffd28b70688a58e7f61f0cfd#de1479029dd6821cffd28b70688a58e7f61f0cfd" +version = "0.11.0" +source = "git+https://github.com/bherbruck/solidcraft?rev=a629236650c44ee73edf36fab0dcd2385103a610#a629236650c44ee73edf36fab0dcd2385103a610" dependencies = [ "quick-xml", "serde", @@ -3547,13 +3550,15 @@ dependencies = [ [[package]] name = "solidcraft-kernel" -version = "0.8.0" -source = "git+https://github.com/bherbruck/solidcraft?rev=de1479029dd6821cffd28b70688a58e7f61f0cfd#de1479029dd6821cffd28b70688a58e7f61f0cfd" +version = "0.11.0" +source = "git+https://github.com/bherbruck/solidcraft?rev=a629236650c44ee73edf36fab0dcd2385103a610#a629236650c44ee73edf36fab0dcd2385103a610" dependencies = [ "log", + "rayon", "serde", "serde_json", "solidcraft-geom", + "spade", "thiserror 2.0.21", "truck-meshalgo", "truck-modeling", @@ -3564,8 +3569,8 @@ dependencies = [ [[package]] name = "solidcraft-render" -version = "0.8.0" -source = "git+https://github.com/bherbruck/solidcraft?rev=de1479029dd6821cffd28b70688a58e7f61f0cfd#de1479029dd6821cffd28b70688a58e7f61f0cfd" +version = "0.11.0" +source = "git+https://github.com/bherbruck/solidcraft?rev=a629236650c44ee73edf36fab0dcd2385103a610#a629236650c44ee73edf36fab0dcd2385103a610" dependencies = [ "image", "serde", @@ -3574,8 +3579,8 @@ dependencies = [ [[package]] name = "solidcraft-sketch" -version = "0.8.0" -source = "git+https://github.com/bherbruck/solidcraft?rev=de1479029dd6821cffd28b70688a58e7f61f0cfd#de1479029dd6821cffd28b70688a58e7f61f0cfd" +version = "0.11.0" +source = "git+https://github.com/bherbruck/solidcraft?rev=a629236650c44ee73edf36fab0dcd2385103a610#a629236650c44ee73edf36fab0dcd2385103a610" dependencies = [ "serde", "solidcraft-geom", @@ -3671,7 +3676,7 @@ dependencies = [ "getrandom 0.4.3", "once_cell", "rustix 1.1.5", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -3907,7 +3912,7 @@ dependencies = [ [[package]] name = "truck-meshalgo" version = "0.4.0" -source = "git+https://github.com/bherbruck/solidcraft?rev=de1479029dd6821cffd28b70688a58e7f61f0cfd#de1479029dd6821cffd28b70688a58e7f61f0cfd" +source = "git+https://github.com/bherbruck/solidcraft?rev=a629236650c44ee73edf36fab0dcd2385103a610#a629236650c44ee73edf36fab0dcd2385103a610" dependencies = [ "array-macro", "derive_more", @@ -3957,7 +3962,7 @@ dependencies = [ [[package]] name = "truck-shapeops" version = "0.4.0" -source = "git+https://github.com/bherbruck/solidcraft?rev=de1479029dd6821cffd28b70688a58e7f61f0cfd#de1479029dd6821cffd28b70688a58e7f61f0cfd" +source = "git+https://github.com/bherbruck/solidcraft?rev=a629236650c44ee73edf36fab0dcd2385103a610#a629236650c44ee73edf36fab0dcd2385103a610" dependencies = [ "derive_more", "itertools 0.13.0", @@ -3972,7 +3977,7 @@ dependencies = [ [[package]] name = "truck-stepio" version = "0.3.0" -source = "git+https://github.com/bherbruck/solidcraft?rev=de1479029dd6821cffd28b70688a58e7f61f0cfd#de1479029dd6821cffd28b70688a58e7f61f0cfd" +source = "git+https://github.com/bherbruck/solidcraft?rev=a629236650c44ee73edf36fab0dcd2385103a610#a629236650c44ee73edf36fab0dcd2385103a610" dependencies = [ "chrono", "truck-geometry", @@ -4026,7 +4031,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e" dependencies = [ "memoffset", "tempfile", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -4567,7 +4572,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -4912,7 +4917,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d6f32a0ff4a9f6f01231eb2059cc85479330739333e0e58cadf03b6af2cca10" dependencies = [ "cfg-if", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 0f7cef4..5bb1c22 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,13 +58,13 @@ rfd = "0.17" # Geometry: SolidCraft's B-rep kernel (MIT OR Apache-2.0), pinned. Only crates/geometry uses it # (plan/adr/0001-libraries.md). -solidcraft-geom = { git = "https://github.com/bherbruck/solidcraft", rev = "de1479029dd6821cffd28b70688a58e7f61f0cfd" } -solidcraft-kernel = { git = "https://github.com/bherbruck/solidcraft", rev = "de1479029dd6821cffd28b70688a58e7f61f0cfd" } -solidcraft-doc = { git = "https://github.com/bherbruck/solidcraft", rev = "de1479029dd6821cffd28b70688a58e7f61f0cfd" } -solidcraft-io = { git = "https://github.com/bherbruck/solidcraft", rev = "de1479029dd6821cffd28b70688a58e7f61f0cfd" } +solidcraft-geom = { git = "https://github.com/bherbruck/solidcraft", rev = "a629236650c44ee73edf36fab0dcd2385103a610" } +solidcraft-kernel = { git = "https://github.com/bherbruck/solidcraft", rev = "a629236650c44ee73edf36fab0dcd2385103a610" } +solidcraft-doc = { git = "https://github.com/bherbruck/solidcraft", rev = "a629236650c44ee73edf36fab0dcd2385103a610" } +solidcraft-io = { git = "https://github.com/bherbruck/solidcraft", rev = "a629236650c44ee73edf36fab0dcd2385103a610" } # Runs SolidCraft command scripts (the test corpus recipes); only behind fieldcraft-geometry's # `scripts` feature. -solidcraft-engine = { git = "https://github.com/bherbruck/solidcraft", rev = "de1479029dd6821cffd28b70688a58e7f61f0cfd" } +solidcraft-engine = { git = "https://github.com/bherbruck/solidcraft", rev = "a629236650c44ee73edf36fab0dcd2385103a610" } [workspace.lints.rust] unsafe_code = "forbid" @@ -128,10 +128,10 @@ debug = "line-tables-only" # reach a dependent workspace, so FieldCraft applies the same ones from the same pinned commit; # keep this list and the rev in step with SolidCraft's [patch.crates-io]. [patch.crates-io] -truck-shapeops = { git = "https://github.com/bherbruck/solidcraft", rev = "de1479029dd6821cffd28b70688a58e7f61f0cfd" } -truck-stepio = { git = "https://github.com/bherbruck/solidcraft", rev = "de1479029dd6821cffd28b70688a58e7f61f0cfd" } -truck-meshalgo = { git = "https://github.com/bherbruck/solidcraft", rev = "de1479029dd6821cffd28b70688a58e7f61f0cfd" } -matext4cgmath = { git = "https://github.com/bherbruck/solidcraft", rev = "de1479029dd6821cffd28b70688a58e7f61f0cfd" } +truck-shapeops = { git = "https://github.com/bherbruck/solidcraft", rev = "a629236650c44ee73edf36fab0dcd2385103a610" } +truck-stepio = { git = "https://github.com/bherbruck/solidcraft", rev = "a629236650c44ee73edf36fab0dcd2385103a610" } +truck-meshalgo = { git = "https://github.com/bherbruck/solidcraft", rev = "a629236650c44ee73edf36fab0dcd2385103a610" } +matext4cgmath = { git = "https://github.com/bherbruck/solidcraft", rev = "a629236650c44ee73edf36fab0dcd2385103a610" } # egui-wgpu with SolidCraft's fixes (vendor/egui-wgpu there): MSAA clamped to what the device # supports and 1x on OpenGL adapters, so the requested 4x never fails pipeline validation at start. -egui-wgpu = { git = "https://github.com/bherbruck/solidcraft", rev = "de1479029dd6821cffd28b70688a58e7f61f0cfd" } +egui-wgpu = { git = "https://github.com/bherbruck/solidcraft", rev = "a629236650c44ee73edf36fab0dcd2385103a610" } diff --git a/THIRD-PARTY-LICENSES.txt b/THIRD-PARTY-LICENSES.txt index acec61b..dcffe15 100644 --- a/THIRD-PARTY-LICENSES.txt +++ b/THIRD-PARTY-LICENSES.txt @@ -312,13 +312,13 @@ smithay-client-toolkit 0.19.2 (MIT) smithay-client-toolkit 0.20.0 (MIT) smithay-clipboard 0.7.3 (MIT) smol_str 0.2.2 (MIT OR Apache-2.0) -solidcraft-doc 0.8.0 (MIT OR Apache-2.0) -solidcraft-engine 0.8.0 (MIT OR Apache-2.0) -solidcraft-geom 0.8.0 (MIT OR Apache-2.0) -solidcraft-io 0.8.0 (MIT OR Apache-2.0) -solidcraft-kernel 0.8.0 (MIT OR Apache-2.0) -solidcraft-render 0.8.0 (MIT OR Apache-2.0) -solidcraft-sketch 0.8.0 (MIT OR Apache-2.0) +solidcraft-doc 0.11.0 (MIT OR Apache-2.0) +solidcraft-engine 0.11.0 (MIT OR Apache-2.0) +solidcraft-geom 0.11.0 (MIT OR Apache-2.0) +solidcraft-io 0.11.0 (MIT OR Apache-2.0) +solidcraft-kernel 0.11.0 (MIT OR Apache-2.0) +solidcraft-render 0.11.0 (MIT OR Apache-2.0) +solidcraft-sketch 0.11.0 (MIT OR Apache-2.0) spade 2.15.1 (MIT OR Apache-2.0) spirv 0.4.0+sdk-1.4.341.0 (Apache-2.0) static_assertions 1.1.0 (MIT OR Apache-2.0) @@ -13308,13 +13308,13 @@ objc2-user-notifications 0.2.2: MIT (https://github.com/madsmtm/objc2) profiling 1.0.18: MIT OR Apache-2.0 (https://github.com/aclysma/profiling) r-efi 5.3.0: MIT OR Apache-2.0 OR LGPL-2.1-or-later (https://github.com/r-efi/r-efi) r-efi 6.0.0: MIT OR Apache-2.0 OR LGPL-2.1-or-later (https://github.com/r-efi/r-efi) -solidcraft-doc 0.8.0: MIT OR Apache-2.0 -solidcraft-engine 0.8.0: MIT OR Apache-2.0 -solidcraft-geom 0.8.0: MIT OR Apache-2.0 -solidcraft-io 0.8.0: MIT OR Apache-2.0 -solidcraft-kernel 0.8.0: MIT OR Apache-2.0 -solidcraft-render 0.8.0: MIT OR Apache-2.0 -solidcraft-sketch 0.8.0: MIT OR Apache-2.0 +solidcraft-doc 0.11.0: MIT OR Apache-2.0 +solidcraft-engine 0.11.0: MIT OR Apache-2.0 +solidcraft-geom 0.11.0: MIT OR Apache-2.0 +solidcraft-io 0.11.0: MIT OR Apache-2.0 +solidcraft-kernel 0.11.0: MIT OR Apache-2.0 +solidcraft-render 0.11.0: MIT OR Apache-2.0 +solidcraft-sketch 0.11.0: MIT OR Apache-2.0 spirv 0.4.0+sdk-1.4.341.0: Apache-2.0 (https://github.com/gfx-rs/rspirv) truck-base 0.5.0: Apache-2.0 (https://github.com/ricosjp/truck) truck-derivers 0.1.0: Apache-2.0 (https://github.com/ricosjp/truck) diff --git a/crates/geometry/src/sample.rs b/crates/geometry/src/sample.rs index 7cdbd13..3976954 100644 --- a/crates/geometry/src/sample.rs +++ b/crates/geometry/src/sample.rs @@ -50,6 +50,7 @@ fn extrude(sketch: u64, distance: &str, operation: Operation) -> FeatureKind { }, operation, targets: vec![], + thin: None, } }