council of monkeys (failed experiment map 5692150236)

src/main.rs

@@ -97,65 +97,59 @@ impl GraphicsData {
 
 		//idk how to do this gooder lol
 		let mut double_map=std::collections::HashMap::<u32,u32>::new();
-		let mut texture_loading_threads=Vec::new();
+		let mut texture_views:Vec<wgpu::TextureView>=Vec::with_capacity(indexed_models.textures.len());
 		for (i,t) in indexed_models.textures.iter().enumerate(){
 			if let Ok(mut file) = std::fs::File::open(std::path::Path::new(&format!("textures/{}.dds",t))){
-				double_map.insert(i as u32, texture_loading_threads.len() as u32);
-				texture_loading_threads.push(std::thread::spawn(move ||{
-					(i,ddsfile::Dds::read(&mut file).unwrap())
+				let image = ddsfile::Dds::read(&mut file).unwrap();
+
+				let (mut width,mut height)=(image.get_width(),image.get_height());
+
+				let format=match image.header10.unwrap().dxgi_format{
+					ddsfile::DxgiFormat::R8G8B8A8_UNorm_sRGB => wgpu::TextureFormat::Rgba8UnormSrgb,
+					ddsfile::DxgiFormat::BC7_UNorm_sRGB => {
+						//floor(w,4), should be ceil(w,4)
+						width=width/4*4;
+						height=height/4*4;
+						wgpu::TextureFormat::Bc7RgbaUnormSrgb
+					},
+					other=>panic!("unsupported format {:?}",other),
+				};
+
+				let size = wgpu::Extent3d {
+					width,
+					height,
+					depth_or_array_layers: 1,
+				};
+
+				let layer_size = wgpu::Extent3d {
+					depth_or_array_layers: 1,
+					..size
+				};
+				let max_mips = layer_size.max_mips(wgpu::TextureDimension::D2);
+
+				let texture = device.create_texture_with_data(
+					queue,
+					&wgpu::TextureDescriptor {
+						size,
+						mip_level_count: max_mips,
+						sample_count: 1,
+						dimension: wgpu::TextureDimension::D2,
+						format,
+						usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,
+						label: Some(format!("Texture{}",i).as_str()),
+						view_formats: &[],
+					},
+					&image.data,
+				);
+
+				double_map.insert(i as u32, texture_views.len() as u32);
+				texture_views.push(texture.create_view(&wgpu::TextureViewDescriptor {
+					label: Some(format!("Texture{} View",i).as_str()),
+					dimension: Some(wgpu::TextureViewDimension::D2),
+					..wgpu::TextureViewDescriptor::default()
 				}));
 			}
 		}
-
-		let texture_views:Vec<wgpu::TextureView>=texture_loading_threads.into_iter().map(|t|{
-			let (i,image)=t.join().unwrap();
-
-			let (mut width,mut height)=(image.get_width(),image.get_height());
-
-			let format=match image.header10.unwrap().dxgi_format{
-				ddsfile::DxgiFormat::R8G8B8A8_UNorm_sRGB => wgpu::TextureFormat::Rgba8UnormSrgb,
-				ddsfile::DxgiFormat::BC7_UNorm_sRGB => {
-					//floor(w,4), should be ceil(w,4)
-					width=width/4*4;
-					height=height/4*4;
-					wgpu::TextureFormat::Bc7RgbaUnormSrgb
-				},
-				other=>panic!("unsupported format {:?}",other),
-			};
-
-			let size = wgpu::Extent3d {
-				width,
-				height,
-				depth_or_array_layers: 1,
-			};
-
-			let layer_size = wgpu::Extent3d {
-				depth_or_array_layers: 1,
-				..size
-			};
-			let max_mips = layer_size.max_mips(wgpu::TextureDimension::D2);
-
-			let texture = device.create_texture_with_data(
-				queue,
-				&wgpu::TextureDescriptor {
-					size,
-					mip_level_count: max_mips,
-					sample_count: 1,
-					dimension: wgpu::TextureDimension::D2,
-					format,
-					usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,
-					label: Some(format!("Texture{}",i).as_str()),
-					view_formats: &[],
-				},
-				&image.data,
-			);
-			texture.create_view(&wgpu::TextureViewDescriptor {
-				label: Some(format!("Texture{} View",i).as_str()),
-				dimension: Some(wgpu::TextureViewDimension::D2),
-				..wgpu::TextureViewDescriptor::default()
-			})
-		}).collect();
-
 		let indexed_models_len=indexed_models.models.len();
 		//split groups with different textures into separate models
 		//the models received here are supposed to be tightly packed, i.e. no code needs to check if two models are using the same groups.
@@ -927,7 +921,8 @@ impl framework::Example for GraphicsData {
 			device.create_command_encoder(&wgpu::CommandEncoderDescriptor { label: None });
 
 		// update rotation
-		let camera_uniforms = to_uniform_data(&self.physics.camera,self.physics.body.extrapolated_position(time));
+		let position=self.physics.body.extrapolated_position(time);
+		let camera_uniforms = to_uniform_data(&self.physics.camera,position);
 		self.staging_belt
 			.write_buffer(
 				&mut encoder,
@@ -938,7 +933,12 @@ impl framework::Example for GraphicsData {
 			)
 			.copy_from_slice(bytemuck::cast_slice(&camera_uniforms));
 		//This code only needs to run when the uniforms change
-		for model in self.models.iter() {
+		for model in self.models.iter_mut() {
+			for instance in model.instances.iter_mut(){
+				let model_pos=glam::Vec4Swizzles::xyz(instance.transform.col(3));
+				let model_look=glam::Affine3A::look_at_rh(model_pos, position, glam::Vec3::Y);
+				instance.transform=glam::Mat4::from(model_look);
+			}
 			let model_uniforms = get_instances_buffer_data(&model.instances);
 			self.staging_belt
 				.write_buffer(