From 492463e0838ed9eb4916b3c1711b8573800a8a49 Mon Sep 17 00:00:00 2001 From: Matt Ferraro Date: Wed, 15 May 2024 12:33:18 -0400 Subject: [PATCH] update to latest version of truck --- packages/cadmium/Cargo.lock | 536 +++++++++++++++++++---------- packages/cadmium/Cargo.toml | 18 +- packages/cadmium/src/extrusion.rs | 8 +- packages/cadmium/src/project.rs | 4 +- packages/cadmium/src/sketch/mod.rs | 2 +- 5 files changed, 374 insertions(+), 194 deletions(-) diff --git a/packages/cadmium/Cargo.lock b/packages/cadmium/Cargo.lock index b7420de8..69a70add 100644 --- a/packages/cadmium/Cargo.lock +++ b/packages/cadmium/Cargo.lock @@ -12,15 +12,39 @@ dependencies = [ "regex", ] +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + [[package]] name = "aho-corasick" version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ - "memchr", + "memchr 2.6.4", ] +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + [[package]] name = "android-tzdata" version = "0.1.1" @@ -45,6 +69,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "array-macro" +version = "2.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "220a2c618ab466efe41d0eace94dfeff1c35e3aa47891bdb95e1c0fefffd3c99" + [[package]] name = "atomic-polyfill" version = "0.1.11" @@ -60,12 +90,24 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + [[package]] name = "base64" version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + [[package]] name = "block-buffer" version = "0.10.4" @@ -75,6 +117,12 @@ dependencies = [ "generic-array", ] +[[package]] +name = "branches" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7958fb9748a08a6f46ef773e87c43997a844709bc293b4c3de48135debaf9d2a" + [[package]] name = "bumpalo" version = "3.13.0" @@ -83,9 +131,9 @@ checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" dependencies = [ "bytemuck_derive", ] @@ -98,7 +146,7 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.63", ] [[package]] @@ -115,7 +163,7 @@ dependencies = [ "crc32fast", "geo", "indexmap 2.1.0", - "itertools 0.11.0", + "itertools 0.12.1", "serde", "serde_json", "serde_with", @@ -159,9 +207,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -169,7 +217,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets", + "windows-targets 0.52.5", ] [[package]] @@ -218,16 +266,6 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - [[package]] name = "crossbeam-deque" version = "0.8.3" @@ -292,7 +330,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.31", + "syn 2.0.63", ] [[package]] @@ -303,7 +341,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.31", + "syn 2.0.63", ] [[package]] @@ -372,6 +410,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "flate2" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + [[package]] name = "float_next_after" version = "1.0.0" @@ -406,7 +454,7 @@ dependencies = [ "geographiclib-rs", "log", "num-traits", - "robust 1.1.0", + "robust", "rstar", ] @@ -433,9 +481,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -477,6 +525,10 @@ name = "hashbrown" version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +dependencies = [ + "ahash", + "allocator-api2", +] [[package]] name = "heapless" @@ -491,12 +543,6 @@ dependencies = [ "stable_deref_trait", ] -[[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - [[package]] name = "hex" version = "0.4.3" @@ -565,9 +611,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] @@ -606,9 +652,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libm" @@ -632,6 +678,23 @@ version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +[[package]] +name = "lz4_flex" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05304f8e67dfc93d1b4b990137fd1a7a4c6ad44b60a9c486c8c4486f9d2027ae" + +[[package]] +name = "lzma-sys" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "matext4cgmath" version = "0.1.0" @@ -643,6 +706,15 @@ dependencies = [ "num-complex", ] +[[package]] +name = "memchr" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a" +dependencies = [ + "libc", +] + [[package]] name = "memchr" version = "2.6.4" @@ -665,38 +737,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] -name = "nom" -version = "7.1.3" +name = "miniz_oxide" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ - "memchr", - "minimal-lexical", + "adler", ] [[package]] -name = "num" -version = "0.4.1" +name = "nom" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "05aec50c70fd288702bcd93284a8444607f3292dbdf2a30de5ea5dcdbe72287b" dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", + "memchr 1.0.2", ] [[package]] -name = "num-bigint" -version = "0.4.4" +name = "nom" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ - "autocfg", - "num-integer", - "num-traits", + "memchr 2.6.4", + "minimal-lexical", ] [[package]] @@ -709,69 +774,60 @@ dependencies = [ ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "num-derive" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "autocfg", - "num-traits", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] -name = "num-iter" -version = "0.1.43" +name = "num-traits" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", - "num-integer", - "num-traits", + "libm", ] [[package]] -name = "num-rational" -version = "0.4.1" +name = "once_cell" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-bigint", - "num-integer", - "num-traits", -] +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] -name = "num-traits" -version = "0.2.16" +name = "parking_lot" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ - "autocfg", - "libm", + "lock_api", + "parking_lot_core", ] [[package]] -name = "num_cpus" -version = "1.16.0" +name = "parking_lot_core" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ - "hermit-abi", + "cfg-if", "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.5", ] [[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "optional" -version = "0.5.0" +name = "pkg-config" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978aa494585d3ca4ad74929863093e87cac9790d81fe7aba2b3dc2890643a0fc" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "powerfmt" @@ -821,18 +877,28 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] +[[package]] +name = "quick-xml" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8533f14c8382aaad0d592c812ac3b826162128b65662331e1127b45c3d18536b" +dependencies = [ + "memchr 2.6.4", + "serde", +] + [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -869,9 +935,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -879,14 +945,30 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", +] + +[[package]] +name = "rclite" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee9f0c2e8b8ef3ea8b0d074b9a0a192d99d47e2023bec8fd6336f2d8543a43b9" +dependencies = [ + "branches", +] + +[[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags", ] [[package]] @@ -896,7 +978,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", - "memchr", + "memchr 2.6.4", "regex-automata", "regex-syntax", ] @@ -908,7 +990,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", - "memchr", + "memchr 2.6.4", "regex-syntax", ] @@ -918,12 +1000,6 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" -[[package]] -name = "robust" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5864e7ef1a6b7bcf1d6ca3f655e65e724ed3b52546a0d0a663c991522f552ea" - [[package]] name = "robust" version = "1.1.0" @@ -959,14 +1035,13 @@ dependencies = [ [[package]] name = "ruststep" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a7016cfd0a9bd9cd6b66e34595fd92200c28bb6c93f8faca1827abbfc91869c" +source = "git+https://github.com/ricosjp/ruststep.git#54110736cb37643bfd232f672f157cbfce9118e2" dependencies = [ "Inflector", "derive-new", "derive_more", "itertools 0.10.5", - "nom", + "nom 7.1.3", "ruststep-derive", "serde", "thiserror", @@ -975,15 +1050,14 @@ dependencies = [ [[package]] name = "ruststep-derive" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfef94f41ad49b725d3142226de04b6aca98f69b9f426f8a36673765337d30a0" +source = "git+https://github.com/ricosjp/ruststep.git#54110736cb37643bfd232f672f157cbfce9118e2" dependencies = [ "Inflector", "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.63", ] [[package]] @@ -1006,22 +1080,22 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.63", ] [[package]] @@ -1032,14 +1106,14 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.63", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -1052,7 +1126,7 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" dependencies = [ - "base64", + "base64 0.21.5", "chrono", "hex", "indexmap 1.9.3", @@ -1072,7 +1146,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.63", ] [[package]] @@ -1094,13 +1168,13 @@ checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "spade" -version = "2.2.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88e65803986868d2372c582007c39ba89936a36ea5f236bf7a7728dc258f04f9" +checksum = "61addf9117b11d1f5b4bf6fe94242ba25f59d2d4b2080544b771bd647024fd00" dependencies = [ + "hashbrown 0.14.2", "num-traits", - "optional", - "robust 0.2.3", + "robust", "smallvec", ] @@ -1144,9 +1218,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.31" +version = "2.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" +checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704" dependencies = [ "proc-macro2", "quote", @@ -1155,22 +1229,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.63", ] [[package]] @@ -1222,8 +1296,7 @@ dependencies = [ [[package]] name = "truck-base" version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a46ac0ee80e2f3c637bb33cf343ef089b3e08a6e239d2055f9cee1ab772a589" +source = "git+https://github.com/ricosjp/truck.git#293d8bc9e7cc42412188731d4a1a45a1cf3e0069" dependencies = [ "cgmath", "matext4cgmath", @@ -1232,25 +1305,21 @@ dependencies = [ ] [[package]] -name = "truck-geoderive" +name = "truck-derivers" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9842e8eb42dd66e67cf9f4aefe87ba694c26c4b77feb72eb91cdf504b2d7d2d4" +source = "git+https://github.com/ricosjp/truck.git#293d8bc9e7cc42412188731d4a1a45a1cf3e0069" dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.63", ] [[package]] name = "truck-geometry" version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446c205a306566bb71faf6ad2978a049a36c8aa703280097fc94fdedf21969a5" +source = "git+https://github.com/ricosjp/truck.git#293d8bc9e7cc42412188731d4a1a45a1cf3e0069" dependencies = [ - "derive_more", - "num", "serde", "thiserror", "truck-base", @@ -1260,37 +1329,37 @@ dependencies = [ [[package]] name = "truck-geotrait" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db5f92f97e3969ed49571da4796a2fb1825b92e2b40dff3cfaa32bb4f5dbd93" +source = "git+https://github.com/ricosjp/truck.git#293d8bc9e7cc42412188731d4a1a45a1cf3e0069" dependencies = [ "getrandom", "rand", "thiserror", "truck-base", - "truck-geoderive", + "truck-derivers", ] [[package]] name = "truck-meshalgo" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177091bfd87f3df7d736987e0ced9e65c83d6c10d9a84b4563d8aa2d84a00e80" +source = "git+https://github.com/ricosjp/truck.git#293d8bc9e7cc42412188731d4a1a45a1cf3e0069" dependencies = [ + "array-macro", "derive_more", + "itertools 0.12.1", "rayon", "rustc-hash", "spade", "truck-base", - "truck-geotrait", + "truck-geometry", "truck-polymesh", "truck-topology", + "vtkio", ] [[package]] name = "truck-modeling" version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d34836af7708e5e16cf6c984cf96eea360bfa05e0a25d5d8206c8e601e1a169" +source = "git+https://github.com/ricosjp/truck.git#293d8bc9e7cc42412188731d4a1a45a1cf3e0069" dependencies = [ "derive_more", "rustc-hash", @@ -1306,10 +1375,11 @@ dependencies = [ [[package]] name = "truck-polymesh" version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7d11d353c49d3850d0a19b945663ffb2d25481d39cffaceb09a066242885d" +source = "git+https://github.com/ricosjp/truck.git#293d8bc9e7cc42412188731d4a1a45a1cf3e0069" dependencies = [ + "array-macro", "bytemuck", + "itertools 0.12.1", "rustc-hash", "serde", "thiserror", @@ -1320,32 +1390,29 @@ dependencies = [ [[package]] name = "truck-shapeops" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3183d814983830e1ea2e784cfa75eef04ca6f31a1a78b55bb1ce3e738220f82" +source = "git+https://github.com/ricosjp/truck.git#293d8bc9e7cc42412188731d4a1a45a1cf3e0069" dependencies = [ "derive_more", + "itertools 0.12.1", "rustc-hash", - "serde", - "thiserror", "truck-base", "truck-geometry", + "truck-geotrait", "truck-meshalgo", + "truck-stepio", "truck-topology", ] [[package]] name = "truck-stepio" version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62767ff5b7ef624344c6a3bd5d15e1187929eded2606c84d1ae35710ac3a4738" +source = "git+https://github.com/ricosjp/truck.git#293d8bc9e7cc42412188731d4a1a45a1cf3e0069" dependencies = [ "chrono", "derive_more", - "rustc-hash", "ruststep", - "ruststep-derive", "serde", - "truck-base", + "truck-derivers", "truck-geometry", "truck-geotrait", "truck-modeling", @@ -1356,10 +1423,11 @@ dependencies = [ [[package]] name = "truck-topology" version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25d78b894ca30acb33c5bd52e36460a2beb856a50a8228410eef9775197698e4" +source = "git+https://github.com/ricosjp/truck.git#293d8bc9e7cc42412188731d4a1a45a1cf3e0069" dependencies = [ + "parking_lot", "rayon", + "rclite", "rustc-hash", "serde", "thiserror", @@ -1387,7 +1455,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.31", + "syn 2.0.63", ] [[package]] @@ -1408,6 +1476,25 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "vtkio" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abbe89e5b97b472d57abeb02755a06d75b28d2df7d1fe3df5baf032281a65c16" +dependencies = [ + "base64 0.13.1", + "bytemuck", + "byteorder", + "flate2", + "lz4_flex", + "nom 3.2.1", + "num-derive", + "num-traits", + "quick-xml", + "serde", + "xz2", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -1435,7 +1522,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.63", "wasm-bindgen-shared", ] @@ -1457,7 +1544,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.63", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -1484,7 +1571,7 @@ version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -1493,13 +1580,29 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -1508,47 +1611,124 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + [[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + [[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + [[package]] name = "winnow" version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" dependencies = [ - "memchr", + "memchr 2.6.4", +] + +[[package]] +name = "xz2" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" +dependencies = [ + "lzma-sys", +] + +[[package]] +name = "zerocopy" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.63", ] diff --git a/packages/cadmium/Cargo.toml b/packages/cadmium/Cargo.toml index ff3e479e..a82b3760 100644 --- a/packages/cadmium/Cargo.toml +++ b/packages/cadmium/Cargo.toml @@ -13,15 +13,15 @@ license = "Elastic License 2.0" console_error_panic_hook = "0.1.7" wasm-bindgen = "0.2.87" tsify = "0.4.5" -truck-meshalgo = "0.3.0" -truck-modeling = "0.5.1" -truck-shapeops = "0.3.0" -truck-polymesh = "0.5.0" -truck-topology = "0.5.0" -truck-stepio = "0.2.0" -serde_json = "1.0.107" -serde = "1.0.188" -itertools = "0.11.0" +truck-meshalgo = { git = "https://github.com/ricosjp/truck.git" } +truck-modeling = { git = "https://github.com/ricosjp/truck.git" } +truck-shapeops = { git = "https://github.com/ricosjp/truck.git" } +truck-polymesh = { git = "https://github.com/ricosjp/truck.git" } +truck-topology = { git = "https://github.com/ricosjp/truck.git" } +truck-stepio = { git = "https://github.com/ricosjp/truck.git" } +serde_json = "1.0.117" +serde = "1.0.202" +itertools = "0.12.1" svg = "0.13.1" geo = "0.26.0" serde_with = "3.4.0" diff --git a/packages/cadmium/src/extrusion.rs b/packages/cadmium/src/extrusion.rs index ce0bfba6..896d0d00 100644 --- a/packages/cadmium/src/extrusion.rs +++ b/packages/cadmium/src/extrusion.rs @@ -130,7 +130,7 @@ impl Solid { truck_solid, }; let mut mesh = solid.truck_solid.triangulation(MESH_TOLERANCE).to_polygon(); - mesh.put_together_same_attrs(); + mesh.put_together_same_attrs(0.1); // the mesh is prepared for obj export, but we need to convert it // to a format compatible for rendering @@ -544,7 +544,7 @@ impl Solid { pub fn to_obj_string(&self, tolerance: f64) -> String { let mut mesh = self.truck_solid.triangulation(tolerance).to_polygon(); - mesh.put_together_same_attrs(); + mesh.put_together_same_attrs(0.1); let mut buf = Vec::new(); obj::write(&mesh, &mut buf).unwrap(); let string = String::from_utf8(buf).unwrap(); @@ -553,7 +553,7 @@ impl Solid { pub fn save_as_obj(&self, filename: &str, tolerance: f64) { let mut mesh = self.truck_solid.triangulation(tolerance).to_polygon(); - mesh.put_together_same_attrs(); + mesh.put_together_same_attrs(0.1); let file = std::fs::File::create(filename).unwrap(); obj::write(&mesh, file).unwrap(); } @@ -563,7 +563,7 @@ impl Solid { let step_string = out::CompleteStepDisplay::new( out::StepModel::from(&compressed), out::StepHeaderDescriptor { - origination_system: "cadmium-shape-to-step".to_owned(), + organization_system: "cadmium-shape-to-step".to_owned(), ..Default::default() }, ) diff --git a/packages/cadmium/src/project.rs b/packages/cadmium/src/project.rs index f0a3c6ea..9cc6d447 100644 --- a/packages/cadmium/src/project.rs +++ b/packages/cadmium/src/project.rs @@ -1864,7 +1864,7 @@ mod tests { let final_solid = &solids["Ext1:0"]; println!("Final solid: {:?}", final_solid.truck_solid); let mut mesh = final_solid.truck_solid.triangulation(0.02).to_polygon(); - mesh.put_together_same_attrs(); + mesh.put_together_same_attrs(0.1); let file = std::fs::File::create("bruno.obj").unwrap(); obj::write(&mesh, file).unwrap(); @@ -1934,7 +1934,7 @@ mod tests { let final_solid = &solids["Ext1:0"]; let mut mesh = final_solid.truck_solid.triangulation(0.02).to_polygon(); - mesh.put_together_same_attrs(); + mesh.put_together_same_attrs(0.1); let file = std::fs::File::create("secondary_extrusion.obj").unwrap(); obj::write(&mesh, file).unwrap(); diff --git a/packages/cadmium/src/sketch/mod.rs b/packages/cadmium/src/sketch/mod.rs index 0739b3ce..f3e0b839 100644 --- a/packages/cadmium/src/sketch/mod.rs +++ b/packages/cadmium/src/sketch/mod.rs @@ -5,7 +5,7 @@ use geo::{point, Contains}; use geo::{within, Intersects}; use serde::{Deserialize, Serialize}; use serde_with::{serde_as, DisplayFromStr}; -use truck_polymesh::stl::PolygonMeshSTLFaceIterator; +use truck_polymesh::stl::PolygonMeshStlFaceIterator; use tsify::Tsify; use core::panic;