From 690525b10a8f65c70fcaa6af0017dafea0743bc9 Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Thu, 3 Oct 2024 19:40:19 -0700
Subject: [PATCH] update rbx_loader

---
 Cargo.lock  | 16 ++++++++--------
 Cargo.toml  |  2 +-
 src/file.rs |  9 +++++----
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e242307..c6cd1a1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1933,9 +1933,9 @@ dependencies = [
 
 [[package]]
 name = "roblox_emulator"
-version = "0.2.3"
+version = "0.3.0"
 source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "2fa2c785a17f607aad6bdd19eef6d19f9476f308ce38de139df931a99132bd46"
+checksum = "ba81a9134bb07930669340c7aad34719e74690f68771c6ef7b093f00ddba9e65"
 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.0"
 source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "a1540fa66518857886cf4094dc597b3228341046d8973ccc70196fb52a47105b"
+checksum = "32a30222fff2edcf85e5ac7eef96b25423d9e52b593dd44e14559397b53c89a8"
 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..4b920a7 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.0", 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..b150450 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<P:AsRef<std::path::Path>>(path:P)->Result<strafesnet_common::map::Co
 		#[cfg(feature="snf")]
 		DataStructure::StrafesNET(map)=>Ok(map),
 		#[cfg(feature="roblox")]
-		DataStructure::Roblox(mut dom)=>{
-			dom.run_scripts();
+		DataStructure::Roblox(model)=>{
+			let (mut place,services)=model.into_place();
+			place.run_scripts(services);
 
 			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),
 			);