diff options
author | metamuffin <metamuffin@disroot.org> | 2025-01-07 22:56:34 +0100 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2025-01-07 22:56:34 +0100 |
commit | 02d65e6b7ce7a0e6bae054bd321c68dda1cb0de3 (patch) | |
tree | 10362c18bccf2e9690d78844a7ff3ca403f7a126 /client/src/scene_render.rs | |
parent | 745c0ff9cfb27381114ce832baed3b57a2e4b4f6 (diff) | |
download | weareserver-02d65e6b7ce7a0e6bae054bd321c68dda1cb0de3.tar weareserver-02d65e6b7ce7a0e6bae054bd321c68dda1cb0de3.tar.bz2 weareserver-02d65e6b7ce7a0e6bae054bd321c68dda1cb0de3.tar.zst |
static typing for resources
Diffstat (limited to 'client/src/scene_render.rs')
-rw-r--r-- | client/src/scene_render.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/client/src/scene_render.rs b/client/src/scene_render.rs index d619f3d..6ec5f25 100644 --- a/client/src/scene_render.rs +++ b/client/src/scene_render.rs @@ -16,7 +16,7 @@ */ use glam::{EulerRot, Mat3, Mat4}; use std::sync::Arc; -use weareshared::{packets::Resource, tree::SceneTree}; +use weareshared::{packets::Resource, resources::Prefab, tree::SceneTree}; use wgpu::{ BindGroupLayout, BindGroupLayoutDescriptor, BindGroupLayoutEntry, BindingType, BlendState, Color, ColorTargetState, ColorWrites, CommandEncoder, CompareFunction, DepthBiasState, @@ -164,7 +164,7 @@ impl ScenePipeline { commands: &mut CommandEncoder, target: &TextureView, scene: &SceneTree, - prefabs: &mut DemandMap<Resource, Arc<RPrefab>>, + prefabs: &mut DemandMap<Resource<Prefab>, Arc<RPrefab>>, camera: Mat4, ) { let mut rpass = commands.begin_render_pass(&RenderPassDescriptor { @@ -202,7 +202,7 @@ impl ScenePipeline { ob.rot.z, )) * Mat4::from_translation(ob.pos.into()); - if let Some(prefab) = prefabs.try_get(ob.res) { + if let Some(prefab) = prefabs.try_get(ob.res.clone()) { for (affine, part) in &prefab.0 { let part_projection = prefab_projection * Mat4::from_mat3a(affine.matrix3) |