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

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/Cargo.toml
+1 -1
View File
@@ -32,7 +32,7 @@ web-sys = { version = "0.3.65", optional = true, features = [
"HtmlElement", "HtmlElement",
"Window", "Window",
] } ] }
space_editor = {git = "https://github.com/rewin123/space_editor", rev = "f039601b6d286a5f9e3b09521623000d5bf3eb84"} space_editor = {git = "https://github.com/rewin123/space_editor", rev = "c972e586114aabf4e44a8c82d29ad7045dd350d1"}
[features] [features]
wasm = [ wasm = [
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<Out>>::run(on_gizmo_element_unhover),
On::<Pointer<DragStart>>::run(on_translation_start), On::<Pointer<DragStart>>::run(on_translation_start),
On::<Pointer<Drag>>::run(on_translate), On::<Pointer<Drag>>::run(on_translate),
On::<Pointer<DragEnd>>::target_commands_mut(on_translation_end), On::<Pointer<DragEnd>>::run(on_translation_end),
)); ));
// Rotate X // Rotate X
@@ -78,7 +78,7 @@ pub(super) fn spawn_combo_translation_rotation_gizmo(
On::<Pointer<Out>>::run(on_gizmo_element_unhover), On::<Pointer<Out>>::run(on_gizmo_element_unhover),
On::<Pointer<DragStart>>::run(on_translation_start), On::<Pointer<DragStart>>::run(on_translation_start),
On::<Pointer<Drag>>::run(on_translate), On::<Pointer<Drag>>::run(on_translate),
On::<Pointer<DragEnd>>::target_commands_mut(on_translation_end), On::<Pointer<DragEnd>>::run(on_translation_end),
)); ));
// Rotate Y // Rotate Y
@@ -117,7 +117,7 @@ pub(super) fn spawn_combo_translation_rotation_gizmo(
On::<Pointer<Out>>::run(on_gizmo_element_unhover), On::<Pointer<Out>>::run(on_gizmo_element_unhover),
On::<Pointer<DragStart>>::run(on_translation_start), On::<Pointer<DragStart>>::run(on_translation_start),
On::<Pointer<Drag>>::run(on_translate), On::<Pointer<Drag>>::run(on_translate),
On::<Pointer<DragEnd>>::target_commands_mut(on_translation_end), On::<Pointer<DragEnd>>::run(on_translation_end),
)); ));
// Rotate Z // Rotate Z
@@ -156,7 +156,7 @@ pub(super) fn spawn_combo_translation_rotation_gizmo(
On::<Pointer<Out>>::run(on_gizmo_element_unhover), On::<Pointer<Out>>::run(on_gizmo_element_unhover),
On::<Pointer<DragStart>>::run(on_translation_start), On::<Pointer<DragStart>>::run(on_translation_start),
On::<Pointer<Drag>>::run(on_translate), 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<Out>>::run(on_gizmo_element_unhover),
On::<Pointer<DragStart>>::run(on_translation_start), On::<Pointer<DragStart>>::run(on_translation_start),
On::<Pointer<Drag>>::run(on_translate), 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| { .with_children(|cmd| {
use super::{CIRC_45, ROT_X, ROT_Y, ROT_Z}; 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( pub(super) fn on_translation_end(
_: &ListenerInput<Pointer<DragEnd>>, _: Listener<Pointer<DragEnd>>,
cmd: &mut EntityCommands<'_, '_, '_>, 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( pub(super) fn on_translate(
studio/src/scene.rs
+3 -2
View File
@@ -13,7 +13,7 @@ use bevy::{
scene::InstanceId, scene::InstanceId,
}; };
use space_editor::prelude::PrefabMarker; use space_editor::prelude::{PrefabMarker, space_undo::OneFrameUndoIgnore};
#[cfg(feature = "wasm")] #[cfg(feature = "wasm")]
use wasm_bindgen::prelude::wasm_bindgen; use wasm_bindgen::prelude::wasm_bindgen;
@@ -208,7 +208,8 @@ fn spawn_next_scene(
SceneRoot, SceneRoot,
SceneElement, SceneElement,
SpatialBundle::default(), SpatialBundle::default(),
PrefabMarker PrefabMarker,
OneFrameUndoIgnore::default() //To prevert undo try to register add event
)) ))
.id(); .id();