v0.5.2 update roblox_emulator

update roblox_emulator
v0.5.1 place includes services
2024-10-04 16:58:01 -07:00 · 2024-10-04 16:56:52 -07:00 · 2024-10-03 20:30:56 -07:00 · 2024-10-03 20:30:56 -07:00 · 2024-10-03 19:37:24 -07:00 · 2024-10-03 19:37:24 -07:00
7 changed files with 968 additions and 212 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@ -0,0 +1,2 @@
+[registries.strafesnet]
+index = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
--- a/Cargo.lock
+++ b/Cargo.lock
@ -4,30 +4,36 @@ version = 3

 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
 "memchr",
 ]

 [[package]]
-name = "arrayref"
-version = "0.3.7"
+name = "array-init"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+checksum = "3d62b7694a562cdf5a74227903507c56ab2cc8bdd1f781ed5cb4cf9c9f810bfc"
+
+[[package]]
+name = "arrayref"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"

 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"

 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"

 [[package]]
 name = "base64"
@ -35,6 +41,30 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"

+[[package]]
+name = "binrw"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f36b7cb3ab9ff6a2858650d8dc360e783a5d14dc29594db48c56a3c233cc265"
+dependencies = [
+ "array-init",
+ "binrw_derive",
+ "bytemuck",
+]
+
+[[package]]
+name = "binrw_derive"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20ea7a8c5c8eeffffac6d54d172444e15beffac6f817fac714460a9a9aa88da3"
+dependencies = [
+ "either",
+ "owo-colors",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@ -43,15 +73,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"

 [[package]]
 name = "blake3"
-version = "1.5.0"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87"
+checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7"
 dependencies = [
 "arrayref",
 "arrayvec",
@ -60,6 +90,28 @@ dependencies = [
 "constant_time_eq",
 ]

+[[package]]
+name = "bnum"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50202def95bf36cb7d1d7a7962cea1c36a3f8ad42425e5d2b71d7acb8041b5b8"
+
+[[package]]
+name = "bstr"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
+dependencies = [
+ "memchr",
+ "serde",
+]
+
+[[package]]
+name = "bytemuck"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
+
 [[package]]
 name = "byteorder"
 version = "1.5.0"
@ -68,9 +120,12 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"

 [[package]]
 name = "cc"
-version = "1.0.88"
+version = "1.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc"
+checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938"
+dependencies = [
+ "shlex",
+]

 [[package]]
 name = "cfg-if"
@ -80,15 +135,33 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "constant_time_eq"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "fixed_wide"
+version = "0.1.1"
+source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
+checksum = "d9c2cf115b3785ede870fada07e8b1aeba3378345b4ca86fe3c772ecabc05c0f"
+dependencies = [
+ "arrayvec",
+ "bnum",
+ "paste",
+ "ratio_ops",
+]

 [[package]]
 name = "getrandom"
-version = "0.2.12"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
 "cfg-if",
 "libc",
@ -97,25 +170,26 @@ dependencies = [

 [[package]]
 name = "glam"
-version = "0.25.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"
+checksum = "c28091a37a5d09b555cb6628fd954da299b536433834f5b8e59eba78e0cbbf8a"

 [[package]]
 name = "id"
 version = "0.1.0"
-source = "git+https://git.itzana.me/Quaternions/id?rev=1f710976cc786c8853dab73d6e1cee53158deeb0#1f710976cc786c8853dab73d6e1cee53158deeb0"
+source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
+checksum = "2337e7a6c273082b672e377e159d7a168fb51438461b7c4033c79a515dd7a25a"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.79",
 ]

 [[package]]
 name = "lazy-regex"
-version = "3.1.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d12be4595afdf58bd19e4a9f4e24187da2a66700786ff660a418e9059937a4c"
+checksum = "8d8e41c97e6bc7ecb552016274b99fbb5d035e8de288c582d9b933af6677bfda"
 dependencies = [
 "lazy-regex-proc_macros",
 "once_cell",
@ -124,49 +198,78 @@ dependencies = [

 [[package]]
 name = "lazy-regex-proc_macros"
-version = "3.1.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44bcd58e6c97a7fcbaffcdc95728b393b8d98933bfadad49ed4097845b57ef0b"
+checksum = "76e1d8b05d672c53cb9c7b920bbba8783845ae4f0b076e02a3db1d02c81b4163"
 dependencies = [
 "proc-macro2",
 "quote",
 "regex",
- "syn",
+ "syn 2.0.79",
 ]

 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"

 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.159"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+
+[[package]]
+name = "libloading"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+dependencies = [
+ "cfg-if",
+ "windows-targets",
+]
+
+[[package]]
+name = "linear_ops"
+version = "0.1.0"
+source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
+checksum = "b2e6977ac24f47086d8a7a2d4ae1c720e86dfdc8407cf5e34c18bfa01053c456"
+dependencies = [
+ "fixed_wide",
+ "paste",
+ "ratio_ops",
+]

 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "luau0-src"
+version = "0.10.3+luau640"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f39d12b514a676c943990cfbe6200fedcb9c293c8c9219d29be512a6969be92"
+dependencies = [
+ "cc",
+]

 [[package]]
 name = "lz4"
-version = "1.24.0"
+version = "1.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1"
+checksum = "4d1febb2b4a79ddd1980eede06a8f7902197960aa0383ffcfdd62fe723036725"
 dependencies = [
- "libc",
 "lz4-sys",
 ]

 [[package]]
 name = "lz4-sys"
-version = "1.9.4"
+version = "1.11.1+lz4-1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900"
+checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6"
 dependencies = [
 "cc",
 "libc",
@ -174,42 +277,92 @@ dependencies = [

 [[package]]
 name = "memchr"
-version = "2.7.1"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "mlua"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d111deb18a9c9bd33e1541309f4742523bfab01d276bfa9a27519f6de9c11dc7"
+dependencies = [
+ "bstr",
+ "libloading",
+ "mlua-sys",
+ "num-traits",
+ "once_cell",
+ "rustc-hash",
+]
+
+[[package]]
+name = "mlua-sys"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebe026d6bd1583a9cf9080e189030ddaea7e6f5f0deb366a8e26f8a26c4135b8"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "luau0-src",
+ "pkg-config",
+]

 [[package]]
 name = "num-traits"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
 "autocfg",
 ]

 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
+dependencies = [
+ "portable-atomic",
+]
+
+[[package]]
+name = "owo-colors"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"

 [[package]]
 name = "paste"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+
+[[package]]
+name = "portable-atomic"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"

 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]

 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
 "unicode-ident",
 ]
@ -230,14 +383,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
 dependencies = [
 "quote",
- "syn",
+ "syn 2.0.79",
 ]

 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
 "proc-macro2",
 ]
@ -272,10 +425,17 @@ dependencies = [
 "getrandom",
 ]

+[[package]]
+name = "ratio_ops"
+version = "0.1.0"
+source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
+checksum = "01239195d6afe0509e7e3511b716c0540251dfe7ece0a9a5a27116afb766c42c"
+
 [[package]]
 name = "rbx_binary"
 version = "0.7.4"
-source = "git+https://github.com/krakow10/rbx-dom?rev=841643178680c9f3143422778f9c52f949b222b9#841643178680c9f3143422778f9c52f949b222b9"
+source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
+checksum = "18b401155b93f7151217bf51e36bdfa7bddcaf5f0d26b563c9ac3b08a3701c27"
 dependencies = [
 "log",
 "lz4",
@ -288,17 +448,29 @@ dependencies = [

 [[package]]
 name = "rbx_dom_weak"
-version = "2.7.0"
-source = "git+https://github.com/krakow10/rbx-dom?rev=841643178680c9f3143422778f9c52f949b222b9#841643178680c9f3143422778f9c52f949b222b9"
+version = "2.9.0"
+source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
+checksum = "2a6b916687c98aaea36f9c03e80906bfafab057bebee248628c8c04def807f43"
 dependencies = [
 "rbx_types",
 "serde",
 ]

+[[package]]
+name = "rbx_mesh"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "864ead0e98afce28c960f653d6203483834890d07f87b60e2f01415530a2fe9d"
+dependencies = [
+ "binrw",
+ "lazy-regex",
+]
+
 [[package]]
 name = "rbx_reflection"
-version = "4.5.0"
-source = "git+https://github.com/krakow10/rbx-dom?rev=841643178680c9f3143422778f9c52f949b222b9#841643178680c9f3143422778f9c52f949b222b9"
+version = "4.7.0"
+source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
+checksum = "c1b43fe592a4ce6fe54eb215fb82735efbb516d2cc045a94e3dc0234ff293620"
 dependencies = [
 "rbx_types",
 "serde",
@ -307,8 +479,9 @@ dependencies = [

 [[package]]
 name = "rbx_reflection_database"
-version = "0.2.10+roblox-607"
-source = "git+https://github.com/krakow10/rbx-dom?rev=841643178680c9f3143422778f9c52f949b222b9#841643178680c9f3143422778f9c52f949b222b9"
+version = "0.2.12+roblox-638"
+source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
+checksum = "2e772bb9e1bc0ebe65d338f876d1bb1ea22e15a8f9a82e8245028010c2fea3c9"
 dependencies = [
 "lazy_static",
 "rbx_reflection",
@ -318,8 +491,9 @@ dependencies = [

 [[package]]
 name = "rbx_types"
-version = "1.8.0"
-source = "git+https://github.com/krakow10/rbx-dom?rev=841643178680c9f3143422778f9c52f949b222b9#841643178680c9f3143422778f9c52f949b222b9"
+version = "1.10.0"
+source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
+checksum = "d7a390c44034fa448c53bd0983dfc2d70d8d6b2f65be4f164d4bec8b6a2a2d09"
 dependencies = [
 "base64",
 "bitflags 1.3.2",
@ -333,7 +507,8 @@ dependencies = [
 [[package]]
 name = "rbx_xml"
 version = "0.13.3"
-source = "git+https://github.com/krakow10/rbx-dom?rev=841643178680c9f3143422778f9c52f949b222b9#841643178680c9f3143422778f9c52f949b222b9"
+source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
+checksum = "d6d1a15f58a1e4b4f578abe6eb5e1461cb16eea82fb4a147d5995c9b79f08d1f"
 dependencies = [
 "base64",
 "log",
@ -345,9 +520,9 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.10.3"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
 dependencies = [
 "aho-corasick",
 "memchr",
@ -357,9 +532,9 @@ dependencies = [

 [[package]]
 name = "regex-automata"
-version = "0.4.5"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
 dependencies = [
 "aho-corasick",
 "memchr",
@ -368,15 +543,15 @@ dependencies = [

 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"

 [[package]]
 name = "rmp"
-version = "0.8.12"
+version = "0.8.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20"
+checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
 dependencies = [
 "byteorder",
 "num-traits",
@ -385,9 +560,9 @@ dependencies = [

 [[package]]
 name = "rmp-serde"
-version = "1.1.2"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a"
+checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
 dependencies = [
 "byteorder",
 "rmp",
@ -395,53 +570,98 @@ dependencies = [
 ]

 [[package]]
-name = "serde"
-version = "1.0.197"
+name = "roblox_emulator"
+version = "0.4.0"
+source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
+checksum = "df647d25a9bc8871a838a830ae90776cd31c44d1a74268bd783d1cadcd8fcd93"
+dependencies = [
+ "glam",
+ "mlua",
+ "rbx_dom_weak",
+ "rbx_reflection",
+ "rbx_reflection_database",
+ "rbx_types",
+]
+
+[[package]]
+name = "rustc-hash"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
+checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+
+[[package]]
+name = "serde"
+version = "1.0.210"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.197"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.79",
 ]

+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "strafesnet_common"
-version = "0.1.0"
-source = "git+https://git.itzana.me/StrafesNET/common?rev=ef922135e6d19f296d8e4d90df0d0d71fa3412e2#ef922135e6d19f296d8e4d90df0d0d71fa3412e2"
+version = "0.5.2"
+source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
+checksum = "91cc1f3699bd8248da18bf5d11273264396a257b5d47b8558acb2cb4e1761219"
 dependencies = [
- "bitflags 2.4.2",
+ "arrayvec",
+ "bitflags 2.6.0",
+ "fixed_wide",
 "glam",
 "id",
+ "linear_ops",
+ "ratio_ops",
 ]

 [[package]]
 name = "strafesnet_rbx_loader"
-version = "0.2.0"
+version = "0.5.2"
 dependencies = [
+ "bytemuck",
 "glam",
 "lazy-regex",
 "rbx_binary",
 "rbx_dom_weak",
+ "rbx_mesh",
 "rbx_reflection_database",
 "rbx_xml",
+ "roblox_emulator",
 "strafesnet_common",
 ]

 [[package]]
 name = "syn"
-version = "2.0.52"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
 dependencies = [
 "proc-macro2",
 "quote",
@ -450,29 +670,29 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.57"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.57"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.79",
 ]

 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"

 [[package]]
 name = "wasi"
@ -481,7 +701,92 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"

 [[package]]
-name = "xml-rs"
-version = "0.8.19"
+name = "windows-targets"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "xml-rs"
+version = "0.8.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26"
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.79",
+]
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,15 +1,22 @@
 [package]
 name = "strafesnet_rbx_loader"
-version = "0.2.0"
+version = "0.5.2"
 edition = "2021"
+repository = "https://git.itzana.me/StrafesNET/rbx_loader"
+license = "MIT OR Apache-2.0"
+description = "Convert Roblox place and model files to StrafesNET data structures."
+authors = ["Rhys Lloyd <krakow20@gmail.com>"]

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-glam = "0.25.0"
+bytemuck = "1.14.3"
+glam = "0.29.0"
 lazy-regex = "3.1.0"
-rbx_binary = { git = "https://github.com/krakow10/rbx-dom", rev = "841643178680c9f3143422778f9c52f949b222b9" }
-rbx_dom_weak = { git = "https://github.com/krakow10/rbx-dom", rev = "841643178680c9f3143422778f9c52f949b222b9" }
-rbx_reflection_database = { git = "https://github.com/krakow10/rbx-dom", rev = "841643178680c9f3143422778f9c52f949b222b9" }
-rbx_xml = { git = "https://github.com/krakow10/rbx-dom", rev = "841643178680c9f3143422778f9c52f949b222b9" }
-strafesnet_common = { git = "https://git.itzana.me/StrafesNET/common", rev = "ef922135e6d19f296d8e4d90df0d0d71fa3412e2" }
+rbx_binary = { version = "0.7.4", registry = "strafesnet" }
+rbx_dom_weak = { version = "2.7.0", registry = "strafesnet" }
+rbx_mesh = "0.1.2"
+rbx_reflection_database = { version = "0.2.10", registry = "strafesnet" }
+rbx_xml = { version = "0.13.3", registry = "strafesnet" }
+roblox_emulator = { version = "0.4.0", registry = "strafesnet" }
+strafesnet_common = { version = "0.5.1", registry = "strafesnet" }
--- a/src/lib.rs
+++ b/src/lib.rs
@ -1,9 +1,72 @@
 use std::io::Read;
+use rbx_dom_weak::WeakDom;

 mod rbx;
+mod mesh;
 mod primitives;

-pub struct Dom(rbx_dom_weak::WeakDom);
+pub mod data{
+	pub struct RobloxMeshBytes(Vec<u8>);
+	impl RobloxMeshBytes{
+		pub fn new(bytes:Vec<u8>)->Self{
+			Self(bytes)
+		}
+		pub(crate) fn cursor(self)->std::io::Cursor<Vec<u8>>{
+			std::io::Cursor::new(self.0)
+		}
+	}
+}
+
+pub struct Model{
+	dom:WeakDom,
+}
+impl Model{
+	fn new(dom:WeakDom)->Self{
+		Self{dom}
+	}
+	pub fn into_place(self)->Place{
+		let Self{mut dom}=self;
+		let context=roblox_emulator::context::Context::from_mut(&mut dom);
+		let services=context.convert_into_place();
+		Place{dom,services}
+	}
+}
+impl AsRef<WeakDom> for Model{
+	fn as_ref(&self)->&WeakDom{
+		&self.dom
+	}
+}
+
+pub struct Place{
+	dom:WeakDom,
+	services:roblox_emulator::context::Services,
+}
+impl Place{
+	fn new(dom:WeakDom)->Option<Self>{
+		let context=roblox_emulator::context::Context::from_ref(&dom);
+		Some(Self{
+			services:context.find_services()?,
+			dom,
+		})
+	}
+	pub fn run_scripts(&mut self){
+		let Place{dom,services}=self;
+		let runner=roblox_emulator::runner::Runner::new().unwrap();
+		let context=roblox_emulator::context::Context::from_mut(dom);
+		let scripts=context.scripts();
+		let runnable=runner.runnable_context_with_services(context,services).unwrap();
+		for script in scripts{
+			if let Err(e)=runnable.run_script(script){
+				println!("runner error: {e}");
+			}
+		}
+	}
+}
+impl AsRef<WeakDom> for Place{
+	fn as_ref(&self)->&WeakDom{
+		&self.dom
+	}
+}

 #[derive(Debug)]
 pub enum ReadError{
@ -19,18 +82,26 @@ impl std::fmt::Display for ReadError{
 }
 impl std::error::Error for ReadError{}

-pub fn read<R:Read>(input:R)->Result<Dom,ReadError>{
+pub fn read<R:Read>(input:R)->Result<Model,ReadError>{
 	let mut buf=std::io::BufReader::new(input);
 	let peek=std::io::BufRead::fill_buf(&mut buf).map_err(ReadError::Io)?;
 	match &peek[0..8]{
-		b"<roblox!"=>rbx_binary::from_reader(buf).map(Dom).map_err(ReadError::RbxBinary),
-		b"<roblox "=>rbx_xml::from_reader_default(buf).map(Dom).map_err(ReadError::RbxXml),
+		b"<roblox!"=>rbx_binary::from_reader(buf).map(Model::new).map_err(ReadError::RbxBinary),
+		b"<roblox "=>rbx_xml::from_reader_default(buf).map(Model::new).map_err(ReadError::RbxXml),
 		_=>Err(ReadError::UnknownFileFormat),
 	}
 }

 //ConvertError

-pub fn convert<F:FnMut(Option<&str>)->strafesnet_common::model::RenderConfigId>(dom:&Dom,acquire_render_config_id:F)->rbx::PartialMap1{
-	rbx::convert(&dom.0,acquire_render_config_id)
-}
+pub fn convert<AcquireRenderConfigId,AcquireMeshId>(
+	dom:impl AsRef<WeakDom>,
+	acquire_render_config_id:AcquireRenderConfigId,
+	acquire_mesh_id:AcquireMeshId
+)->rbx::PartialMap1
+where
+	AcquireRenderConfigId:FnMut(Option<&str>)->strafesnet_common::model::RenderConfigId,
+	AcquireMeshId:FnMut(&str)->strafesnet_common::model::MeshId,
+{
+	rbx::convert(&dom.as_ref(),acquire_render_config_id,acquire_mesh_id)
+}
--- a/src/mesh.rs
+++ b/src/mesh.rs
@ -0,0 +1,210 @@
+use std::collections::HashMap;
+
+use rbx_mesh::mesh::{Vertex2, Vertex2Truncated};
+use strafesnet_common::{integer::vec3,model::{self, ColorId, IndexedVertex, NormalId, PolygonGroup, PolygonList, PositionId, TextureCoordinateId, VertexId}};
+
+#[derive(Debug)]
+pub enum Error{
+	Planar64Vec3(strafesnet_common::integer::Planar64TryFromFloatError),
+	RbxMesh(rbx_mesh::mesh::Error)
+}
+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{}
+
+fn ingest_vertices2<
+	AcquirePosId,
+	AcquireTexId,
+	AcquireNormalId,
+	AcquireColorId,
+	AcquireVertexId,
+>(
+	vertices:Vec<Vertex2>,
+	acquire_pos_id:&mut AcquirePosId,
+	acquire_tex_id:&mut AcquireTexId,
+	acquire_normal_id:&mut AcquireNormalId,
+	acquire_color_id:&mut AcquireColorId,
+	acquire_vertex_id:&mut AcquireVertexId,
+)->Result<HashMap<rbx_mesh::mesh::VertexId2,VertexId>,Error>
+where
+	AcquirePosId:FnMut([f32;3])->Result<PositionId,Error>,
+	AcquireTexId:FnMut([f32;2])->TextureCoordinateId,
+	AcquireNormalId:FnMut([f32;3])->Result<NormalId,Error>,
+	AcquireColorId:FnMut([f32;4])->ColorId,
+	AcquireVertexId:FnMut(IndexedVertex)->VertexId,
+{
+	//this monster is collecting a map of old_vertices_index -> unique_vertices_index
+	//while also doing the inserting unique entries into lists simultaneously
+	Ok(vertices.into_iter().enumerate().map(|(vertex_id,vertex)|Ok((
+		rbx_mesh::mesh::VertexId2(vertex_id as u32),
+		acquire_vertex_id(IndexedVertex{
+			pos:acquire_pos_id(vertex.pos)?,
+			tex:acquire_tex_id(vertex.tex),
+			normal:acquire_normal_id(vertex.norm)?,
+			color:acquire_color_id(vertex.color.map(|f|f as f32/255.0f32))
+		}),
+	))).collect::<Result<_,_>>()?)
+}
+fn ingest_vertices_truncated2<
+	AcquirePosId,
+	AcquireTexId,
+	AcquireNormalId,
+	AcquireVertexId,
+>(
+	vertices:Vec<Vertex2Truncated>,
+	acquire_pos_id:&mut AcquirePosId,
+	acquire_tex_id:&mut AcquireTexId,
+	acquire_normal_id:&mut AcquireNormalId,
+	static_color_id:ColorId,//pick one color and fill everything with it
+	acquire_vertex_id:&mut AcquireVertexId,
+)->Result<HashMap<rbx_mesh::mesh::VertexId2,VertexId>,Error>
+where
+	AcquirePosId:FnMut([f32;3])->Result<PositionId,Error>,
+	AcquireTexId:FnMut([f32;2])->TextureCoordinateId,
+	AcquireNormalId:FnMut([f32;3])->Result<NormalId,Error>,
+	AcquireVertexId:FnMut(IndexedVertex)->VertexId,
+{
+	//this monster is collecting a map of old_vertices_index -> unique_vertices_index
+	//while also doing the inserting unique entries into lists simultaneously
+	Ok(vertices.into_iter().enumerate().map(|(vertex_id,vertex)|Ok((
+		rbx_mesh::mesh::VertexId2(vertex_id as u32),
+		acquire_vertex_id(IndexedVertex{
+			pos:acquire_pos_id(vertex.pos)?,
+			tex:acquire_tex_id(vertex.tex),
+			normal:acquire_normal_id(vertex.norm)?,
+			color:static_color_id
+		}),
+	))).collect::<Result<_,_>>()?)
+}
+
+fn ingest_faces2_lods3(
+	polygon_groups:&mut Vec<PolygonGroup>,
+	vertex_id_map:&HashMap<rbx_mesh::mesh::VertexId2,VertexId>,
+	faces:&Vec<rbx_mesh::mesh::Face2>,
+	lods:&Vec<rbx_mesh::mesh::Lod3>
+){
+	//faces have to be split into polygon groups based on lod
+	polygon_groups.extend(lods.windows(2).map(|lod_pair|
+		PolygonGroup::PolygonList(PolygonList::new(faces[lod_pair[0].0 as usize..lod_pair[1].0 as usize].iter().map(|face|
+			vec![vertex_id_map[&face.0],vertex_id_map[&face.1],vertex_id_map[&face.2]]
+		).collect()))
+	))
+}
+
+pub fn convert(roblox_mesh_bytes:crate::data::RobloxMeshBytes)->Result<model::Mesh,Error>{
+	//generate that mesh boi
+	let mut unique_pos=Vec::new();
+	let mut pos_id_from=HashMap::new();
+	let mut unique_tex=Vec::new();
+	let mut tex_id_from=HashMap::new();
+	let mut unique_normal=Vec::new();
+	let mut normal_id_from=HashMap::new();
+	let mut unique_color=Vec::new();
+	let mut color_id_from=HashMap::new();
+	let mut unique_vertices=Vec::new();
+	let mut vertex_id_from=HashMap::new();
+	let mut polygon_groups=Vec::new();
+	let mut acquire_pos_id=|pos|{
+		let p=vec3::try_from_f32_array(pos).map_err(Error::Planar64Vec3)?;
+		Ok(PositionId::new(*pos_id_from.entry(p).or_insert_with(||{
+			let pos_id=unique_pos.len();
+			unique_pos.push(p);
+			pos_id
+		}) as u32))
+	};
+	let mut acquire_tex_id=|tex|{
+		let h=bytemuck::cast::<[f32;2],[u32;2]>(tex);
+		TextureCoordinateId::new(*tex_id_from.entry(h).or_insert_with(||{
+			let tex_id=unique_tex.len();
+			unique_tex.push(glam::Vec2::from_array(tex));
+			tex_id
+		}) as u32)
+	};
+	let mut acquire_normal_id=|normal|{
+		let n=vec3::try_from_f32_array(normal).map_err(Error::Planar64Vec3)?;
+		Ok(NormalId::new(*normal_id_from.entry(n).or_insert_with(||{
+			let normal_id=unique_normal.len();
+			unique_normal.push(n);
+			normal_id
+		}) as u32))
+	};
+	let mut acquire_color_id=|color|{
+		let h=bytemuck::cast::<[f32;4],[u32;4]>(color);
+		ColorId::new(*color_id_from.entry(h).or_insert_with(||{
+			let color_id=unique_color.len();
+			unique_color.push(glam::Vec4::from_array(color));
+			color_id
+		}) as u32)
+	};
+	let mut acquire_vertex_id=|vertex:IndexedVertex|{
+		VertexId::new(*vertex_id_from.entry(vertex.clone()).or_insert_with(||{
+			let vertex_id=unique_vertices.len();
+			unique_vertices.push(vertex);
+			vertex_id
+		}) as u32)
+	};
+	match rbx_mesh::read_versioned(roblox_mesh_bytes.cursor()).map_err(Error::RbxMesh)?{
+		rbx_mesh::mesh::VersionedMesh::Version1(mesh)=>{
+			let color_id=acquire_color_id([1.0f32;4]);
+			polygon_groups.push(PolygonGroup::PolygonList(PolygonList::new(mesh.vertices.chunks_exact(3).map(|trip|{
+				let mut ingest_vertex1=|vertex:&rbx_mesh::mesh::Vertex1|Ok(acquire_vertex_id(IndexedVertex{
+					pos:acquire_pos_id(vertex.pos)?,
+					tex:acquire_tex_id([vertex.tex[0],vertex.tex[1]]),
+					normal:acquire_normal_id(vertex.norm)?,
+					color:color_id,
+				}));
+				Ok(vec![ingest_vertex1(&trip[0])?,ingest_vertex1(&trip[1])?,ingest_vertex1(&trip[2])?])
+			}).collect::<Result<_,_>>()?)));
+		},
+		rbx_mesh::mesh::VersionedMesh::Version2(mesh)=>{
+			let vertex_id_map=match mesh.header.sizeof_vertex{
+				rbx_mesh::mesh::SizeOfVertex2::Truncated=>{
+					//pick white and make all the vertices white
+					let color_id=acquire_color_id([1.0f32;4]);
+					ingest_vertices_truncated2(mesh.vertices_truncated,&mut acquire_pos_id,&mut acquire_tex_id,&mut acquire_normal_id,color_id,&mut acquire_vertex_id)
+				},
+				rbx_mesh::mesh::SizeOfVertex2::Full=>ingest_vertices2(mesh.vertices,&mut acquire_pos_id,&mut acquire_tex_id,&mut acquire_normal_id,&mut acquire_color_id,&mut acquire_vertex_id),
+			}?;
+			//one big happy group for all the faces
+			polygon_groups.push(PolygonGroup::PolygonList(PolygonList::new(mesh.faces.into_iter().map(|face|
+				vec![vertex_id_map[&face.0],vertex_id_map[&face.1],vertex_id_map[&face.2]]
+			).collect())));
+		},
+		rbx_mesh::mesh::VersionedMesh::Version3(mesh)=>{
+			let vertex_id_map=match mesh.header.sizeof_vertex{
+				rbx_mesh::mesh::SizeOfVertex2::Truncated=>{
+					let color_id=acquire_color_id([1.0f32;4]);
+					ingest_vertices_truncated2(mesh.vertices_truncated,&mut acquire_pos_id,&mut acquire_tex_id,&mut acquire_normal_id,color_id,&mut acquire_vertex_id)
+				},
+				rbx_mesh::mesh::SizeOfVertex2::Full=>ingest_vertices2(mesh.vertices,&mut acquire_pos_id,&mut acquire_tex_id,&mut acquire_normal_id,&mut acquire_color_id,&mut acquire_vertex_id),
+			}?;
+			ingest_faces2_lods3(&mut polygon_groups,&vertex_id_map,&mesh.faces,&mesh.lods);
+		},
+		rbx_mesh::mesh::VersionedMesh::Version4(mesh)=>{
+			let vertex_id_map=ingest_vertices2(
+				mesh.vertices,&mut acquire_pos_id,&mut acquire_tex_id,&mut acquire_normal_id,&mut acquire_color_id,&mut acquire_vertex_id
+			)?;
+			ingest_faces2_lods3(&mut polygon_groups,&vertex_id_map,&mesh.faces,&mesh.lods);
+		},
+		rbx_mesh::mesh::VersionedMesh::Version5(mesh)=>{
+			let vertex_id_map=ingest_vertices2(
+				mesh.vertices,&mut acquire_pos_id,&mut acquire_tex_id,&mut acquire_normal_id,&mut acquire_color_id,&mut acquire_vertex_id
+			)?;
+			ingest_faces2_lods3(&mut polygon_groups,&vertex_id_map,&mesh.faces,&mesh.lods);
+		},
+	}
+	Ok(model::Mesh{
+		unique_pos,
+		unique_normal,
+		unique_tex,
+		unique_color,
+		unique_vertices,
+		polygon_groups,
+		//these should probably be moved to the model...
+		graphics_groups:Vec::new(),
+		physics_groups:Vec::new(),
+	})
+}
--- a/src/primitives.rs
+++ b/src/primitives.rs
@ -1,5 +1,5 @@
 use strafesnet_common::model::{Color4,TextureCoordinate,Mesh,IndexedGraphicsGroup,IndexedPhysicsGroup,IndexedVertex,PolygonGroupId,PolygonGroup,PolygonList,IndexedVertexList,PositionId,TextureCoordinateId,NormalId,ColorId,VertexId,RenderConfigId};
-use strafesnet_common::integer::Planar64Vec3;
+use strafesnet_common::integer::{vec3,Planar64Vec3};

 #[derive(Debug)]
 pub enum Primitives{
@ -25,22 +25,22 @@ const CUBE_DEFAULT_TEXTURE_COORDS:[TextureCoordinate;4]=[
 	TextureCoordinate::new(0.0,1.0),
 ];
 const CUBE_DEFAULT_VERTICES:[Planar64Vec3;8]=[
-	Planar64Vec3::int(-1,-1, 1),//0 left bottom back
-	Planar64Vec3::int( 1,-1, 1),//1 right bottom back
-	Planar64Vec3::int( 1, 1, 1),//2 right top back
-	Planar64Vec3::int(-1, 1, 1),//3 left top back
-	Planar64Vec3::int(-1, 1,-1),//4 left top front
-	Planar64Vec3::int( 1, 1,-1),//5 right top front
-	Planar64Vec3::int( 1,-1,-1),//6 right bottom front
-	Planar64Vec3::int(-1,-1,-1),//7 left bottom front
+	vec3::int(-1,-1, 1),//0 left bottom back
+	vec3::int( 1,-1, 1),//1 right bottom back
+	vec3::int( 1, 1, 1),//2 right top back
+	vec3::int(-1, 1, 1),//3 left top back
+	vec3::int(-1, 1,-1),//4 left top front
+	vec3::int( 1, 1,-1),//5 right top front
+	vec3::int( 1,-1,-1),//6 right bottom front
+	vec3::int(-1,-1,-1),//7 left bottom front
 ];
 const CUBE_DEFAULT_NORMALS:[Planar64Vec3;6]=[
-	Planar64Vec3::int( 1, 0, 0),//CubeFace::Right
-	Planar64Vec3::int( 0, 1, 0),//CubeFace::Top
-	Planar64Vec3::int( 0, 0, 1),//CubeFace::Back
-	Planar64Vec3::int(-1, 0, 0),//CubeFace::Left
-	Planar64Vec3::int( 0,-1, 0),//CubeFace::Bottom
-	Planar64Vec3::int( 0, 0,-1),//CubeFace::Front
+	vec3::int( 1, 0, 0),//CubeFace::Right
+	vec3::int( 0, 1, 0),//CubeFace::Top
+	vec3::int( 0, 0, 1),//CubeFace::Back
+	vec3::int(-1, 0, 0),//CubeFace::Left
+	vec3::int( 0,-1, 0),//CubeFace::Bottom
+	vec3::int( 0, 0,-1),//CubeFace::Front
 ];
 const CUBE_DEFAULT_POLYS:[[[u32;3];4];6]=[
 	// right (1, 0, 0)
@ -96,11 +96,11 @@ pub enum WedgeFace{
 	Bottom,
 }
 const WEDGE_DEFAULT_NORMALS:[Planar64Vec3;5]=[
-	Planar64Vec3::int( 1, 0, 0),//Wedge::Right
-	Planar64Vec3::int( 0, 1,-1),//Wedge::TopFront
-	Planar64Vec3::int( 0, 0, 1),//Wedge::Back
-	Planar64Vec3::int(-1, 0, 0),//Wedge::Left
-	Planar64Vec3::int( 0,-1, 0),//Wedge::Bottom
+	vec3::int( 1, 0, 0),//Wedge::Right
+	vec3::int( 0, 1,-1),//Wedge::TopFront
+	vec3::int( 0, 0, 1),//Wedge::Back
+	vec3::int(-1, 0, 0),//Wedge::Left
+	vec3::int( 0,-1, 0),//Wedge::Bottom
 ];
 /*
 local cornerWedgeVerticies = {
@ -120,11 +120,11 @@ pub enum CornerWedgeFace{
 	Front,
 }
 const CORNERWEDGE_DEFAULT_NORMALS:[Planar64Vec3;5]=[
-	Planar64Vec3::int( 1, 0, 0),//CornerWedge::Right
-	Planar64Vec3::int( 0, 1, 1),//CornerWedge::BackTop
-	Planar64Vec3::int(-1, 1, 0),//CornerWedge::LeftTop
-	Planar64Vec3::int( 0,-1, 0),//CornerWedge::Bottom
-	Planar64Vec3::int( 0, 0,-1),//CornerWedge::Front
+	vec3::int( 1, 0, 0),//CornerWedge::Right
+	vec3::int( 0, 1, 1),//CornerWedge::BackTop
+	vec3::int(-1, 1, 0),//CornerWedge::LeftTop
+	vec3::int( 0,-1, 0),//CornerWedge::Bottom
+	vec3::int( 0, 0,-1),//CornerWedge::Front
 ];
 pub fn unit_sphere(render:RenderConfigId)->Mesh{
 	unit_cube(render)
--- a/src/rbx.rs
+++ b/src/rbx.rs
@ -5,7 +5,7 @@ use strafesnet_common::model;
 use strafesnet_common::gameplay_modes;
 use strafesnet_common::gameplay_style;
 use strafesnet_common::gameplay_attributes as attr;
-use strafesnet_common::integer::{Planar64,Planar64Vec3,Planar64Mat3,Planar64Affine3};
+use strafesnet_common::integer::{self,vec3,Planar64,Planar64Vec3,Planar64Mat3,Planar64Affine3};
 use strafesnet_common::model::RenderConfigId;
 use strafesnet_common::updatable::Updatable;

@ -36,15 +36,15 @@ fn recursive_collect_superclass(objects: &mut std::vec::Vec<rbx_dom_weak::types:
 }
 fn planar64_affine3_from_roblox(cf:&rbx_dom_weak::types::CFrame,size:&rbx_dom_weak::types::Vector3)->Planar64Affine3{
 	Planar64Affine3::new(
-		Planar64Mat3::from_cols(
-			Planar64Vec3::try_from([cf.orientation.x.x,cf.orientation.y.x,cf.orientation.z.x]).unwrap()
-			*Planar64::try_from(size.x/2.0).unwrap(),
-			Planar64Vec3::try_from([cf.orientation.x.y,cf.orientation.y.y,cf.orientation.z.y]).unwrap()
-			*Planar64::try_from(size.y/2.0).unwrap(),
-			Planar64Vec3::try_from([cf.orientation.x.z,cf.orientation.y.z,cf.orientation.z.z]).unwrap()
-			*Planar64::try_from(size.z/2.0).unwrap(),
-		),
-		Planar64Vec3::try_from([cf.position.x,cf.position.y,cf.position.z]).unwrap()
+		Planar64Mat3::from_cols([
+			vec3::try_from_f32_array([cf.orientation.x.x,cf.orientation.y.x,cf.orientation.z.x]).unwrap()
+			*integer::try_from_f32(size.x/2.0).unwrap(),
+			vec3::try_from_f32_array([cf.orientation.x.y,cf.orientation.y.y,cf.orientation.z.y]).unwrap()
+			*integer::try_from_f32(size.y/2.0).unwrap(),
+			vec3::try_from_f32_array([cf.orientation.x.z,cf.orientation.y.z,cf.orientation.z.z]).unwrap()
+			*integer::try_from_f32(size.z/2.0).unwrap(),
+			].map(|t|t.fix_1())),
+		vec3::try_from_f32_array([cf.position.x,cf.position.y,cf.position.z]).unwrap()
 	)
 }
 struct ModeBuilder{
@ -63,7 +63,7 @@ impl ModesBuilder{
 		//collect modes and stages into contiguous arrays
 		let mut unique_modes:Vec<(gameplay_modes::ModeId,gameplay_modes::Mode)>
 		=self.modes.into_iter().collect();
-		unique_modes.sort_by(|a,b|a.0.cmp(&b.0));
+		unique_modes.sort_by_key(|&(mode_id,_)|mode_id);
 		let (mut modes,final_mode_id_from_builder_mode_id):(Vec<ModeBuilder>,HashMap<gameplay_modes::ModeId,gameplay_modes::ModeId>)
 		=unique_modes.into_iter().enumerate()
 		.map(|(final_mode_id,(builder_mode_id,mut mode))|{
@ -134,8 +134,7 @@ impl ModesBuilder{
 		self.stage_updates.push((mode_id,stage_id,stage_update));
 	}
 }
-fn get_attributes(object:&rbx_dom_weak::Instance,can_collide:bool,velocity:Planar64Vec3,model_id:model::ModelId,modes_builder:&mut ModesBuilder,wormhole_in_model_to_id:&mut HashMap<model::ModelId,u32>,wormhole_id_to_out_model:&mut HashMap<u32,model::ModelId>)->attr::CollisionAttributes{
-	let name=object.name.as_str();
+fn get_attributes(name:&str,can_collide:bool,velocity:Planar64Vec3,model_id:model::ModelId,modes_builder:&mut ModesBuilder,wormhole_in_model_to_id:&mut HashMap<model::ModelId,u32>,wormhole_id_to_out_model:&mut HashMap<u32,model::ModelId>)->attr::CollisionAttributes{
 	let mut general=attr::GeneralAttributes::default();
 	let mut intersecting=attr::IntersectingAttributes::default();
 	let mut contacting=attr::ContactingAttributes::default();
@ -164,7 +163,7 @@ fn get_attributes(object:&rbx_dom_weak::Instance,can_collide:bool,velocity:Plana
 			force_intersecting=true;
 			modes_builder.insert_mode(
 				gameplay_modes::ModeId::MAIN,
-				gameplay_modes::Mode::new(
+				gameplay_modes::Mode::empty(
 					gameplay_style::StyleModifiers::roblox_bhop(),
 					model_id
 				)
@ -210,7 +209,7 @@ fn get_attributes(object:&rbx_dom_weak::Instance,can_collide:bool,velocity:Plana
 						force_intersecting=true;
 						modes_builder.insert_mode(
 							gameplay_modes::ModeId::new(captures[2].parse::<u32>().unwrap()),
-							gameplay_modes::Mode::new(
+							gameplay_modes::Mode::empty(
 								gameplay_style::StyleModifiers::roblox_bhop(),
 								model_id
 							)
@ -242,7 +241,7 @@ fn get_attributes(object:&rbx_dom_weak::Instance,can_collide:bool,velocity:Plana
 							modes_builder.insert_stage(
 								gameplay_modes::ModeId::MAIN,
 								stage_id,
-								gameplay_modes::Stage::new(model_id),
+								gameplay_modes::Stage::empty(model_id),
 							);
 							//TODO: let denormalize handle this
 							gameplay_modes::StageElementBehaviour::SpawnAt
@ -318,7 +317,7 @@ fn get_attributes(object:&rbx_dom_weak::Instance,can_collide:bool,velocity:Plana
 		}
 	}
 	//need some way to skip this
-	if velocity!=Planar64Vec3::ZERO{
+	if velocity!=vec3::ZERO{
 		general.booster=Some(attr::Booster::Velocity(velocity));
 	}
 	match force_can_collide{
@ -329,13 +328,13 @@ fn get_attributes(object:&rbx_dom_weak::Instance,can_collide:bool,velocity:Plana
 				"Ladder"=>contacting.contact_behaviour=Some(attr::ContactingBehaviour::Ladder(attr::ContactingLadder{sticky:true})),
 				_=>(),
 			}
-			attr::CollisionAttributes::Contact{contacting,general}
+			attr::CollisionAttributes::Contact(attr::ContactAttributes{contacting,general})
 		},
 		false=>if force_intersecting
 		||general.any()
 		||intersecting.any()
 		{
-			attr::CollisionAttributes::Intersect{intersecting,general}
+			attr::CollisionAttributes::Intersect(attr::IntersectAttributes{intersecting,general})
 		}else{
 			attr::CollisionAttributes::Decoration
 		},
@ -404,24 +403,49 @@ enum RobloxBasePartDescription{
 	Wedge(RobloxWedgeDescription),
 	CornerWedge(RobloxCornerWedgeDescription),
 }
+enum Shape{
+	Primitive(primitives::Primitives),
+	MeshPart,
+}
+enum MeshAvailability{
+	Immediate,
+	Deferred(RenderConfigId),
+}
+struct DeferredModelDeferredAttributes{
+	render:RenderConfigId,
+	model:ModelDeferredAttributes,
+}
+struct ModelDeferredAttributes{
+	mesh:model::MeshId,
+	deferred_attributes:GetAttributesArgs,
+	color:model::Color4,//transparency is in here
+	transform:Planar64Affine3,
+}
 struct ModelOwnedAttributes{
 	mesh:model::MeshId,
 	attributes:attr::CollisionAttributes,
 	color:model::Color4,//transparency is in here
 	transform:Planar64Affine3,
 }
-pub fn convert<F:FnMut(Option<&str>)->model::RenderConfigId>(dom:&rbx_dom_weak::WeakDom,mut acquire_render_config_id:F)->PartialMap1{
-	let mut modes_builder=ModesBuilder::default();
+struct GetAttributesArgs{
+	name:Box<str>,
+	can_collide:bool,
+	velocity:Planar64Vec3,
+}
+pub fn convert<AcquireRenderConfigId,AcquireMeshId>(
+	dom:&rbx_dom_weak::WeakDom,
+	mut acquire_render_config_id:AcquireRenderConfigId,
+	mut acquire_mesh_id:AcquireMeshId,
+)->PartialMap1
+where
+	AcquireRenderConfigId:FnMut(Option<&str>)->model::RenderConfigId,
+	AcquireMeshId:FnMut(&str)->model::MeshId,
+{

-	let mut models1=Vec::new();
-	let mut meshes=Vec::new();
-	let mut indexed_model_id_from_description=HashMap::new();
-
-	let mut unique_attributes=Vec::new();
-	let mut attributes_id_from_attributes=HashMap::new();
-
-	let mut wormhole_in_model_to_id=HashMap::new();
-	let mut wormhole_id_to_out_model=HashMap::new();
+	let mut deferred_models_deferred_attributes=Vec::new();
+	let mut primitive_models_deferred_attributes=Vec::new();
+	let mut primitive_meshes=Vec::new();
+	let mut mesh_id_from_description=HashMap::new();

 	//just going to leave it like this for now instead of reworking the data structures for this whole thing
 	let textureless_render_group=acquire_render_config_id(None);
@ -449,7 +473,7 @@ pub fn convert<F:FnMut(Option<&str>)->model::RenderConfigId>(dom:&rbx_dom_weak::
 			{
 				let model_transform=planar64_affine3_from_roblox(cf,size);

-				if model_transform.matrix3.determinant()==Planar64::ZERO{
+				if model_transform.matrix3.det().is_zero(){
 					let mut parent_ref=object.parent();
 					let mut full_path=object.name.clone();
 					while let Some(parent)=dom.get_by_ref(parent_ref){
@ -462,31 +486,35 @@ pub fn convert<F:FnMut(Option<&str>)->model::RenderConfigId>(dom:&rbx_dom_weak::
 				}

 				//at this point a new model is going to be generated for sure.
-				let model_id=model::ModelId::new(models1.len() as u32);
+				let model_id=model::ModelId::new(primitive_models_deferred_attributes.len() as u32);

 				//TODO: also detect "CylinderMesh" etc here
 				let shape=match object.class.as_str(){
 					"Part"=>if let Some(rbx_dom_weak::types::Variant::Enum(shape))=object.properties.get("Shape"){
-						match shape.to_u32(){
+						Shape::Primitive(match shape.to_u32(){
 							0=>primitives::Primitives::Sphere,
 							1=>primitives::Primitives::Cube,
 							2=>primitives::Primitives::Cylinder,
 							3=>primitives::Primitives::Wedge,
 							4=>primitives::Primitives::CornerWedge,
 							other=>panic!("Funky roblox PartType={};",other),
-						}
+						})
 					}else{
 						panic!("Part has no Shape!");
 					},
-					"TrussPart"=>primitives::Primitives::Cube,
-					"WedgePart"=>primitives::Primitives::Wedge,
-					"CornerWedgePart"=>primitives::Primitives::CornerWedge,
+					"TrussPart"=>Shape::Primitive(primitives::Primitives::Cube),
+					"WedgePart"=>Shape::Primitive(primitives::Primitives::Wedge),
+					"CornerWedgePart"=>Shape::Primitive(primitives::Primitives::CornerWedge),
+					"MeshPart"=>Shape::MeshPart,
 					_=>{
 						println!("Unsupported BasePart ClassName={}; defaulting to cube",object.class);
-						primitives::Primitives::Cube
+						Shape::Primitive(primitives::Primitives::Cube)
 					}
 				};

+				let (availability,mesh_id)=match shape{
+					Shape::Primitive(primitive_shape)=>{
+						//TODO: TAB TAB
 				//use the biggest one and cut it down later...
 				let mut part_texture_description:RobloxPartDescription=[None,None,None,None,None,None];
 				temp_objects.clear();
@ -549,7 +577,7 @@ pub fn convert<F:FnMut(Option<&str>)->model::RenderConfigId>(dom:&rbx_dom_weak::
 										transform:roblox_texture_transform,
 									});
 								}else{
-									println!("NormalId={} unsupported for shape={:?}",normal_id,shape);
+									println!("NormalId={} unsupported for shape={:?}",normal_id,primitive_shape);
 								}
 						}
 					}
@ -563,7 +591,7 @@ pub fn convert<F:FnMut(Option<&str>)->model::RenderConfigId>(dom:&rbx_dom_weak::
 					f4,//Cube::Bottom
 					f5,//Cube::Front
 				]=part_texture_description;
-				let basepart_texture_description=match shape{
+				let basepart_description=match primitive_shape{
 					primitives::Primitives::Sphere=>RobloxBasePartDescription::Sphere([f0,f1,f2,f3,f4,f5]),
 					primitives::Primitives::Cube=>RobloxBasePartDescription::Part([f0,f1,f2,f3,f4,f5]),
 					primitives::Primitives::Cylinder=>RobloxBasePartDescription::Cylinder([f0,f1,f2,f3,f4,f5]),
@ -585,13 +613,13 @@ pub fn convert<F:FnMut(Option<&str>)->model::RenderConfigId>(dom:&rbx_dom_weak::
 					]),
 				};
 				//make new model if unit cube has not been created before
-				let indexed_model_id=if let Some(&indexed_model_id)=indexed_model_id_from_description.get(&basepart_texture_description){
+				let mesh_id=if let Some(&mesh_id)=mesh_id_from_description.get(&basepart_description){
 					//push to existing texture model
-					indexed_model_id
+					mesh_id
 				}else{
-					let indexed_model_id=model::MeshId::new(meshes.len() as u32);
-					indexed_model_id_from_description.insert(basepart_texture_description.clone(),indexed_model_id);//borrow checker going crazy
-					meshes.push(match basepart_texture_description{
+					let mesh_id=model::MeshId::new(primitive_meshes.len() as u32);
+					mesh_id_from_description.insert(basepart_description.clone(),mesh_id);//borrow checker going crazy
+					let mesh=match basepart_description{
 						RobloxBasePartDescription::Sphere(part_texture_description)
 						|RobloxBasePartDescription::Cylinder(part_texture_description)
 						|RobloxBasePartDescription::Part(part_texture_description)=>{
@ -652,73 +680,206 @@ pub fn convert<F:FnMut(Option<&str>)->model::RenderConfigId>(dom:&rbx_dom_weak::
 							}
 							primitives::generate_partial_unit_cornerwedge(cornerwedge_face_description)
 						},
-					});
-					indexed_model_id
+					};
+					primitive_meshes.push(mesh);
+					mesh_id
 				};
-				let attributes=get_attributes(
-					&object,
-					*can_collide,
-					Planar64Vec3::try_from([velocity.x,velocity.y,velocity.z]).unwrap(),
+				(MeshAvailability::Immediate,mesh_id)
+					},
+					Shape::MeshPart=>if let (
+						Some(rbx_dom_weak::types::Variant::Content(mesh_asset_id)),
+						Some(rbx_dom_weak::types::Variant::Content(texture_asset_id)),
+					)=(
+						object.properties.get("MeshId"),
+						object.properties.get("TextureID"),
+					){
+						(
+							MeshAvailability::Deferred(acquire_render_config_id(Some(texture_asset_id.as_ref()))),
+							acquire_mesh_id(mesh_asset_id.as_ref()),
+						)
+					}else{
+						panic!("Mesh has no Mesh or Texture");
+					},
+				};
+				let model_deferred_attributes=ModelDeferredAttributes{
+					mesh:mesh_id,
+					transform:model_transform,
+					color:glam::vec4(color3.r as f32/255f32, color3.g as f32/255f32, color3.b as f32/255f32, 1.0-*transparency),
+					deferred_attributes:GetAttributesArgs{
+						name:object.name.as_str().into(),
+						can_collide:*can_collide,
+						velocity:vec3::try_from_f32_array([velocity.x,velocity.y,velocity.z]).unwrap(),
+					},
+				};
+				match availability{
+					MeshAvailability::Immediate=>primitive_models_deferred_attributes.push(model_deferred_attributes),
+					MeshAvailability::Deferred(render)=>deferred_models_deferred_attributes.push(DeferredModelDeferredAttributes{
+						render,
+						model:model_deferred_attributes
+					}),
+				}
+			}
+		}
+	}
+	PartialMap1{
+		primitive_meshes,
+		primitive_models_deferred_attributes,
+		deferred_models_deferred_attributes,
+	}
+}
+struct MeshWithAabb{
+	mesh:model::Mesh,
+	aabb:strafesnet_common::aabb::Aabb,
+}
+pub struct PartialMap1{
+	primitive_meshes:Vec<model::Mesh>,
+	primitive_models_deferred_attributes:Vec<ModelDeferredAttributes>,
+	deferred_models_deferred_attributes:Vec<DeferredModelDeferredAttributes>,
+}
+impl PartialMap1{
+	pub fn add_meshpart_meshes_and_calculate_attributes(
+		mut self,
+		meshpart_meshes:impl IntoIterator<Item=(model::MeshId,crate::data::RobloxMeshBytes)>,
+	)->PartialMap2{
+		//calculate attributes
+		let mut modes_builder=ModesBuilder::default();
+		let mut unique_attributes=Vec::new();
+		let mut attributes_id_from_attributes=HashMap::new();
+
+		let mut wormhole_in_model_to_id=HashMap::new();
+		let mut wormhole_id_to_out_model=HashMap::new();
+
+		//decode roblox meshes
+		//generate mesh_id_map based on meshes that failed to load
+		let loaded_meshes:HashMap<model::MeshId,MeshWithAabb>=
+		meshpart_meshes.into_iter().flat_map(|(old_mesh_id,roblox_mesh_bytes)|
+			match crate::mesh::convert(roblox_mesh_bytes){
+				Ok(mesh)=>{
+					let mut aabb=strafesnet_common::aabb::Aabb::default();
+					for &pos in &mesh.unique_pos{
+						aabb.grow(pos);
+					}
+					Some((old_mesh_id,MeshWithAabb{
+						mesh,
+						aabb,
+					}))
+				},
+				Err(e)=>{
+					println!("Error converting mesh: {e:?}");
+					None
+				},
+			}
+		).collect();
+
+		let mut mesh_id_from_render_config_id=HashMap::new();
+		//ignore meshes that fail to load completely for now
+		let mut acquire_mesh_id_from_render_config_id=|old_mesh_id,render|{
+			loaded_meshes.get(&old_mesh_id).map(|mesh_with_aabb|(
+				*mesh_id_from_render_config_id.entry(old_mesh_id).or_insert_with(||HashMap::new())
+				.entry(render).or_insert_with(||{
+					let mesh_id=model::MeshId::new(self.primitive_meshes.len() as u32);
+					let mut mesh_clone=mesh_with_aabb.mesh.clone();
+					//add a render group lool
+					mesh_clone.graphics_groups.push(model::IndexedGraphicsGroup{
+						render,
+						//the lowest lod is highest quality
+						groups:vec![model::PolygonGroupId::new(0)]
+					});
+					self.primitive_meshes.push(mesh_clone);
+					mesh_id
+				}),
+				&mesh_with_aabb.aabb,
+			))
+		};
+		//now that the meshes are loaded, these models can be generated
+		let models_owned_attributes:Vec<ModelOwnedAttributes>=
+		self.deferred_models_deferred_attributes.into_iter().flat_map(|deferred_model_deferred_attributes|{
+			//meshes need to be cloned from loaded_meshes with a new id when they are used with a new render_id
+			//insert into primitive_meshes
+			let (mesh,aabb)=acquire_mesh_id_from_render_config_id(
+				deferred_model_deferred_attributes.model.mesh,
+				deferred_model_deferred_attributes.render
+			)?;
+			let size=aabb.size();
+			Some(ModelDeferredAttributes{
+				mesh,
+				deferred_attributes:deferred_model_deferred_attributes.model.deferred_attributes,
+				color:deferred_model_deferred_attributes.model.color,
+				transform:Planar64Affine3::new(
+					Planar64Mat3::from_cols([
+						(deferred_model_deferred_attributes.model.transform.matrix3.x_axis*2/size.x).divide().fix_1(),
+						(deferred_model_deferred_attributes.model.transform.matrix3.y_axis*2/size.y).divide().fix_1(),
+						(deferred_model_deferred_attributes.model.transform.matrix3.z_axis*2/size.z).divide().fix_1()
+					]),
+					deferred_model_deferred_attributes.model.transform.translation
+				),
+			})
+		}).chain(self.primitive_models_deferred_attributes.into_iter())
+		.enumerate().map(|(model_id,model_deferred_attributes)|{
+			let model_id=model::ModelId::new(model_id as u32);
+			ModelOwnedAttributes{
+				mesh:model_deferred_attributes.mesh,
+				attributes:get_attributes(
+					&model_deferred_attributes.deferred_attributes.name,
+					model_deferred_attributes.deferred_attributes.can_collide,
+					model_deferred_attributes.deferred_attributes.velocity,
 					model_id,
 					&mut modes_builder,
 					&mut wormhole_in_model_to_id,
 					&mut wormhole_id_to_out_model,
-				);
-				models1.push(ModelOwnedAttributes{
-					mesh:indexed_model_id,
-					transform:model_transform,
-					color:glam::vec4(color3.r as f32/255f32, color3.g as f32/255f32, color3.b as f32/255f32, 1.0-*transparency),
-					attributes,
-				});
+				),
+				color:model_deferred_attributes.color,
+				transform:model_deferred_attributes.transform,
 			}
-		}
-	}
-	let models=models1.into_iter().enumerate().map(|(model_id,mut model1)|{
+		}).collect();
+		let models=models_owned_attributes.into_iter().enumerate().map(|(model_id,mut model_owned_attributes)|{
+		//TODO: TAB
 		let model_id=model::ModelId::new(model_id as u32);
 		//update attributes with wormhole id
 		//TODO: errors/prints
 		if let Some(wormhole_id)=wormhole_in_model_to_id.get(&model_id){
 			if let Some(&wormhole_out_model_id)=wormhole_id_to_out_model.get(wormhole_id){
-				match &mut model1.attributes{
-					attr::CollisionAttributes::Contact{contacting:_,general}
-					|attr::CollisionAttributes::Intersect{intersecting:_,general}
+				match &mut model_owned_attributes.attributes{
+					attr::CollisionAttributes::Contact(attr::ContactAttributes{contacting:_,general})
+					|attr::CollisionAttributes::Intersect(attr::IntersectAttributes{intersecting:_,general})
 					=>general.wormhole=Some(attr::Wormhole{destination_model:wormhole_out_model_id}),
 					attr::CollisionAttributes::Decoration=>println!("Not a wormhole"),
 				}
 			}
 		}
-		
+
 		//index the attributes
-		let attributes_id=if let Some(&attributes_id)=attributes_id_from_attributes.get(&model1.attributes){
+		let attributes_id=if let Some(&attributes_id)=attributes_id_from_attributes.get(&model_owned_attributes.attributes){
 			attributes_id
 		}else{
 			let attributes_id=attr::CollisionAttributesId::new(unique_attributes.len() as u32);
-			attributes_id_from_attributes.insert(model1.attributes.clone(),attributes_id);
-			unique_attributes.push(model1.attributes);
+			attributes_id_from_attributes.insert(model_owned_attributes.attributes.clone(),attributes_id);
+			unique_attributes.push(model_owned_attributes.attributes);
 			attributes_id
 		};
 		model::Model{
-			mesh:model1.mesh,
-			transform:model1.transform,
-			color:model1.color,
+			mesh:model_owned_attributes.mesh,
+			transform:model_owned_attributes.transform,
+			color:model_owned_attributes.color,
 			attributes:attributes_id,
 		}
 	}).collect();
-	PartialMap1{
-		meshes,
+	PartialMap2{
+		meshes:self.primitive_meshes,
 		models,
 		modes:modes_builder.build(),
 		attributes:unique_attributes,
 	}
+	}
 }

-pub struct PartialMap1{
+pub struct PartialMap2{
 	meshes:Vec<model::Mesh>,
 	models:Vec<model::Model>,
 	modes:gameplay_modes::Modes,
 	attributes:Vec<strafesnet_common::gameplay_attributes::CollisionAttributes>,
 }
-impl PartialMap1{
+impl PartialMap2{
 	pub fn add_render_configs_and_textures(
 		self,
 		render_configs:impl IntoIterator<Item=(model::RenderConfigId,model::RenderConfig)>,
@ -740,9 +901,9 @@ impl PartialMap1{
 			attributes:self.attributes,
 			meshes:self.meshes,
 			models:self.models,
-			//the roblox legacy texture thing always works 
+			//the roblox legacy texture thing always works
 			textures,
 			render_configs,
 		}
 	}
-}
+}
Author	SHA1	Message	Date
Quaternions	7980770b8d	v0.5.2 update roblox_emulator	2024-10-04 16:58:01 -07:00
Quaternions	7e09494146	update roblox_emulator	2024-10-04 16:56:52 -07:00
Quaternions	14cc0776a6	v0.5.1 place includes services	2024-10-03 20:30:56 -07:00
Quaternions	d002216bd9	place includes services... duh	2024-10-03 20:30:56 -07:00
Quaternions	7a3184efd5	v0.5.0 convert to Place	2024-10-03 19:37:24 -07:00
Quaternions	35c19abaf1	make a distinction between Model and Place	2024-10-03 19:37:24 -07:00
Quaternions	d5a3b797da	update roblox_emulator	2024-10-03 19:37:13 -07:00
Quaternions	f25954e1a8	v0.4.1 update deps	2024-10-01 16:53:03 -07:00
Quaternions	65d2b71de9	update deps	2024-10-01 16:52:44 -07:00
Quaternions	5fd51c2085	v0.4.0 update common	2024-10-01 16:31:48 -07:00
Quaternions	dcad5fc8ec	update common	2024-10-01 16:31:12 -07:00
Quaternions	ea76d137fd	sort_by_key	2024-10-01 16:25:52 -07:00
Quaternions	a30893dcdf	v0.3.7 update roblox emulator	2024-09-21 15:09:56 -07:00
Quaternions	652bf5a0d3	v0.3.6 update roblox emulator api	2024-09-21 12:41:05 -07:00
Quaternions	f0d0c925dc	v0.3.5 roblox emulator	2024-09-20 11:46:55 -07:00
Quaternions	7bd456ee8c	roblox emulator	2024-09-20 11:45:09 -07:00
Quaternions	b9f9b2ba7e	update deps	2024-09-16 18:26:07 -07:00
Quaternions	deabb1769a	v0.3.4 update common	2024-08-09 14:34:12 -07:00
Quaternions	418450e7d3	update common	2024-08-09 14:34:01 -07:00
Quaternions	f8f44b7b45	update deps	2024-08-09 14:33:50 -07:00
Quaternions	5ee149b66e	update deps	2024-08-07 18:41:04 -07:00
Quaternions	5193d0be71	update deps	2024-07-29 16:32:16 -07:00
Quaternions	24b28f28dd	update deps	2024-07-22 13:49:41 -07:00
Quaternions	77d120597d	update rbx_mesh	2024-03-29 02:54:38 -07:00
Quaternions	44b2ae1c10	use strafesnet registry	2024-03-29 02:54:38 -07:00
Quaternions	12b04a97d6	update rbx deps	2024-03-29 01:44:42 -07:00
Quaternions	127534632e	use rbx_mesh crate	2024-03-13 13:56:52 -07:00
Quaternions	9aca2575a8	v0.3.0 roblox mesh support	2024-03-13 13:38:52 -07:00
Quaternions	1f2ad779f1	roblox mesh converter + loading	2024-03-13 13:37:31 -07:00
Quaternions	775d1972dc	update common	2024-03-13 13:36:38 -07:00
Quaternions	c835183abd	add rbx_mesh dep	2024-03-13 13:36:25 -07:00