StrafesNET/strafe-client
5
Fork 4
Code Issues 2 Pull Requests 1 Packages Projects Releases 1 Wiki Activity

consume textures + label textures with texture_id + don't pass id through thread

Browse Source
This commit is contained in:
Quaternions 2023-10-01 15:17:10 -07:00
parent fddd4576bd
commit d8c6444af3
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main.rs
View File

@ -98,17 +98,18 @@ impl GraphicsData {
//idk how to do this gooder lol //idk how to do this gooder lol
let mut double_map=std::collections::HashMap::<u32,u32>::new(); let mut double_map=std::collections::HashMap::<u32,u32>::new();
let mut texture_loading_threads=Vec::new(); let mut texture_loading_threads=Vec::new();
for (i,t) in indexed_models.textures.iter().enumerate(){ let num_textures=indexed_models.textures.len();
if let Ok(mut file) = std::fs::File::open(std::path::Path::new(&format!("textures/{}.dds",t))){ for (i,texture_id) in indexed_models.textures.into_iter().enumerate(){
if let Ok(mut file) = std::fs::File::open(std::path::Path::new(&format!("textures/{}.dds",texture_id))){
double_map.insert(i as u32, texture_loading_threads.len() as u32); double_map.insert(i as u32, texture_loading_threads.len() as u32);
texture_loading_threads.push(std::thread::spawn(move ||{ texture_loading_threads.push((texture_id,std::thread::spawn(move ||{
(i,ddsfile::Dds::read(&mut file).unwrap()) ddsfile::Dds::read(&mut file).unwrap()
})); })));
} }
} }
let texture_views:Vec<wgpu::TextureView>=texture_loading_threads.into_iter().map(|t|{ let texture_views:Vec<wgpu::TextureView>=texture_loading_threads.into_iter().map(|(texture_id,thread)|{
let (i,image)=t.join().unwrap(); let image=thread.join().unwrap();
let (mut width,mut height)=(image.get_width(),image.get_height()); let (mut width,mut height)=(image.get_width(),image.get_height());
@ -144,13 +145,13 @@ impl GraphicsData {
dimension: wgpu::TextureDimension::D2, dimension: wgpu::TextureDimension::D2,
format, format,
usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST, usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,
label: Some(format!("Texture{}",i).as_str()), label: Some(format!("Texture{}",texture_id).as_str()),
view_formats: &[], view_formats: &[],
}, },
&image.data, &image.data,
); );
texture.create_view(&wgpu::TextureViewDescriptor { texture.create_view(&wgpu::TextureViewDescriptor {
label: Some(format!("Texture{} View",i).as_str()), label: Some(format!("Texture{} View",texture_id).as_str()),
dimension: Some(wgpu::TextureViewDimension::D2), dimension: Some(wgpu::TextureViewDimension::D2),
..wgpu::TextureViewDescriptor::default() ..wgpu::TextureViewDescriptor::default()
}) })
@ -304,7 +305,7 @@ impl GraphicsData {
}); });
} }
} }
println!("Texture References={}",indexed_models.textures.len()); println!("Texture References={}",num_textures);
println!("Textures Loaded={}",texture_views.len()); println!("Textures Loaded={}",texture_views.len());
println!("Indexed Models={}",indexed_models_len); println!("Indexed Models={}",indexed_models_len);
println!("Graphics Objects: {}",self.models.len()); println!("Graphics Objects: {}",self.models.len());