diff --git a/Cargo.lock b/Cargo.lock index e242307..9d4d1ab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1933,9 +1933,9 @@ dependencies = [ [[package]] name = "roblox_emulator" -version = "0.2.3" +version = "0.3.1" source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/" -checksum = "2fa2c785a17f607aad6bdd19eef6d19f9476f308ce38de139df931a99132bd46" +checksum = "b58d7bb42d458984e629a012757474710fd0e429c2c824a2529574be5e7c2fd6" dependencies = [ "glam", "mlua", @@ -2152,9 +2152,9 @@ dependencies = [ [[package]] name = "strafesnet_deferred_loader" -version = "0.4.0" +version = "0.4.1" source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/" -checksum = "9985192a282473ddd40d03114e67afe057cba031bea665e9020b139a621afb07" +checksum = "cb47034893e945c640063a6c0fb09c6186dcc9f0b221b8c41f5a22070fe430f4" dependencies = [ "strafesnet_common", "url", @@ -2163,9 +2163,9 @@ dependencies = [ [[package]] name = "strafesnet_rbx_loader" -version = "0.4.1" +version = "0.5.1" source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/" -checksum = "a1540fa66518857886cf4094dc597b3228341046d8973ccc70196fb52a47105b" +checksum = "bb3539939618714ed418aca2f2d10578022f984d223d05f99b857805c02d7cfe" dependencies = [ "bytemuck", "glam", @@ -2366,9 +2366,9 @@ checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" diff --git a/Cargo.toml b/Cargo.toml index b73148d..3a3c79b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ pollster = "0.3.0" strafesnet_bsp_loader = { version = "0.2.1", registry = "strafesnet", optional = true } strafesnet_common = { version = "0.5.2", registry = "strafesnet" } strafesnet_deferred_loader = { version = "0.4.0", features = ["legacy"], registry = "strafesnet", optional = true } -strafesnet_rbx_loader = { version = "0.4.1", registry = "strafesnet", optional = true } +strafesnet_rbx_loader = { version = "0.5.1", registry = "strafesnet", optional = true } strafesnet_snf = { version = "0.2.0", registry = "strafesnet", optional = true } wgpu = "22.1.0" winit = "0.30.5" diff --git a/src/file.rs b/src/file.rs index a971f38..3adc397 100644 --- a/src/file.rs +++ b/src/file.rs @@ -22,7 +22,7 @@ impl std::error::Error for ReadError{} pub enum DataStructure{ #[cfg(feature="roblox")] - Roblox(strafesnet_rbx_loader::Dom), + Roblox(strafesnet_rbx_loader::Model), #[cfg(feature="source")] Source(strafesnet_bsp_loader::Bsp), #[cfg(feature="snf")] @@ -66,15 +66,16 @@ pub fn load>(path:P)->ResultOk(map), #[cfg(feature="roblox")] - DataStructure::Roblox(mut dom)=>{ - dom.run_scripts(); + DataStructure::Roblox(model)=>{ + let mut place=model.into_place(); + place.run_scripts(); let mut loader=strafesnet_deferred_loader::roblox_legacy(); let (texture_loader,mesh_loader)=loader.get_inner_mut(); let map_step1=strafesnet_rbx_loader::convert( - &dom, + &place, |name|texture_loader.acquire_render_config_id(name), |name|mesh_loader.acquire_mesh_id(name), );