From f184bd1ad0ea361514e0da0a8d93a23bd74c95f8 Mon Sep 17 00:00:00 2001 From: Rhys Lloyd Date: Mon, 2 Mar 2026 11:12:58 -0800 Subject: [PATCH 1/4] combobulator: update map-tool --- Cargo.lock | 639 +----------------------------------- combobulator/Cargo.toml | 2 +- combobulator/src/process.rs | 9 +- 3 files changed, 21 insertions(+), 629 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dc8ab87..0555b1e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -63,71 +63,12 @@ dependencies = [ "libc", ] -[[package]] -name = "anstream" -version = "0.6.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" - -[[package]] -name = "anstyle-parse" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" -dependencies = [ - "windows-sys 0.61.2", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" -dependencies = [ - "anstyle", - "once_cell_polyfill", - "windows-sys 0.61.2", -] - [[package]] name = "anyhow" version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" -[[package]] -name = "approx" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278" -dependencies = [ - "num-traits", -] - [[package]] name = "arbitrary" version = "1.4.2" @@ -828,23 +769,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f09c37bc0e9f0924b7dae9988265ef3c76c88538f41a3b06caf4bed07cee5226" -[[package]] -name = "beef" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" - -[[package]] -name = "binrw" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d4bca59c20d6f40c2cc0802afbe1e788b89096f61bdf7aeea6bf00f10c2909b" -dependencies = [ - "array-init", - "binrw_derive 0.14.1", - "bytemuck", -] - [[package]] name = "binrw" version = "0.15.0" @@ -852,23 +776,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81419ff39e6ed10a92a7f125290859776ced35d9a08a665ae40b23e7ca702f30" dependencies = [ "array-init", - "binrw_derive 0.15.0", + "binrw_derive", "bytemuck", ] -[[package]] -name = "binrw_derive" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8ba42866ce5bced2645bfa15e97eef2c62d2bdb530510538de8dd3d04efff3c" -dependencies = [ - "either", - "owo-colors 3.5.0", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "binrw_derive" version = "0.15.0" @@ -876,7 +787,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "376404e55ec40d0d6f8b4b7df3f87b87954bd987f0cf9a7207ea3b6ea5c9add4" dependencies = [ "either", - "owo-colors 4.3.0", + "owo-colors", "proc-macro2", "quote", "syn 2.0.111", @@ -959,15 +870,6 @@ version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" -[[package]] -name = "bv" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8834bb1d8ee5dc048ee3124f2c7c1afcc6bc9aed03f11e9dfd8c69470a5db340" -dependencies = [ - "feature-probe", -] - [[package]] name = "bytemuck" version = "1.25.0" @@ -988,12 +890,6 @@ dependencies = [ "syn 2.0.111", ] -[[package]] -name = "byteorder" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855" - [[package]] name = "byteorder" version = "1.5.0" @@ -1049,16 +945,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" -[[package]] -name = "cgmath" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a98d30140e3296250832bbaaff83b27dcd6fa3cc70fb6f1f3e5c9c0023b5317" -dependencies = [ - "approx", - "num-traits", -] - [[package]] name = "chrono" version = "0.4.42" @@ -1073,46 +959,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "clap" -version = "4.5.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2797f34da339ce31042b27d23607e051786132987f595b02ba4f6a6dffb7030a" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24a241312cea5059b13574bb9b3861cabf758b879c15190b37b6d6fd63ab6876" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.5.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "clap_lex" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831" - [[package]] name = "cmake" version = "0.1.57" @@ -1128,12 +974,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" -[[package]] -name = "colorchoice" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" - [[package]] name = "const-oid" version = "0.9.6" @@ -1329,7 +1169,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479dfe1e6737aa9e96c6ac7b69689dc4c32da8383f2c12744739d76afa8b66c4" dependencies = [ "bitflags 2.10.0", - "byteorder 1.5.0", + "byteorder", "enum-primitive-derive", "num-traits", ] @@ -1580,12 +1420,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "feature-probe" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da" - [[package]] name = "ff" version = "0.12.1" @@ -2366,12 +2200,6 @@ dependencies = [ "serde", ] -[[package]] -name = "is_terminal_polyfill" -version = "1.70.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" - [[package]] name = "ispc_rt" version = "2.0.4" @@ -2382,15 +2210,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.14.0" @@ -2454,12 +2273,6 @@ dependencies = [ "cc", ] -[[package]] -name = "libm" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" - [[package]] name = "libredox" version = "0.1.10" @@ -2508,39 +2321,6 @@ version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" -[[package]] -name = "logos" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7251356ef8cb7aec833ddf598c6cb24d17b689d20b993f9d11a3d764e34e6458" -dependencies = [ - "logos-derive", -] - -[[package]] -name = "logos-codegen" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59f80069600c0d66734f5ff52cc42f2dabd6b29d205f333d61fd7832e9e9963f" -dependencies = [ - "beef", - "fnv", - "lazy_static", - "proc-macro2", - "quote", - "regex-syntax", - "syn 2.0.111", -] - -[[package]] -name = "logos-derive" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24fb722b06a9dc12adb0963ed585f19fc61dc5413e6a9be9422ef92c091e731d" -dependencies = [ - "logos-codegen", -] - [[package]] name = "loop9" version = "0.1.5" @@ -2583,35 +2363,14 @@ dependencies = [ "twox-hash", ] -[[package]] -name = "lzma" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "782ba3f542e8bc1349386c15e9dc3119ae6da96479f96b3863cc7a88bbdfd4e4" -dependencies = [ - "byteorder 0.5.3", -] - -[[package]] -name = "lzma-rs" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" -dependencies = [ - "byteorder 1.5.0", - "crc", -] - [[package]] name = "map-tool" -version = "2.0.0" +version = "3.0.0" source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/" -checksum = "fa8d43046feced02e1e7e57598f4828babb56ae58a38b4904e73d7add8231c0e" +checksum = "93128e63d5ca77f7feb96a38d542c003d5893242f198cfc32a44efb668b79085" dependencies = [ "anyhow", - "clap", "flate2", - "futures", "image", "image_dds", "rbx_asset", @@ -2620,18 +2379,11 @@ dependencies = [ "rbx_reflection_database", "rbx_xml", "rbxassetid", - "strafesnet_bsp_loader", "strafesnet_deferred_loader", "strafesnet_rbx_loader", "strafesnet_snf", "thiserror 2.0.17", "tokio", - "vbsp", - "vbsp-entities-css", - "vmdl", - "vmt-parser", - "vpk", - "vtf", ] [[package]] @@ -2702,28 +2454,6 @@ version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" -[[package]] -name = "miette" -version = "7.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f98efec8807c63c752b5bd61f862c165c115b0a35685bdcfd9238c7aeb592b7" -dependencies = [ - "cfg-if", - "miette-derive", - "unicode-width", -] - -[[package]] -name = "miette-derive" -version = "7.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db5b29714e950dbb20d5e6f74f9dcec4edbcc1067bb7f8ed198c097b8c1a818b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - [[package]] name = "mime" version = "0.3.17" @@ -2928,40 +2658,12 @@ dependencies = [ "libc", ] -[[package]] -name = "num_enum" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c" -dependencies = [ - "num_enum_derive", - "rustversion", -] - -[[package]] -name = "num_enum_derive" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.111", -] - [[package]] name = "once_cell" version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" -[[package]] -name = "once_cell_polyfill" -version = "1.70.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" - [[package]] name = "openssl" version = "0.10.75" @@ -3024,12 +2726,6 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e" -[[package]] -name = "owo-colors" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" - [[package]] name = "owo-colors" version = "4.3.0" @@ -3070,56 +2766,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "parse-display" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914a1c2265c98e2446911282c6ac86d8524f495792c38c5bd884f80499c7538a" -dependencies = [ - "parse-display-derive 0.9.1", - "regex", - "regex-syntax", -] - -[[package]] -name = "parse-display" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287d8d3ebdce117b8539f59411e4ed9ec226e0a4153c7f55495c6070d68e6f72" -dependencies = [ - "parse-display-derive 0.10.0", - "regex", - "regex-syntax", -] - -[[package]] -name = "parse-display-derive" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae7800a4c974efd12df917266338e79a7a74415173caf7e70aa0a0707345281" -dependencies = [ - "proc-macro2", - "quote", - "regex", - "regex-syntax", - "structmeta", - "syn 2.0.111", -] - -[[package]] -name = "parse-display-derive" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc048687be30d79502dea2f623d052f3a074012c6eac41726b7ab17213616b1" -dependencies = [ - "proc-macro2", - "quote", - "regex", - "regex-syntax", - "structmeta", - "syn 2.0.111", -] - [[package]] name = "paste" version = "1.0.15" @@ -3291,15 +2937,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "proc-macro-crate" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" -dependencies = [ - "toml_edit", -] - [[package]] name = "proc-macro2" version = "1.0.103" @@ -3345,7 +2982,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425" dependencies = [ "anyhow", - "itertools 0.14.0", + "itertools", "proc-macro2", "quote", "syn 2.0.111", @@ -3536,7 +3173,7 @@ dependencies = [ "built", "cfg-if", "interpolate_name", - "itertools 0.14.0", + "itertools", "libc", "libfuzzer-sys", "log", @@ -3640,7 +3277,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5136ebd175877254f1ab494e8c2673a85c0b9ae1bca4405cb6e14ade2356df1f" dependencies = [ - "binrw 0.15.0", + "binrw", "regex", ] @@ -3845,7 +3482,7 @@ version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ - "byteorder 1.5.0", + "byteorder", "num-traits", "paste", ] @@ -3856,7 +3493,7 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" dependencies = [ - "byteorder 1.5.0", + "byteorder", "rmp", "serde", ] @@ -4336,27 +3973,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strafesnet_bsp_loader" -version = "0.4.0" -source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/" -checksum = "243b915ef50c2b1efac00630e46f34670a5f3adf7679cb7d696acfd777cb8dcd" -dependencies = [ - "glam 0.32.0", - "strafesnet_common", - "strafesnet_deferred_loader", - "vbsp", - "vbsp-entities-css", - "vmdl", - "vpk", -] - [[package]] name = "strafesnet_common" version = "0.8.6" @@ -4383,9 +3999,9 @@ dependencies = [ [[package]] name = "strafesnet_rbx_loader" -version = "0.8.0" +version = "0.9.0" source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/" -checksum = "c4901e901a08a131d20708e833f4aa811888f0de4b1aa0d0ec829a88bb9898b7" +checksum = "99cb4399914e8005b5af7ee421ff39196d8725acf1e6ceede385747f34ab473d" dependencies = [ "bytemuck", "glam 0.32.0", @@ -4408,40 +4024,11 @@ version = "0.3.2" source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/" checksum = "aab96a189e3f5c4e5eca1feae704c0d6ceaa0de37a41e29ef3a89816e354292f" dependencies = [ - "binrw 0.15.0", + "binrw", "id", "strafesnet_common", ] -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "structmeta" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329" -dependencies = [ - "proc-macro2", - "quote", - "structmeta-derive", - "syn 2.0.111", -] - -[[package]] -name = "structmeta-derive" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - [[package]] name = "strum" version = "0.26.3" @@ -4558,15 +4145,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "texpresso" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8550677e2259d675a7841cb1403db35f330cc9e58674c8c5caa12dd12c51dc71" -dependencies = [ - "libm", -] - [[package]] name = "thiserror" version = "1.0.69" @@ -4779,36 +4357,6 @@ dependencies = [ "webpki-roots 0.26.11", ] -[[package]] -name = "toml_datetime" -version = "0.7.5+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" -dependencies = [ - "serde_core", -] - -[[package]] -name = "toml_edit" -version = "0.23.10+spec-1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" -dependencies = [ - "indexmap", - "toml_datetime", - "toml_parser", - "winnow", -] - -[[package]] -name = "toml_parser" -version = "1.0.9+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702d4415e08923e7e1ef96cd5727c0dfed80b4d2fa25db9647fe5eb6f7c5a4c4" -dependencies = [ - "winnow", -] - [[package]] name = "tonic" version = "0.14.2" @@ -4969,12 +4517,6 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" -[[package]] -name = "unicode-width" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" - [[package]] name = "untrusted" version = "0.9.0" @@ -5006,7 +4548,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18b19e258aa08450f93369cf56dd78063586adf19e92a75b338a800f799a0208" dependencies = [ "ahash", - "byteorder 1.5.0", + "byteorder", "lazy_static", "parking_lot", "serde", @@ -5018,12 +4560,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - [[package]] name = "uuid" version = "1.21.0" @@ -5045,150 +4581,24 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "vbsp" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdab0507169ff47ea95acab2d08d91c7a31455e272b134879757d19c87075cb1" -dependencies = [ - "ahash", - "arrayvec", - "binrw 0.14.1", - "bitflags 2.10.0", - "bv", - "itertools 0.14.0", - "lzma-rs", - "num_enum", - "serde", - "static_assertions", - "thiserror 2.0.17", - "vbsp-common", - "vdf-reader 0.3.3", - "zip-lzma", -] - -[[package]] -name = "vbsp-common" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5407a8696cc6de4e9464595c7eb0ee9967008c68b8c156dd465733be28bc16eb" -dependencies = [ - "binrw 0.14.1", - "cgmath", - "serde", - "thiserror 2.0.17", -] - -[[package]] -name = "vbsp-entities-css" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e3d035a847e7039d923e7499ed9f39c2f62cf103968dc656ee6b33fa826ae32" -dependencies = [ - "serde", - "vbsp-common", -] - [[package]] name = "vcpkg" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "vdf-reader" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "543945fdc3d51b20e3e0f5fd845ddeca4a270e56522035cf152105bc144ffd65" -dependencies = [ - "logos", - "miette", - "parse-display 0.9.1", - "serde", - "thiserror 1.0.69", -] - -[[package]] -name = "vdf-reader" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e904905cfe69a3a052204c4ffc3eb86774f16dcd18c1c1521ab23b0849e21d52" -dependencies = [ - "logos", - "miette", - "parse-display 0.9.1", - "serde_core", - "thiserror 2.0.17", -] - [[package]] name = "version_check" version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" -[[package]] -name = "vmdl" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2f6b8c22da8937403a5da864e7ea390f30cd40b7a077079e40279aa6a4f553" -dependencies = [ - "arrayvec", - "bitflags 2.10.0", - "bytemuck", - "cgmath", - "half", - "itertools 0.13.0", - "num_enum", - "static_assertions", - "thiserror 1.0.69", - "tracing", -] - -[[package]] -name = "vmt-parser" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20c25c4e0ba68b6c74038e6c3c7b9bb16c01f01e25fe75c7db8f575a5a7c38cf" -dependencies = [ - "miette", - "serde", - "serde_repr", - "thiserror 1.0.69", - "vdf-reader 0.2.0", -] - -[[package]] -name = "vpk" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e041d0558b49723e4fd634d93042329140e6ec1d6c4100b538a018b78bb1fa05" -dependencies = [ - "ahash", - "binrw 0.14.1", - "thiserror 2.0.17", -] - [[package]] name = "vsimd" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" -[[package]] -name = "vtf" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b76193ac26521a6c4f93d7b1f816c7003237bc3ea1dec292d848f8d98d21da46" -dependencies = [ - "byteorder 1.5.0", - "image", - "num_enum", - "parse-display 0.10.0", - "texpresso", - "thiserror 2.0.17", -] - [[package]] name = "want" version = "0.3.1" @@ -5607,15 +5017,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" -[[package]] -name = "winnow" -version = "0.7.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" -dependencies = [ - "memchr", -] - [[package]] name = "wit-bindgen" version = "0.46.0" @@ -5749,18 +5150,6 @@ dependencies = [ "syn 2.0.111", ] -[[package]] -name = "zip-lzma" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b480cb31fccfb2786565c0e0712865fd6f1ea0ea850c50316f643c3948196e63" -dependencies = [ - "byteorder 1.5.0", - "crc32fast", - "crossbeam-utils", - "lzma", -] - [[package]] name = "zstd" version = "0.13.3" diff --git a/combobulator/Cargo.toml b/combobulator/Cargo.toml index dbb822a..d68f828 100644 --- a/combobulator/Cargo.toml +++ b/combobulator/Cargo.toml @@ -7,7 +7,7 @@ edition = "2024" async-nats = "0.45.0" aws-config = { version = "1", features = ["behavior-version-latest"] } aws-sdk-s3 = "1" -map-tool = { version = "2.0.0", registry = "strafesnet" } +map-tool = { version = "3.0.0", registry = "strafesnet", features = ["roblox"], default-features = false } rbx_asset = { version = "0.5.0", features = ["gzip", "rustls-tls"], default-features = false, registry = "strafesnet" } serde = { version = "1.0.215", features = ["derive"] } serde_json = "1.0.133" diff --git a/combobulator/src/process.rs b/combobulator/src/process.rs index da05776..84b25cc 100644 --- a/combobulator/src/process.rs +++ b/combobulator/src/process.rs @@ -5,7 +5,7 @@ use crate::s3::S3Cache; #[derive(Debug)] pub enum Error{ ArchivedModel, - GetAssets(map_tool::roblox::UniqueAssetError), + LoadDom(map_tool::roblox::LoadDomError), DownloadAsset(map_tool::roblox::DownloadAssetError), ConvertTexture(map_tool::roblox::ConvertTextureError), ConvertSnf(map_tool::roblox::ConvertError), @@ -47,9 +47,12 @@ impl Processor{ let rbxl_bytes=self.download_asset(asset_id).await? .ok_or(Error::ArchivedModel)?; + // decode dom + let dom=map_tool::roblox::load_dom(&rbxl_bytes) + .map_err(Error::LoadDom)?; + // extract unique assets from the file - let assets=map_tool::roblox::get_unique_assets_from_file(&rbxl_bytes) - .map_err(Error::GetAssets)?; + let assets=map_tool::roblox::get_unique_assets(&dom); // process textures: download, cache, convert to DDS for id in &assets.textures{ -- 2.49.1 From 7efdec84dbe4f6ea6bd52a1c59c7e6532e9fdf32 Mon Sep 17 00:00:00 2001 From: Rhys Lloyd Date: Mon, 2 Mar 2026 11:11:33 -0800 Subject: [PATCH 2/4] combobulator: converter with loaders pre-populated from s3 --- Cargo.lock | 3 + combobulator/Cargo.toml | 3 + combobulator/src/loader.rs | 154 ++++++++++++++++++++++++++++++++++++ combobulator/src/main.rs | 1 + combobulator/src/process.rs | 59 +++++++++++++- 5 files changed, 216 insertions(+), 4 deletions(-) create mode 100644 combobulator/src/loader.rs diff --git a/Cargo.lock b/Cargo.lock index 0555b1e..0b461eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2395,8 +2395,11 @@ dependencies = [ "aws-sdk-s3", "map-tool", "rbx_asset", + "rbx_dom_weak", "serde", "serde_json", + "strafesnet_deferred_loader", + "strafesnet_rbx_loader", "tokio", "tokio-stream", ] diff --git a/combobulator/Cargo.toml b/combobulator/Cargo.toml index d68f828..468838f 100644 --- a/combobulator/Cargo.toml +++ b/combobulator/Cargo.toml @@ -9,7 +9,10 @@ aws-config = { version = "1", features = ["behavior-version-latest"] } aws-sdk-s3 = "1" map-tool = { version = "3.0.0", registry = "strafesnet", features = ["roblox"], default-features = false } rbx_asset = { version = "0.5.0", features = ["gzip", "rustls-tls"], default-features = false, registry = "strafesnet" } +rbx_dom_weak = "4.1.0" serde = { version = "1.0.215", features = ["derive"] } serde_json = "1.0.133" +strafesnet_deferred_loader = { version = "0.6.0", registry = "strafesnet" } +strafesnet_rbx_loader = { version = "0.9.0", registry = "strafesnet" } tokio = { version = "1.41.1", features = ["macros", "rt-multi-thread", "signal"] } tokio-stream = "0.1" diff --git a/combobulator/src/loader.rs b/combobulator/src/loader.rs new file mode 100644 index 0000000..7c9ccfd --- /dev/null +++ b/combobulator/src/loader.rs @@ -0,0 +1,154 @@ +use std::io::Read; +use rbxassetid::{RobloxAssetId,RobloxAssetIdParseErr}; +use strafesnet_deferred_loader::{loader::Loader,texture::Texture}; + +use strafesnet_rbx_loader::data::RobloxMeshBytes; +use strafesnet_rbx_loader::mesh::{MeshIndex,MeshType,MeshWithSize}; + +// disallow non-static lifetimes +fn static_ustr(s:&'static str)->rbx_dom_weak::Ustr{ + rbx_dom_weak::ustr(s) +} + +fn read_entire_file(path:impl AsRef)->Result,std::io::Error>{ + let mut file=std::fs::File::open(path)?; + let mut data=Vec::new(); + file.read_to_end(&mut data)?; + Ok(data) +} + +#[expect(dead_code)] +#[derive(Debug)] +pub enum TextureError{ + Io(std::io::Error), + RobloxAssetIdParse(RobloxAssetIdParseErr), +} +impl std::fmt::Display for TextureError{ + fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{ + write!(f,"{self:?}") + } +} +impl std::error::Error for TextureError{} +impl From for TextureError{ + fn from(value:std::io::Error)->Self{ + Self::Io(value) + } +} +impl From for TextureError{ + fn from(value:RobloxAssetIdParseErr)->Self{ + Self::RobloxAssetIdParse(value) + } +} + +pub struct TextureLoader; +impl TextureLoader{ + pub fn new()->Self{ + Self + } +} +impl Loader for TextureLoader{ + type Error=TextureError; + type Index<'a>=&'a str; + type Resource=Texture; + fn load(&mut self,index:Self::Index<'_>)->Result{ + let RobloxAssetId(asset_id)=index.parse()?; + let file_name=format!("textures/{}.dds",asset_id); + let data=read_entire_file(file_name)?; + Ok(Texture::ImageDDS(data)) + } +} + +#[expect(dead_code)] +#[derive(Debug)] +pub enum MeshError{ + Io(std::io::Error), + RobloxAssetIdParse(RobloxAssetIdParseErr), + Mesh(strafesnet_rbx_loader::mesh::Error), + Union(strafesnet_rbx_loader::union::Error), + DecodeBinary(rbx_binary::DecodeError), + OneChildPolicy, + MissingInstance, +} +impl std::fmt::Display for MeshError{ + fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{ + write!(f,"{self:?}") + } +} +impl std::error::Error for MeshError{} +impl From for MeshError{ + fn from(value:std::io::Error)->Self{ + Self::Io(value) + } +} +impl From for MeshError{ + fn from(value:RobloxAssetIdParseErr)->Self{ + Self::RobloxAssetIdParse(value) + } +} +impl From for MeshError{ + fn from(value:strafesnet_rbx_loader::mesh::Error)->Self{ + Self::Mesh(value) + } +} +impl From for MeshError{ + fn from(value:strafesnet_rbx_loader::union::Error)->Self{ + Self::Union(value) + } +} +impl From for MeshError{ + fn from(value:rbx_binary::DecodeError)->Self{ + Self::DecodeBinary(value) + } +} + +pub struct MeshLoader; +impl MeshLoader{ + pub fn new()->Self{ + Self + } +} +impl Loader for MeshLoader{ + type Error=MeshError; + type Index<'a>=MeshIndex<'a>; + type Resource=MeshWithSize; + fn load(&mut self,index:Self::Index<'_>)->Result{ + let mesh=match index.mesh_type{ + MeshType::FileMesh=>{ + let RobloxAssetId(asset_id)=index.content.parse()?; + let file_name=format!("meshes/{}",asset_id); + let data=read_entire_file(file_name)?; + strafesnet_rbx_loader::mesh::convert(RobloxMeshBytes::new(data))? + }, + MeshType::Union{mut physics_data,mut mesh_data,size_float_bits,part_texture_description}=>{ + // decode asset + let size=size_float_bits.map(f32::from_bits).into(); + if !index.content.is_empty()&&(physics_data.is_empty()||mesh_data.is_empty()){ + let RobloxAssetId(asset_id)=index.content.parse()?; + let file_name=format!("unions/{}",asset_id); + let data=read_entire_file(file_name)?; + let dom=rbx_binary::from_reader(std::io::Cursor::new(data))?; + let &[referent]=dom.root().children()else{ + return Err(MeshError::OneChildPolicy); + }; + let Some(instance)=dom.get_by_ref(referent)else{ + return Err(MeshError::MissingInstance); + }; + if physics_data.is_empty(){ + if let Some(rbx_dom_weak::types::Variant::BinaryString(data))=instance.properties.get(&static_ustr("PhysicsData")){ + physics_data=data.as_ref(); + } + } + if mesh_data.is_empty(){ + if let Some(rbx_dom_weak::types::Variant::BinaryString(data))=instance.properties.get(&static_ustr("MeshData")){ + mesh_data=data.as_ref(); + } + } + strafesnet_rbx_loader::union::convert(physics_data,mesh_data,size,part_texture_description)? + }else{ + strafesnet_rbx_loader::union::convert(physics_data,mesh_data,size,part_texture_description)? + } + }, + }; + Ok(mesh) + } +} diff --git a/combobulator/src/main.rs b/combobulator/src/main.rs index cc356db..6dc14f4 100644 --- a/combobulator/src/main.rs +++ b/combobulator/src/main.rs @@ -1,5 +1,6 @@ use tokio_stream::StreamExt; +mod loader; mod nats_types; mod process; mod s3; diff --git a/combobulator/src/process.rs b/combobulator/src/process.rs index 84b25cc..95496ad 100644 --- a/combobulator/src/process.rs +++ b/combobulator/src/process.rs @@ -19,6 +19,47 @@ impl std::fmt::Display for Error{ } impl std::error::Error for Error{} +pub fn convert_to_snf( + dom:rbx_dom_weak::WeakDom, + mesh_loader:crate::loader::MeshLoader, + texture_loader:crate::loader::TextureLoader, +)->Result{ + const FAILURE_MODE:LoadFailureMode=LoadFailureMode::DefaultToNone; + + // run scripts + let model=strafesnet_rbx_loader::Model::new(dom); + + let mut place=strafesnet_rbx_loader::Place::from(model); + let script_errors=place.run_scripts().unwrap_or_else(|e|vec![e]); + + // convert + let mut texture_deferred_loader=strafesnet_deferred_loader::deferred_loader::RenderConfigDeferredLoader::new(); + let mut mesh_deferred_loader=strafesnet_deferred_loader::deferred_loader::MeshDeferredLoader::new(); + + let map_step1=strafesnet_rbx_loader::rbx::convert( + place.as_ref(), + &mut texture_deferred_loader, + &mut mesh_deferred_loader, + ); + + let meshpart_meshes=mesh_deferred_loader.into_meshes(&mut mesh_loader,FAILURE_MODE).map_err(ConvertError::RobloxLoadMesh)?; + + let map_step2=map_step1.add_meshpart_meshes_and_calculate_attributes(meshpart_meshes); + + let render_configs=texture_deferred_loader.into_render_configs(&mut texture_loader,FAILURE_MODE).map_err(ConvertError::RobloxLoadTexture)?; + + let (map,convert_errors)=map_step2.add_render_configs_and_textures(render_configs); + + let mut snf_buf=Vec::new(); + strafesnet_snf::map::write_map(Cursor::new(&mut snf_buf),map).map_err(ConvertError::SNFMap)?; + + Ok(ConvertOutput{ + snf:snf_buf, + script_errors, + convert_errors, + }) +} + pub struct Processor{ pub cookie_context:rbx_asset::cookie::Context, pub s3:S3Cache, @@ -54,8 +95,11 @@ impl Processor{ // extract unique assets from the file let assets=map_tool::roblox::get_unique_assets(&dom); + // place textures into 'loader' + let mut texture_loader=crate::loader::TextureLoader::new(); + // process textures: download, cache, convert to DDS - for id in &assets.textures{ + for &id in &assets.textures{ let asset_id=id.0; let dds_key=S3Cache::texture_dds_key(asset_id); @@ -82,10 +126,13 @@ impl Processor{ .map_err(Error::ConvertTexture)?; self.s3.put(&dds_key,dds).await.map_err(Error::S3Put)?; println!("[combobulator] Texture {asset_id} processed"); + + texture_loader.insert(id,dds); } + let mut mesh_loader=crate::loader::MeshLoader::new(); // process meshes - for id in &assets.meshes{ + for &id in &assets.meshes{ let asset_id=id.0; let mesh_key=S3Cache::mesh_key(asset_id); @@ -98,6 +145,8 @@ impl Processor{ let Some(data)=self.download_asset(asset_id).await? else{continue}; self.s3.put(&mesh_key,data).await.map_err(Error::S3Put)?; println!("[combobulator] Mesh {asset_id} processed"); + + mesh_loader.insert_mesh(id,data); } // process unions @@ -114,14 +163,16 @@ impl Processor{ let Some(data)=self.download_asset(asset_id).await? else{continue}; self.s3.put(&union_key,data).await.map_err(Error::S3Put)?; println!("[combobulator] Union {asset_id} processed"); + + mesh_loader.insert_union(id,data); } // convert to SNF and upload println!("[combobulator] Converting to SNF"); - let output=map_tool::roblox::convert_to_snf(&rbxl_bytes) + let snf=convert_to_snf(dom,mesh_loader,texture_loader) .map_err(Error::ConvertSnf)?; let snf_key=S3Cache::snf_key(asset_id); - self.s3.put(&snf_key,output.snf).await.map_err(Error::S3Put)?; + self.s3.put(&snf_key,snf).await.map_err(Error::S3Put)?; println!("[combobulator] SNF uploaded to {snf_key}"); Ok(()) -- 2.49.1 From d6b5e4676901f717d1ff521931be6aa6fba4bdc8 Mon Sep 17 00:00:00 2001 From: Rhys Lloyd Date: Mon, 2 Mar 2026 11:51:43 -0800 Subject: [PATCH 3/4] combobulator: wip loader internals --- combobulator/src/loader.rs | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/combobulator/src/loader.rs b/combobulator/src/loader.rs index 7c9ccfd..4502726 100644 --- a/combobulator/src/loader.rs +++ b/combobulator/src/loader.rs @@ -1,3 +1,4 @@ +use std::collections::HashMap; use std::io::Read; use rbxassetid::{RobloxAssetId,RobloxAssetIdParseErr}; use strafesnet_deferred_loader::{loader::Loader,texture::Texture}; @@ -40,7 +41,9 @@ impl From for TextureError{ } } -pub struct TextureLoader; +pub struct TextureLoader{ + textures:HashMap>, +} impl TextureLoader{ pub fn new()->Self{ Self @@ -51,9 +54,8 @@ impl Loader for TextureLoader{ type Index<'a>=&'a str; type Resource=Texture; fn load(&mut self,index:Self::Index<'_>)->Result{ - let RobloxAssetId(asset_id)=index.parse()?; - let file_name=format!("textures/{}.dds",asset_id); - let data=read_entire_file(file_name)?; + let asset_id:RobloxAssetId=index.parse()?; + let data=self.textures.get(asset_id).map_err(TextureError)?.clone(); Ok(Texture::ImageDDS(data)) } } @@ -101,7 +103,10 @@ impl From for MeshError{ } } -pub struct MeshLoader; +pub struct MeshLoader{ + meshes:HashMap, + unions:HashMap, +} impl MeshLoader{ pub fn new()->Self{ Self @@ -114,18 +119,16 @@ impl Loader for MeshLoader{ fn load(&mut self,index:Self::Index<'_>)->Result{ let mesh=match index.mesh_type{ MeshType::FileMesh=>{ - let RobloxAssetId(asset_id)=index.content.parse()?; - let file_name=format!("meshes/{}",asset_id); - let data=read_entire_file(file_name)?; - strafesnet_rbx_loader::mesh::convert(RobloxMeshBytes::new(data))? + let id:RobloxAssetId=index.content.parse()?; + let mesh_with_size=self.meshes.get(&id).ok_or(MeshError)?; + mesh_with_size.clone() }, MeshType::Union{mut physics_data,mut mesh_data,size_float_bits,part_texture_description}=>{ // decode asset let size=size_float_bits.map(f32::from_bits).into(); if !index.content.is_empty()&&(physics_data.is_empty()||mesh_data.is_empty()){ - let RobloxAssetId(asset_id)=index.content.parse()?; - let file_name=format!("unions/{}",asset_id); - let data=read_entire_file(file_name)?; + let id:RobloxAssetId=index.content.parse()?; + let dom=self.unions.get(&id).ok_or(MeshError)?.clone(); let dom=rbx_binary::from_reader(std::io::Cursor::new(data))?; let &[referent]=dom.root().children()else{ return Err(MeshError::OneChildPolicy); -- 2.49.1 From 391e254150270f57d4c841249c4f05f49966280b Mon Sep 17 00:00:00 2001 From: Rhys Lloyd Date: Mon, 2 Mar 2026 15:53:32 -0800 Subject: [PATCH 4/4] combobulator: complete texture plumbing --- Cargo.lock | 3 ++ combobulator/Cargo.toml | 3 ++ combobulator/src/loader.rs | 54 +++++++++++++------------- combobulator/src/process.rs | 76 +++++++++++++++++++++++++------------ 4 files changed, 83 insertions(+), 53 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0b461eb..31814ca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2395,11 +2395,14 @@ dependencies = [ "aws-sdk-s3", "map-tool", "rbx_asset", + "rbx_binary", "rbx_dom_weak", + "rbxassetid", "serde", "serde_json", "strafesnet_deferred_loader", "strafesnet_rbx_loader", + "strafesnet_snf", "tokio", "tokio-stream", ] diff --git a/combobulator/Cargo.toml b/combobulator/Cargo.toml index 468838f..3d11f72 100644 --- a/combobulator/Cargo.toml +++ b/combobulator/Cargo.toml @@ -9,10 +9,13 @@ aws-config = { version = "1", features = ["behavior-version-latest"] } aws-sdk-s3 = "1" map-tool = { version = "3.0.0", registry = "strafesnet", features = ["roblox"], default-features = false } rbx_asset = { version = "0.5.0", features = ["gzip", "rustls-tls"], default-features = false, registry = "strafesnet" } +rbx_binary = "2.0.1" rbx_dom_weak = "4.1.0" +rbxassetid = { version = "0.1.0", registry = "strafesnet" } serde = { version = "1.0.215", features = ["derive"] } serde_json = "1.0.133" strafesnet_deferred_loader = { version = "0.6.0", registry = "strafesnet" } strafesnet_rbx_loader = { version = "0.9.0", registry = "strafesnet" } +strafesnet_snf = { version = "0.3.2", registry = "strafesnet" } tokio = { version = "1.41.1", features = ["macros", "rt-multi-thread", "signal"] } tokio-stream = "0.1" diff --git a/combobulator/src/loader.rs b/combobulator/src/loader.rs index 4502726..a0cf5cc 100644 --- a/combobulator/src/loader.rs +++ b/combobulator/src/loader.rs @@ -1,5 +1,5 @@ use std::collections::HashMap; -use std::io::Read; + use rbxassetid::{RobloxAssetId,RobloxAssetIdParseErr}; use strafesnet_deferred_loader::{loader::Loader,texture::Texture}; @@ -11,17 +11,10 @@ fn static_ustr(s:&'static str)->rbx_dom_weak::Ustr{ rbx_dom_weak::ustr(s) } -fn read_entire_file(path:impl AsRef)->Result,std::io::Error>{ - let mut file=std::fs::File::open(path)?; - let mut data=Vec::new(); - file.read_to_end(&mut data)?; - Ok(data) -} - #[expect(dead_code)] #[derive(Debug)] pub enum TextureError{ - Io(std::io::Error), + NoTexture, RobloxAssetIdParse(RobloxAssetIdParseErr), } impl std::fmt::Display for TextureError{ @@ -30,11 +23,6 @@ impl std::fmt::Display for TextureError{ } } impl std::error::Error for TextureError{} -impl From for TextureError{ - fn from(value:std::io::Error)->Self{ - Self::Io(value) - } -} impl From for TextureError{ fn from(value:RobloxAssetIdParseErr)->Self{ Self::RobloxAssetIdParse(value) @@ -42,11 +30,16 @@ impl From for TextureError{ } pub struct TextureLoader{ - textures:HashMap>, + textures:HashMap, } impl TextureLoader{ pub fn new()->Self{ - Self + Self{ + textures:HashMap::new(), + } + } + pub fn insert(&mut self,asset_id:RobloxAssetId,texture:Vec){ + self.textures.insert(asset_id,Texture::ImageDDS(texture)); } } impl Loader for TextureLoader{ @@ -55,15 +48,15 @@ impl Loader for TextureLoader{ type Resource=Texture; fn load(&mut self,index:Self::Index<'_>)->Result{ let asset_id:RobloxAssetId=index.parse()?; - let data=self.textures.get(asset_id).map_err(TextureError)?.clone(); - Ok(Texture::ImageDDS(data)) + let data=self.textures.get(&asset_id).ok_or(TextureError::NoTexture)?.clone(); + Ok(data) } } #[expect(dead_code)] #[derive(Debug)] pub enum MeshError{ - Io(std::io::Error), + NoMesh, RobloxAssetIdParse(RobloxAssetIdParseErr), Mesh(strafesnet_rbx_loader::mesh::Error), Union(strafesnet_rbx_loader::union::Error), @@ -77,11 +70,6 @@ impl std::fmt::Display for MeshError{ } } impl std::error::Error for MeshError{} -impl From for MeshError{ - fn from(value:std::io::Error)->Self{ - Self::Io(value) - } -} impl From for MeshError{ fn from(value:RobloxAssetIdParseErr)->Self{ Self::RobloxAssetIdParse(value) @@ -109,7 +97,18 @@ pub struct MeshLoader{ } impl MeshLoader{ pub fn new()->Self{ - Self + Self{ + meshes:HashMap::new(), + unions:HashMap::new(), + } + } + pub fn insert_mesh(&mut self,asset_id:RobloxAssetId,mesh:Vec)->Result<(),strafesnet_rbx_loader::mesh::Error>{ + let mesh=strafesnet_rbx_loader::mesh::convert(RobloxMeshBytes::new(mesh))?; + self.meshes.insert(asset_id,mesh); + Ok(()) + } + pub fn insert_union(&mut self,asset_id:RobloxAssetId,union:rbx_dom_weak::WeakDom){ + self.unions.insert(asset_id,union); } } impl Loader for MeshLoader{ @@ -120,7 +119,7 @@ impl Loader for MeshLoader{ let mesh=match index.mesh_type{ MeshType::FileMesh=>{ let id:RobloxAssetId=index.content.parse()?; - let mesh_with_size=self.meshes.get(&id).ok_or(MeshError)?; + let mesh_with_size=self.meshes.get(&id).ok_or(MeshError::NoMesh)?; mesh_with_size.clone() }, MeshType::Union{mut physics_data,mut mesh_data,size_float_bits,part_texture_description}=>{ @@ -128,8 +127,7 @@ impl Loader for MeshLoader{ let size=size_float_bits.map(f32::from_bits).into(); if !index.content.is_empty()&&(physics_data.is_empty()||mesh_data.is_empty()){ let id:RobloxAssetId=index.content.parse()?; - let dom=self.unions.get(&id).ok_or(MeshError)?.clone(); - let dom=rbx_binary::from_reader(std::io::Cursor::new(data))?; + let dom=self.unions.get(&id).ok_or(MeshError::NoMesh)?; let &[referent]=dom.root().children()else{ return Err(MeshError::OneChildPolicy); }; diff --git a/combobulator/src/process.rs b/combobulator/src/process.rs index 95496ad..554c74c 100644 --- a/combobulator/src/process.rs +++ b/combobulator/src/process.rs @@ -1,36 +1,38 @@ +use std::io::Cursor; + use crate::nats_types::ReleaseMapfixRequest; use crate::s3::S3Cache; +use strafesnet_deferred_loader::deferred_loader::LoadFailureMode; + #[expect(dead_code)] #[derive(Debug)] -pub enum Error{ - ArchivedModel, - LoadDom(map_tool::roblox::LoadDomError), - DownloadAsset(map_tool::roblox::DownloadAssetError), - ConvertTexture(map_tool::roblox::ConvertTextureError), - ConvertSnf(map_tool::roblox::ConvertError), - S3Get(crate::s3::GetError), - S3Put(crate::s3::PutError), +pub enum ConvertError{ + IO(std::io::Error), + SNFMap(strafesnet_snf::map::Error), + RobloxLoadMesh(super::loader::MeshError), + RobloxLoadTexture(super::loader::TextureError), } -impl std::fmt::Display for Error{ +impl std::fmt::Display for ConvertError{ fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{ write!(f,"{self:?}") } } -impl std::error::Error for Error{} +impl std::error::Error for ConvertError{} pub fn convert_to_snf( dom:rbx_dom_weak::WeakDom, - mesh_loader:crate::loader::MeshLoader, - texture_loader:crate::loader::TextureLoader, -)->Result{ + mut mesh_loader:crate::loader::MeshLoader, + mut texture_loader:crate::loader::TextureLoader, +)->Result,ConvertError>{ const FAILURE_MODE:LoadFailureMode=LoadFailureMode::DefaultToNone; // run scripts let model=strafesnet_rbx_loader::Model::new(dom); let mut place=strafesnet_rbx_loader::Place::from(model); - let script_errors=place.run_scripts().unwrap_or_else(|e|vec![e]); + // TODO: script errors report for burn down chart + let _script_errors=place.run_scripts().unwrap_or_else(|e|vec![e]); // convert let mut texture_deferred_loader=strafesnet_deferred_loader::deferred_loader::RenderConfigDeferredLoader::new(); @@ -48,18 +50,35 @@ pub fn convert_to_snf( let render_configs=texture_deferred_loader.into_render_configs(&mut texture_loader,FAILURE_MODE).map_err(ConvertError::RobloxLoadTexture)?; - let (map,convert_errors)=map_step2.add_render_configs_and_textures(render_configs); + // TODO: conversion error report for burn down chart + let (map,_convert_errors)=map_step2.add_render_configs_and_textures(render_configs); let mut snf_buf=Vec::new(); strafesnet_snf::map::write_map(Cursor::new(&mut snf_buf),map).map_err(ConvertError::SNFMap)?; - Ok(ConvertOutput{ - snf:snf_buf, - script_errors, - convert_errors, - }) + Ok(snf_buf) } +#[expect(dead_code)] +#[derive(Debug)] +pub enum Error{ + ArchivedModel, + LoadDom(map_tool::roblox::LoadDomError), + DownloadAsset(map_tool::roblox::DownloadAssetError), + ConvertTexture(map_tool::roblox::ConvertTextureError), + Union(rbx_binary::DecodeError), + Mesh(strafesnet_rbx_loader::mesh::Error), + ConvertSnf(ConvertError), + S3Get(crate::s3::GetError), + S3Put(crate::s3::PutError), +} +impl std::fmt::Display for Error{ + fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{ + write!(f,"{self:?}") + } +} +impl std::error::Error for Error{} + pub struct Processor{ pub cookie_context:rbx_asset::cookie::Context, pub s3:S3Cache, @@ -124,7 +143,7 @@ impl Processor{ // convert to DDS and upload let dds=map_tool::roblox::convert_texture_to_dds(&raw_data) .map_err(Error::ConvertTexture)?; - self.s3.put(&dds_key,dds).await.map_err(Error::S3Put)?; + self.s3.put(&dds_key,dds.clone()).await.map_err(Error::S3Put)?; println!("[combobulator] Texture {asset_id} processed"); texture_loader.insert(id,dds); @@ -143,14 +162,14 @@ impl Processor{ println!("[combobulator] Downloading mesh {asset_id}"); let Some(data)=self.download_asset(asset_id).await? else{continue}; - self.s3.put(&mesh_key,data).await.map_err(Error::S3Put)?; + self.s3.put(&mesh_key,data.clone()).await.map_err(Error::S3Put)?; println!("[combobulator] Mesh {asset_id} processed"); - mesh_loader.insert_mesh(id,data); + mesh_loader.insert_mesh(id,data).map_err(Error::Mesh)?; } // process unions - for id in &assets.unions{ + for &id in &assets.unions{ let asset_id=id.0; let union_key=S3Cache::union_key(asset_id); @@ -161,10 +180,17 @@ impl Processor{ println!("[combobulator] Downloading union {asset_id}"); let Some(data)=self.download_asset(asset_id).await? else{continue}; + + // decode the data while we have ownership + let union_result=rbx_binary::from_reader(data.as_slice()); + self.s3.put(&union_key,data).await.map_err(Error::S3Put)?; println!("[combobulator] Union {asset_id} processed"); - mesh_loader.insert_union(id,data); + // handle error after caching data + let union=union_result.map_err(Error::Union)?; + + mesh_loader.insert_union(id,union); } // convert to SNF and upload -- 2.49.1