storytold/storyteller-bevy
2
0
Fork 0
mirror of https://github.com/storytold/storyteller-bevy.git synced 2026-10-28 08:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove rebuild gizmo

Browse Source
This commit is contained in:
rewin
2024-01-12 22:48:19 +03:00
parent fd35acc498
commit 89e6a7bae8
3 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
studio/src/interaction/gizmos/common.rs
-3
View File
@@ -9,9 +9,6 @@ pub(super) struct TransformGizmo {
pub(super) transform_space: TransformSpace, pub(super) transform_space: TransformSpace,
} }
#[derive(Event)]
pub(super) struct RebuildGizmo;
#[derive(Bundle)] #[derive(Bundle)]
pub(super) struct TransformGizmoBundle { pub(super) struct TransformGizmoBundle {
name: Name, name: Name,
studio/src/interaction/gizmos/mod.rs
+1 -3
View File
@@ -37,7 +37,6 @@ impl Plugin for GizmoPlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
app.register_type::<TransformGizmo>(); app.register_type::<TransformGizmo>();
app.add_event::<RebuildGizmo>();
app.add_systems(Startup, init_resources); app.add_systems(Startup, init_resources);
app.add_systems( app.add_systems(
PreUpdate, PreUpdate,
@@ -51,8 +50,7 @@ impl Plugin for GizmoPlugin {
( (
despawn_existing_gizmo.run_if( despawn_existing_gizmo.run_if(
resource_changed_or_removed::<Selection>() resource_changed_or_removed::<Selection>()
.or_else(resource_changed::<TransformMode>()) .or_else(resource_changed::<TransformMode>()),
.or_else(on_event::<RebuildGizmo>()),
), ),
spawn_gizmo.after(despawn_existing_gizmo).run_if( spawn_gizmo.after(despawn_existing_gizmo).run_if(
resource_exists::<Selection>() resource_exists::<Selection>()
studio/src/interaction/gizmos/rotation.rs
+2 -8
View File
@@ -8,14 +8,14 @@ use bevy_mod_picking::prelude::*;
use bevy_mod_raycast::prelude::{Raycast, RaycastSettings}; use bevy_mod_raycast::prelude::{Raycast, RaycastSettings};
use crate::{ use crate::{
interaction::{TransformMode, TransformSpace}, interaction::TransformSpace,
math::{MatrixExtras, NearlyZero}, math::{MatrixExtras, NearlyZero},
MainCamera, MainCamera,
}; };
use super::{ use super::{
on_gizmo_element_hover, on_gizmo_element_unhover, GizmoMats, GizmoMeshes, InitialTransform, on_gizmo_element_hover, on_gizmo_element_unhover, GizmoMats, GizmoMeshes, InitialTransform,
RebuildGizmo, TransformGizmo, TransformGizmoBundle, GIZMO_RENDER_LAYER, TransformGizmo, TransformGizmoBundle, GIZMO_RENDER_LAYER,
}; };
#[derive(Component)] #[derive(Component)]
@@ -209,8 +209,6 @@ pub(super) fn on_rotation_start(
pub(super) fn on_rotation_end( pub(super) fn on_rotation_end(
_: Listener<Pointer<DragEnd>>, _: Listener<Pointer<DragEnd>>,
mut cmd: Commands, mut cmd: Commands,
r_xform_mode: Res<TransformMode>,
mut ev_rebuild_gizmo: EventWriter<RebuildGizmo>,
q_inited_components: Query<Entity, With<LastRotation>>, q_inited_components: Query<Entity, With<LastRotation>>,
) { ) {
info!("Rotation end"); info!("Rotation end");
@@ -222,10 +220,6 @@ pub(super) fn on_rotation_end(
.remove::<LastHitPoint>() .remove::<LastHitPoint>()
.remove::<LastRotation>(); .remove::<LastRotation>();
} }
if matches!(r_xform_mode.space, TransformSpace::World) {
ev_rebuild_gizmo.send(RebuildGizmo);
}
} }
pub(super) fn on_rotate( pub(super) fn on_rotate(