From 04ca0ea9c3c730eaff7c9dbd98f19c08ab0d25de Mon Sep 17 00:00:00 2001 From: rewin Date: Tue, 15 Oct 2024 20:48:23 +0300 Subject: [PATCH] fix child transform --- crates/editor_ui/src/camera_view.rs | 5 ++--- crates/editor_ui/src/tools/gizmo.rs | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/crates/editor_ui/src/camera_view.rs b/crates/editor_ui/src/camera_view.rs index 66df77d6..2b46007a 100644 --- a/crates/editor_ui/src/camera_view.rs +++ b/crates/editor_ui/src/camera_view.rs @@ -328,9 +328,8 @@ fn set_camera_viewport( ui_state.need_reinit_egui_tex = false; } - let Ok( - [(mut real_cam, _, mut real_cam_local_transform), (watch_cam, camera_transform, _)], - ) = cameras.get_many_mut([real_cam_entity, camera_entity]) + let Ok([(mut real_cam, _, mut real_cam_local_transform), (watch_cam, camera_transform, _)]) = + cameras.get_many_mut([real_cam_entity, camera_entity]) else { if let Ok((mut real_cam, _, _)) = cameras.get_mut(real_cam_entity) { real_cam.is_active = false; diff --git a/crates/editor_ui/src/tools/gizmo.rs b/crates/editor_ui/src/tools/gizmo.rs index 8a8e2409..c4739759 100644 --- a/crates/editor_ui/src/tools/gizmo.rs +++ b/crates/editor_ui/src/tools/gizmo.rs @@ -399,7 +399,9 @@ impl EditorTool for GizmoTool { if let Some(parent) = cell.get_entity(parent.get()) { if let Some(parent_global) = unsafe { parent.get::() } { if let Some(global) = unsafe { ecell.get::() } { - if let Some((_, transforms)) = Gizmo::new(gizmo_config).interact( + self.gizmo.update_config(gizmo_config); + + if let Some((_, transforms)) = self.gizmo.interact( ui, &[bevy_to_gizmo_transform(&global.compute_transform())], ) {