diff --git a/Cargo.lock b/Cargo.lock index de142734..a1963326 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1678,7 +1678,7 @@ dependencies = [ [[package]] name = "strafesnet_deferred_loader" version = "0.2.0" -source = "git+https://git.itzana.me/StrafesNET/deferred_loader?rev=8049c737ed73c3196337e33c659f8942549ef1cd#8049c737ed73c3196337e33c659f8942549ef1cd" +source = "git+https://git.itzana.me/StrafesNET/deferred_loader?rev=b941bdb6fd103073239d64488e4de99cd792a55c#b941bdb6fd103073239d64488e4de99cd792a55c" dependencies = [ "lazy-regex", "strafesnet_common", diff --git a/Cargo.toml b/Cargo.toml index 7e5c7055..1f9a23ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ pollster = "0.3.0" strafesnet_common = { git = "https://git.itzana.me/StrafesNET/common", rev = "47cdea0c8a5d10a2440ca6270a975d560aa3642d" } strafesnet_bsp_loader = { git = "https://git.itzana.me/StrafesNET/bsp_loader", rev = "00df8288849f8da4a61ff96a9d3f7fc8e6162c2a" } strafesnet_rbx_loader = { git = "https://git.itzana.me/StrafesNET/rbx_loader", rev = "0b630576d4b2402277d55f0a53e9d048a31af9aa" } -strafesnet_deferred_loader = { git = "https://git.itzana.me/StrafesNET/deferred_loader", rev = "8049c737ed73c3196337e33c659f8942549ef1cd", features = ["legacy", "source"] } +strafesnet_deferred_loader = { git = "https://git.itzana.me/StrafesNET/deferred_loader", rev = "b941bdb6fd103073239d64488e4de99cd792a55c", features = ["legacy"] } wgpu = "0.19.0" winit = "0.29.2" diff --git a/src/file.rs b/src/file.rs index 0baf39ab..b6d16b8a 100644 --- a/src/file.rs +++ b/src/file.rs @@ -47,7 +47,7 @@ pub fn load(path:&std::path::Path)->Result<(strafesnet_common::map::CompleteMap, let file=std::fs::File::open(path).map_err(LoadError::File)?; match read(file).map_err(LoadError::ReadError)?{ DataStructure::Roblox(something)=>{ - let mut legacy_loader=strafesnet_deferred_loader::legacy(); + let mut legacy_loader=strafesnet_deferred_loader::roblox_legacy(); let map=strafesnet_rbx_loader::convert(&something,|name|{ match legacy_loader.acquire_texture_id(name){ @@ -64,9 +64,9 @@ pub fn load(path:&std::path::Path)->Result<(strafesnet_common::map::CompleteMap, Ok((map,textures)) }, DataStructure::Source(something)=>{ - let mut source_loader=strafesnet_deferred_loader::source(); + let mut legacy_loader=strafesnet_deferred_loader::source_legacy(); - let (texture_loader,mesh_loader)=source_loader.get_inner_mut(); + let (texture_loader,mesh_loader)=legacy_loader.get_inner_mut(); let map=strafesnet_bsp_loader::convert( &something, @@ -76,7 +76,7 @@ pub fn load(path:&std::path::Path)->Result<(strafesnet_common::map::CompleteMap, |name|mesh_loader.acquire_mesh_id(name), ); - let textures=source_loader.load_textures().map_err(LoadError::Io)?; + let textures=legacy_loader.load_textures().map_err(LoadError::Io)?; Ok((map,textures)) },