tirbofish/dropbear · commit
9115981c96459342594e740c74183ba5d43902a0
skinned animation officially works now (hooray!!!)
Signature present but could not be verified.
Unverified
@@ -321,7 +321,6 @@ impl AnimationComponent { } } - /// Recursively calculates and caches the global world matrix for a node. fn resolve_global_transform( &self, node_idx: usize, @@ -1164,6 +1164,7 @@ pub trait DrawModel<'a> { model: &'a Model, camera_bind_group: &'a wgpu::BindGroup, light_bind_group: &'a wgpu::BindGroup, + skin_bind_group: Option<&'a wgpu::BindGroup>, ); fn draw_model_instanced( &mut self, @@ -1171,6 +1172,7 @@ pub trait DrawModel<'a> { instances: Range<u32>, camera_bind_group: &'a wgpu::BindGroup, light_bind_group: &'a wgpu::BindGroup, + skin_bind_group: Option<&'a wgpu::BindGroup>, ); } @@ -1216,8 +1218,9 @@ where model: &'b Model, camera_bind_group: &'b wgpu::BindGroup, light_bind_group: &'a wgpu::BindGroup, + skin_bind_group: Option<&'a wgpu::BindGroup>, ) { - self.draw_model_instanced(model, 0..1, camera_bind_group, light_bind_group); + self.draw_model_instanced(model, 0..1, camera_bind_group, light_bind_group, skin_bind_group); } fn draw_model_instanced( @@ -1226,6 +1229,7 @@ where instances: Range<u32>, camera_bind_group: &'b wgpu::BindGroup, light_bind_group: &'a wgpu::BindGroup, + skin_bind_group: Option<&'a wgpu::BindGroup>, ) { for mesh in &model.meshes {
Large diffs are not rendered by default. Showing the first 50 of 309 lines. Show full diff