diff --git a/studio/src/interaction/gizmos/common.rs b/studio/src/interaction/gizmos/common.rs index b1d56d2..c10a1e1 100644 --- a/studio/src/interaction/gizmos/common.rs +++ b/studio/src/interaction/gizmos/common.rs @@ -9,9 +9,6 @@ pub(super) struct TransformGizmo { pub(super) transform_space: TransformSpace, } -#[derive(Event)] -pub(super) struct RebuildGizmo; - #[derive(Bundle)] pub(super) struct TransformGizmoBundle { name: Name, diff --git a/studio/src/interaction/gizmos/mod.rs b/studio/src/interaction/gizmos/mod.rs index b7ae535..b4009d5 100644 --- a/studio/src/interaction/gizmos/mod.rs +++ b/studio/src/interaction/gizmos/mod.rs @@ -37,7 +37,6 @@ impl Plugin for GizmoPlugin { fn build(&self, app: &mut App) { app.register_type::(); - app.add_event::(); app.add_systems(Startup, init_resources); app.add_systems( PreUpdate, @@ -51,8 +50,7 @@ impl Plugin for GizmoPlugin { ( despawn_existing_gizmo.run_if( resource_changed_or_removed::() - .or_else(resource_changed::()) - .or_else(on_event::()), + .or_else(resource_changed::()), ), spawn_gizmo.after(despawn_existing_gizmo).run_if( resource_exists::() diff --git a/studio/src/interaction/gizmos/rotation.rs b/studio/src/interaction/gizmos/rotation.rs index cf8a3f9..10508d9 100644 --- a/studio/src/interaction/gizmos/rotation.rs +++ b/studio/src/interaction/gizmos/rotation.rs @@ -8,14 +8,14 @@ use bevy_mod_picking::prelude::*; use bevy_mod_raycast::prelude::{Raycast, RaycastSettings}; use crate::{ - interaction::{TransformMode, TransformSpace}, + interaction::TransformSpace, math::{MatrixExtras, NearlyZero}, MainCamera, }; use super::{ on_gizmo_element_hover, on_gizmo_element_unhover, GizmoMats, GizmoMeshes, InitialTransform, - RebuildGizmo, TransformGizmo, TransformGizmoBundle, GIZMO_RENDER_LAYER, + TransformGizmo, TransformGizmoBundle, GIZMO_RENDER_LAYER, }; #[derive(Component)] @@ -209,8 +209,6 @@ pub(super) fn on_rotation_start( pub(super) fn on_rotation_end( _: Listener>, mut cmd: Commands, - r_xform_mode: Res, - mut ev_rebuild_gizmo: EventWriter, q_inited_components: Query>, ) { info!("Rotation end"); @@ -222,10 +220,6 @@ pub(super) fn on_rotation_end( .remove::() .remove::(); } - - if matches!(r_xform_mode.space, TransformSpace::World) { - ev_rebuild_gizmo.send(RebuildGizmo); - } } pub(super) fn on_rotate(