diff --git a/code/beginner/tutorial9-models/src/lib.rs b/code/beginner/tutorial9-models/src/lib.rs index 7054fabf..4fcc2894 100644 --- a/code/beginner/tutorial9-models/src/lib.rs +++ b/code/beginner/tutorial9-models/src/lib.rs @@ -28,6 +28,7 @@ pub const OPENGL_TO_WGPU_MATRIX: cgmath::Matrix4 = cgmath::Matrix4::new( const NUM_INSTANCES_PER_ROW: u32 = 10; +#[derive(Debug)] struct Camera { eye: cgmath::Point3, target: cgmath::Point3, @@ -47,7 +48,7 @@ impl Camera { } #[repr(C)] -#[derive(Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)] +#[derive(Debug, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)] struct CameraUniform { view_proj: [[f32; 4]; 4], } @@ -506,10 +507,10 @@ impl<'a> State<'a> { fn resize(&mut self, new_size: winit::dpi::PhysicalSize) { if new_size.width > 0 && new_size.height > 0 { - self.camera.aspect = self.config.width as f32 / self.config.height as f32; - self.size = new_size; self.config.width = new_size.width; self.config.height = new_size.height; + self.size = new_size; + self.camera.aspect = self.config.width as f32 / self.config.height as f32; self.surface.configure(&self.device, &self.config); self.depth_texture = texture::Texture::create_depth_texture(&self.device, &self.config, "depth_texture"); @@ -521,7 +522,9 @@ impl<'a> State<'a> { fn update(&mut self) { self.camera_controller.update_camera(&mut self.camera); + log::info!("{:?}", self.camera); self.camera_uniform.update_view_proj(&self.camera); + log::info!("{:?}", self.camera_uniform); self.queue.write_buffer( &self.camera_buffer, 0, diff --git a/code/beginner/tutorial9-models/src/resources.rs b/code/beginner/tutorial9-models/src/resources.rs index b68a8106..5c4ba9fa 100644 --- a/code/beginner/tutorial9-models/src/resources.rs +++ b/code/beginner/tutorial9-models/src/resources.rs @@ -144,7 +144,7 @@ pub async fn load_model( usage: wgpu::BufferUsages::INDEX, }); - log::info!("{}", m.name); + log::info!("Mesh: {}", m.name); model::Mesh { name: file_name.to_string(), vertex_buffer, diff --git a/code/intermediate/tutorial10-lighting/src/lib.rs b/code/intermediate/tutorial10-lighting/src/lib.rs index 9ba93815..f6748212 100644 --- a/code/intermediate/tutorial10-lighting/src/lib.rs +++ b/code/intermediate/tutorial10-lighting/src/lib.rs @@ -623,10 +623,10 @@ impl<'a> State<'a> { fn resize(&mut self, new_size: winit::dpi::PhysicalSize) { if new_size.width > 0 && new_size.height > 0 { - self.camera.aspect = self.config.width as f32 / self.config.height as f32; - self.size = new_size; self.config.width = new_size.width; self.config.height = new_size.height; + self.size = new_size; + self.camera.aspect = self.config.width as f32 / self.config.height as f32; self.surface.configure(&self.device, &self.config); self.depth_texture = texture::Texture::create_depth_texture(&self.device, &self.config, "depth_texture"); diff --git a/code/intermediate/tutorial11-normals/src/lib.rs b/code/intermediate/tutorial11-normals/src/lib.rs index 33fd7059..a266fa01 100644 --- a/code/intermediate/tutorial11-normals/src/lib.rs +++ b/code/intermediate/tutorial11-normals/src/lib.rs @@ -674,10 +674,10 @@ impl<'a> State<'a> { fn resize(&mut self, new_size: winit::dpi::PhysicalSize) { if new_size.width > 0 && new_size.height > 0 { - self.camera.aspect = self.config.width as f32 / self.config.height as f32; - self.size = new_size; self.config.width = new_size.width; self.config.height = new_size.height; + self.size = new_size; + self.camera.aspect = self.config.width as f32 / self.config.height as f32; self.surface.configure(&self.device, &self.config); self.depth_texture = texture::Texture::create_depth_texture(&self.device, &self.config, "depth_texture");