diff --git a/strafe-client/src/file.rs b/strafe-client/src/file.rs index cb7eb665..b44fe1f3 100644 --- a/strafe-client/src/file.rs +++ b/strafe-client/src/file.rs @@ -71,6 +71,10 @@ pub enum LoadError{ LoadRobloxMesh(strafesnet_rbx_loader::loader::MeshError), #[cfg(feature="roblox")] LoadRobloxTexture(strafesnet_rbx_loader::loader::TextureError), + #[cfg(feature="source")] + LoadSourceMesh(strafesnet_bsp_loader::loader::MeshError), + #[cfg(feature="source")] + LoadSourceTexture(strafesnet_bsp_loader::loader::TextureError), } impl std::fmt::Display for LoadError{ fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{ @@ -122,40 +126,24 @@ pub fn load<P:AsRef<std::path::Path>>(path:P)->Result<LoadFormat,LoadError>{ }, #[cfg(feature="source")] ReadFormat::Source(bsp)=>{ - let mut loader=strafesnet_deferred_loader::source_legacy(); - - let (texture_loader,mesh_loader)=loader.get_inner_mut(); + let mut texture_deferred_loader=RenderConfigDeferredLoader::new(); + let mut mesh_deferred_loader=MeshDeferredLoader::new(); let map_step1=strafesnet_bsp_loader::convert( &bsp, - |name|texture_loader.acquire_render_config_id(name), - |name|mesh_loader.acquire_mesh_id(name), + &mut texture_deferred_loader, + &mut mesh_deferred_loader, ); - let prop_meshes=mesh_loader.load_meshes(bsp.as_ref()); + let mut mesh_loader=strafesnet_bsp_loader::loader::MeshLoader::new(&bsp,&mut texture_deferred_loader); + let prop_meshes=mesh_deferred_loader.into_meshes(&mut mesh_loader,LoadFailureMode::DefaultToNone).map_err(LoadError::LoadSourceMesh)?; - let map_step2=map_step1.add_prop_meshes( - //the type conflagulator 9000 - prop_meshes.into_iter().map(|(mesh_id,loader_model)| - (mesh_id,strafesnet_bsp_loader::data::ModelData{ - mdl:strafesnet_bsp_loader::data::MdlData::new(loader_model.mdl.get()), - vtx:strafesnet_bsp_loader::data::VtxData::new(loader_model.vtx.get()), - vvd:strafesnet_bsp_loader::data::VvdData::new(loader_model.vvd.get()), - }) - ), - |name|texture_loader.acquire_render_config_id(name), - ); + let map_step2=map_step1.add_prop_meshes(prop_meshes); - let (textures,render_configs)=loader.into_render_configs().map_err(LoadError::Io)?.consume(); + let mut texture_loader=strafesnet_bsp_loader::loader::TextureLoader::new(); + let render_configs=texture_deferred_loader.into_render_configs(&mut texture_loader,LoadFailureMode::DefaultToNone).map_err(LoadError::LoadSourceTexture)?; - let map=map_step2.add_render_configs_and_textures( - render_configs.into_iter(), - textures.into_iter().map(|(texture_id,texture)| - (texture_id,match texture{ - strafesnet_deferred_loader::texture::Texture::ImageDDS(data)=>data, - }) - ), - ); + let map=map_step2.add_render_configs_and_textures(render_configs); Ok(LoadFormat::Map(map)) },