From 1d4a79b15e65ee1ffc16fc0b93a71d5a3224a013 Mon Sep 17 00:00:00 2001 From: Quaternions Date: Mon, 16 Sep 2024 13:05:49 -0700 Subject: [PATCH] graphics: wip --- src/graphics.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/graphics.rs b/src/graphics.rs index 2af4816..13aa507 100644 --- a/src/graphics.rs +++ b/src/graphics.rs @@ -238,9 +238,9 @@ impl GraphicsState{ //create let owned_mesh_id=IndexedGraphicsMeshOwnedRenderConfigId::new(unique_render_config_models.len() as u32); unique_render_config_models.push(IndexedGraphicsMeshOwnedRenderConfig{ - unique_pos:mesh.unique_pos.iter().map(|&v|*Into::::into(v).as_ref()).collect(), + unique_pos:mesh.unique_pos.iter().map(|v|v.to_array().map(Into::into)).collect(), unique_tex:mesh.unique_tex.iter().map(|v|*v.as_ref()).collect(), - unique_normal:mesh.unique_normal.iter().map(|&v|*Into::::into(v).as_ref()).collect(), + unique_normal:mesh.unique_normal.iter().map(|v|v.to_array().map(Into::into)).collect(), unique_color:mesh.unique_color.iter().map(|v|*v.as_ref()).collect(), unique_vertices:mesh.unique_vertices.clone(), render_config:graphics_group.render, @@ -890,7 +890,7 @@ impl GraphicsState{ // update rotation let camera_uniforms=self.camera.to_uniform_data( - frame_state.body.extrapolated_position(frame_state.time).into(), + frame_state.body.extrapolated_position(frame_state.time).map(Into::::into).to_array().into(), frame_state.camera.simulate_move_angles(glam::IVec2::ZERO) ); self.staging_belt