From 02d65e6b7ce7a0e6bae054bd321c68dda1cb0de3 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Tue, 7 Jan 2025 22:56:34 +0100 Subject: static typing for resources --- client/src/scene_render.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'client/src/scene_render.rs') 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>, + prefabs: &mut DemandMap, Arc>, 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) -- cgit v1.2.3-70-g09d2