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

Finish refactor gizmo

Browse Source
This commit is contained in:
rewin
2024-01-11 22:16:13 +03:00
parent ce36fff9cd
commit 91ab46639a
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
studio/src/interaction/gizmos/combo.rs
+4 -4
View File
@@ -39,7 +39,7 @@ pub(super) fn spawn_combo_translation_rotation_gizmo(
On::<Pointer<Out>>::run(on_gizmo_element_unhover),
On::<Pointer<DragStart>>::run(on_translation_start),
On::<Pointer<Drag>>::run(on_translate),
On::<Pointer<DragEnd>>::target_commands_mut(on_translation_end),
On::<Pointer<DragEnd>>::run(on_translation_end),
));
// Rotate X
@@ -78,7 +78,7 @@ pub(super) fn spawn_combo_translation_rotation_gizmo(
On::<Pointer<Out>>::run(on_gizmo_element_unhover),
On::<Pointer<DragStart>>::run(on_translation_start),
On::<Pointer<Drag>>::run(on_translate),
On::<Pointer<DragEnd>>::target_commands_mut(on_translation_end),
On::<Pointer<DragEnd>>::run(on_translation_end),
));
// Rotate Y
@@ -117,7 +117,7 @@ pub(super) fn spawn_combo_translation_rotation_gizmo(
On::<Pointer<Out>>::run(on_gizmo_element_unhover),
On::<Pointer<DragStart>>::run(on_translation_start),
On::<Pointer<Drag>>::run(on_translate),
On::<Pointer<DragEnd>>::target_commands_mut(on_translation_end),
On::<Pointer<DragEnd>>::run(on_translation_end),
));
// Rotate Z
@@ -156,7 +156,7 @@ pub(super) fn spawn_combo_translation_rotation_gizmo(
On::<Pointer<Out>>::run(on_gizmo_element_unhover),
On::<Pointer<DragStart>>::run(on_translation_start),
On::<Pointer<Drag>>::run(on_translate),
On::<Pointer<DragEnd>>::target_commands_mut(on_translation_end),
On::<Pointer<DragEnd>>::run(on_translation_end),
));
});
}
studio/src/interaction/gizmos/translation.rs
+7 -4
View File
@@ -36,7 +36,7 @@ pub(super) fn spawn_translation_gizmo(
On::<Pointer<Out>>::run(on_gizmo_element_unhover),
On::<Pointer<DragStart>>::run(on_translation_start),
On::<Pointer<Drag>>::run(on_translate),
On::<Pointer<DragEnd>>::target_commands_mut(on_translation_end),
On::<Pointer<DragEnd>>::run(on_translation_end),
))
.with_children(|cmd| {
use super::{CIRC_45, ROT_X, ROT_Y, ROT_Z};
@@ -215,10 +215,13 @@ pub(super) fn on_translation_start(
}
pub(super) fn on_translation_end(
_: &ListenerInput<Pointer<DragEnd>>,
cmd: &mut EntityCommands<'_, '_, '_>,
_: Listener<Pointer<DragEnd>>,
mut cmd: Commands,
q_initial_transforms: Query<Entity, With<InitialTransform>>,
) {
cmd.remove::<InitialTransform>();
for ent in q_initial_transforms.iter() {
cmd.entity(ent).remove::<InitialTransform>();
}
}
pub(super) fn on_translate(