1b-agent/OneCAD-Simulation
1
0 Fork 0
forked from 1b-agent/fieldcraft-upstream
Code Pull Requests Activity

deps: move the SolidCraft pin to a629236 (main, 2026-10-14)

Browse Source 
Moves every solidcraft-* rev and the truck/egui-wgpu patches (same list upstream) from
de1479029dd6 to a629236650c4. Extrude gained a 'thin' option; the sample plate keeps a
solid extrude (thin: None). THIRD-PARTY-LICENSES.txt regenerated (solidcraft 0.8.0 -> 0.11.0).

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Claude-Session: https://claude.ai/code/session_01UhhZMBTviDQxZvwnyP89fo
This commit is contained in:
jyvikoandClaude Opus 5.5 authored and Irakli Kourtis committed 2026-10-14 19:05:38 -04:00
1 parent 8409101483
commit 4c91f9b731
4 files changed
+55 -49
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Cargo.lock
Generated
+30 -25
View File
@@ -1019,7 +1019,7 @@ dependencies = [
[[package]] [[package]]
name = "egui-wgpu" name = "egui-wgpu"
version = "0.36.2" 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 = [ dependencies = [
"ahash", "ahash",
"bytemuck", "bytemuck",
@@ -1170,7 +1170,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
dependencies = [ dependencies = [
"libc", "libc",
"windows-sys 0.61.2", "windows-sys 0.60.2",
] ]
[[package]] [[package]]
@@ -1864,6 +1864,8 @@ dependencies = [
"num-traits", "num-traits",
"png", "png",
"tiff", "tiff",
"zune-core",
"zune-jpeg",
] ]
[[package]] [[package]]
@@ -2101,7 +2103,7 @@ checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
[[package]] [[package]]
name = "matext4cgmath" name = "matext4cgmath"
version = "0.1.0" 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 = [ dependencies = [
"cgmath", "cgmath",
"katexit", "katexit",
@@ -3204,7 +3206,7 @@ dependencies = [
"errno", "errno",
"libc", "libc",
"linux-raw-sys 0.12.1", "linux-raw-sys 0.12.1",
"windows-sys 0.61.2", "windows-sys 0.60.2",
] ]
[[package]] [[package]]
@@ -3489,8 +3491,8 @@ dependencies = [
[[package]] [[package]]
name = "solidcraft-doc" name = "solidcraft-doc"
version = "0.8.0" version = "0.11.0"
source = "git+https://github.com/bherbruck/solidcraft?rev=de1479029dd6821cffd28b70688a58e7f61f0cfd#de1479029dd6821cffd28b70688a58e7f61f0cfd" source = "git+https://github.com/bherbruck/solidcraft?rev=a629236650c44ee73edf36fab0dcd2385103a610#a629236650c44ee73edf36fab0dcd2385103a610"
dependencies = [ dependencies = [
"log", "log",
"serde", "serde",
@@ -3498,6 +3500,7 @@ dependencies = [
"sha2 0.10.9", "sha2 0.10.9",
"solidcraft-geom", "solidcraft-geom",
"solidcraft-kernel", "solidcraft-kernel",
"solidcraft-render",
"solidcraft-sketch", "solidcraft-sketch",
"thiserror 2.0.21", "thiserror 2.0.21",
"web-time", "web-time",
@@ -3505,8 +3508,8 @@ dependencies = [
[[package]] [[package]]
name = "solidcraft-engine" name = "solidcraft-engine"
version = "0.8.0" version = "0.11.0"
source = "git+https://github.com/bherbruck/solidcraft?rev=de1479029dd6821cffd28b70688a58e7f61f0cfd#de1479029dd6821cffd28b70688a58e7f61f0cfd" source = "git+https://github.com/bherbruck/solidcraft?rev=a629236650c44ee73edf36fab0dcd2385103a610#a629236650c44ee73edf36fab0dcd2385103a610"
dependencies = [ dependencies = [
"log", "log",
"serde", "serde",
@@ -3522,8 +3525,8 @@ dependencies = [
[[package]] [[package]]
name = "solidcraft-geom" name = "solidcraft-geom"
version = "0.8.0" version = "0.11.0"
source = "git+https://github.com/bherbruck/solidcraft?rev=de1479029dd6821cffd28b70688a58e7f61f0cfd#de1479029dd6821cffd28b70688a58e7f61f0cfd" source = "git+https://github.com/bherbruck/solidcraft?rev=a629236650c44ee73edf36fab0dcd2385103a610#a629236650c44ee73edf36fab0dcd2385103a610"
dependencies = [ dependencies = [
"serde", "serde",
"thiserror 2.0.21", "thiserror 2.0.21",
@@ -3531,8 +3534,8 @@ dependencies = [
[[package]] [[package]]
name = "solidcraft-io" name = "solidcraft-io"
version = "0.8.0" version = "0.11.0"
source = "git+https://github.com/bherbruck/solidcraft?rev=de1479029dd6821cffd28b70688a58e7f61f0cfd#de1479029dd6821cffd28b70688a58e7f61f0cfd" source = "git+https://github.com/bherbruck/solidcraft?rev=a629236650c44ee73edf36fab0dcd2385103a610#a629236650c44ee73edf36fab0dcd2385103a610"
dependencies = [ dependencies = [
"quick-xml", "quick-xml",
"serde", "serde",
@@ -3547,13 +3550,15 @@ dependencies = [
[[package]] [[package]]
name = "solidcraft-kernel" name = "solidcraft-kernel"
version = "0.8.0" version = "0.11.0"
source = "git+https://github.com/bherbruck/solidcraft?rev=de1479029dd6821cffd28b70688a58e7f61f0cfd#de1479029dd6821cffd28b70688a58e7f61f0cfd" source = "git+https://github.com/bherbruck/solidcraft?rev=a629236650c44ee73edf36fab0dcd2385103a610#a629236650c44ee73edf36fab0dcd2385103a610"
dependencies = [ dependencies = [
"log", "log",
"rayon",
"serde", "serde",
"serde_json", "serde_json",
"solidcraft-geom", "solidcraft-geom",
"spade",
"thiserror 2.0.21", "thiserror 2.0.21",
"truck-meshalgo", "truck-meshalgo",
"truck-modeling", "truck-modeling",
@@ -3564,8 +3569,8 @@ dependencies = [
[[package]] [[package]]
name = "solidcraft-render" name = "solidcraft-render"
version = "0.8.0" version = "0.11.0"
source = "git+https://github.com/bherbruck/solidcraft?rev=de1479029dd6821cffd28b70688a58e7f61f0cfd#de1479029dd6821cffd28b70688a58e7f61f0cfd" source = "git+https://github.com/bherbruck/solidcraft?rev=a629236650c44ee73edf36fab0dcd2385103a610#a629236650c44ee73edf36fab0dcd2385103a610"
dependencies = [ dependencies = [
"image", "image",
"serde", "serde",
@@ -3574,8 +3579,8 @@ dependencies = [
[[package]] [[package]]
name = "solidcraft-sketch" name = "solidcraft-sketch"
version = "0.8.0" version = "0.11.0"
source = "git+https://github.com/bherbruck/solidcraft?rev=de1479029dd6821cffd28b70688a58e7f61f0cfd#de1479029dd6821cffd28b70688a58e7f61f0cfd" source = "git+https://github.com/bherbruck/solidcraft?rev=a629236650c44ee73edf36fab0dcd2385103a610#a629236650c44ee73edf36fab0dcd2385103a610"
dependencies = [ dependencies = [
"serde", "serde",
"solidcraft-geom", "solidcraft-geom",
@@ -3671,7 +3676,7 @@ dependencies = [
"getrandom 0.4.3", "getrandom 0.4.3",
"once_cell", "once_cell",
"rustix 1.1.5", "rustix 1.1.5",
"windows-sys 0.61.2", "windows-sys 0.60.2",
] ]
[[package]] [[package]]
@@ -3907,7 +3912,7 @@ dependencies = [
[[package]] [[package]]
name = "truck-meshalgo" name = "truck-meshalgo"
version = "0.4.0" 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 = [ dependencies = [
"array-macro", "array-macro",
"derive_more", "derive_more",
@@ -3957,7 +3962,7 @@ dependencies = [
[[package]] [[package]]
name = "truck-shapeops" name = "truck-shapeops"
version = "0.4.0" 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 = [ dependencies = [
"derive_more", "derive_more",
"itertools 0.13.0", "itertools 0.13.0",
@@ -3972,7 +3977,7 @@ dependencies = [
[[package]] [[package]]
name = "truck-stepio" name = "truck-stepio"
version = "0.3.0" 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 = [ dependencies = [
"chrono", "chrono",
"truck-geometry", "truck-geometry",
@@ -4026,7 +4031,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e"
dependencies = [ dependencies = [
"memoffset", "memoffset",
"tempfile", "tempfile",
"windows-sys 0.61.2", "windows-sys 0.60.2",
] ]
[[package]] [[package]]
@@ -4567,7 +4572,7 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
dependencies = [ dependencies = [
"windows-sys 0.61.2", "windows-sys 0.60.2",
] ]
[[package]] [[package]]
@@ -4912,7 +4917,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d6f32a0ff4a9f6f01231eb2059cc85479330739333e0e58cadf03b6af2cca10" checksum = "7d6f32a0ff4a9f6f01231eb2059cc85479330739333e0e58cadf03b6af2cca10"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"windows-sys 0.61.2", "windows-sys 0.60.2",
] ]
[[package]] [[package]]
Cargo.toml
+10 -10
View File
@@ -58,13 +58,13 @@ rfd = "0.17"
# Geometry: SolidCraft's B-rep kernel (MIT OR Apache-2.0), pinned. Only crates/geometry uses it # Geometry: SolidCraft's B-rep kernel (MIT OR Apache-2.0), pinned. Only crates/geometry uses it
# (plan/adr/0001-libraries.md). # (plan/adr/0001-libraries.md).
solidcraft-geom = { 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 = "de1479029dd6821cffd28b70688a58e7f61f0cfd" } solidcraft-kernel = { git = "https://github.com/bherbruck/solidcraft", rev = "a629236650c44ee73edf36fab0dcd2385103a610" }
solidcraft-doc = { git = "https://github.com/bherbruck/solidcraft", rev = "de1479029dd6821cffd28b70688a58e7f61f0cfd" } solidcraft-doc = { git = "https://github.com/bherbruck/solidcraft", rev = "a629236650c44ee73edf36fab0dcd2385103a610" }
solidcraft-io = { git = "https://github.com/bherbruck/solidcraft", rev = "de1479029dd6821cffd28b70688a58e7f61f0cfd" } solidcraft-io = { git = "https://github.com/bherbruck/solidcraft", rev = "a629236650c44ee73edf36fab0dcd2385103a610" }
# Runs SolidCraft command scripts (the test corpus recipes); only behind fieldcraft-geometry's # Runs SolidCraft command scripts (the test corpus recipes); only behind fieldcraft-geometry's
# `scripts` feature. # `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] [workspace.lints.rust]
unsafe_code = "forbid" 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; # 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]. # keep this list and the rev in step with SolidCraft's [patch.crates-io].
[patch.crates-io] [patch.crates-io]
truck-shapeops = { 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 = "de1479029dd6821cffd28b70688a58e7f61f0cfd" } truck-stepio = { git = "https://github.com/bherbruck/solidcraft", rev = "a629236650c44ee73edf36fab0dcd2385103a610" }
truck-meshalgo = { git = "https://github.com/bherbruck/solidcraft", rev = "de1479029dd6821cffd28b70688a58e7f61f0cfd" } truck-meshalgo = { git = "https://github.com/bherbruck/solidcraft", rev = "a629236650c44ee73edf36fab0dcd2385103a610" }
matext4cgmath = { git = "https://github.com/bherbruck/solidcraft", rev = "de1479029dd6821cffd28b70688a58e7f61f0cfd" } 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 # 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. # 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" }
THIRD-PARTY-LICENSES.txt
+14 -14
View File
@@ -312,13 +312,13 @@ smithay-client-toolkit 0.19.2 (MIT)
smithay-client-toolkit 0.20.0 (MIT) smithay-client-toolkit 0.20.0 (MIT)
smithay-clipboard 0.7.3 (MIT) smithay-clipboard 0.7.3 (MIT)
smol_str 0.2.2 (MIT OR Apache-2.0) smol_str 0.2.2 (MIT OR Apache-2.0)
solidcraft-doc 0.8.0 (MIT OR Apache-2.0) solidcraft-doc 0.11.0 (MIT OR Apache-2.0)
solidcraft-engine 0.8.0 (MIT OR Apache-2.0) solidcraft-engine 0.11.0 (MIT OR Apache-2.0)
solidcraft-geom 0.8.0 (MIT OR Apache-2.0) solidcraft-geom 0.11.0 (MIT OR Apache-2.0)
solidcraft-io 0.8.0 (MIT OR Apache-2.0) solidcraft-io 0.11.0 (MIT OR Apache-2.0)
solidcraft-kernel 0.8.0 (MIT OR Apache-2.0) solidcraft-kernel 0.11.0 (MIT OR Apache-2.0)
solidcraft-render 0.8.0 (MIT OR Apache-2.0) solidcraft-render 0.11.0 (MIT OR Apache-2.0)
solidcraft-sketch 0.8.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) spade 2.15.1 (MIT OR Apache-2.0)
spirv 0.4.0+sdk-1.4.341.0 (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) 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) 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 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) 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-doc 0.11.0: MIT OR Apache-2.0
solidcraft-engine 0.8.0: MIT OR Apache-2.0 solidcraft-engine 0.11.0: MIT OR Apache-2.0
solidcraft-geom 0.8.0: MIT OR Apache-2.0 solidcraft-geom 0.11.0: MIT OR Apache-2.0
solidcraft-io 0.8.0: MIT OR Apache-2.0 solidcraft-io 0.11.0: MIT OR Apache-2.0
solidcraft-kernel 0.8.0: MIT OR Apache-2.0 solidcraft-kernel 0.11.0: MIT OR Apache-2.0
solidcraft-render 0.8.0: MIT OR Apache-2.0 solidcraft-render 0.11.0: MIT OR Apache-2.0
solidcraft-sketch 0.8.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) 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-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) truck-derivers 0.1.0: Apache-2.0 (https://github.com/ricosjp/truck)
crates/geometry/src/sample.rs
+1
View File
@@ -50,6 +50,7 @@ fn extrude(sketch: u64, distance: &str, operation: Operation) -> FeatureKind {
}, },
operation, operation,
targets: vec![], targets: vec![],
thin: None,
} }
} }