StrafesNET/map-tool
3
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fancy pants rust ownership avoids allocation

Browse Source
This commit is contained in:
Quaternions 2025-02-03 15:29:16 -08:00
parent cfc71fac67
commit 9f68960b28
1 changed files with 4 additions and 4 deletions

8
src/source.rs

@ -218,7 +218,7 @@ async fn gimme_them_textures(path:PathBuf,vpk_list:&[vpk::VPK],send_texture:toki
let mut mesh_loader=strafesnet_bsp_loader::loader::ModelLoader::new(finder); let mut mesh_loader=strafesnet_bsp_loader::loader::ModelLoader::new(finder);
// load models and collect requested textures // load models and collect requested textures
for &model_path in mesh_deferred_loader.indices(){ for model_path in mesh_deferred_loader.into_indices(){
let model:vmdl::Model=mesh_loader.load(model_path)?; let model:vmdl::Model=mesh_loader.load(model_path)?;
for texture in model.textures(){ for texture in model.textures(){
for search_path in &texture.search_paths{ for search_path in &texture.search_paths{
@ -230,10 +230,10 @@ async fn gimme_them_textures(path:PathBuf,vpk_list:&[vpk::VPK],send_texture:toki
} }
} }
for texture_path in texture_deferred_loader.indices(){ for texture_path in texture_deferred_loader.into_indices(){
match load_texture(finder,texture_path.as_ref()){ match load_texture(finder,&texture_path){
Ok(Some(texture))=>send_texture.send( Ok(Some(texture))=>send_texture.send(
(texture.into_owned(),texture_path.as_ref().to_owned()) (texture.into_owned(),texture_path.into_owned())
).await.unwrap(), ).await.unwrap(),
Ok(None)=>(), Ok(None)=>(),
Err(e)=>println!("Load error: {e}"), Err(e)=>println!("Load error: {e}"),