mirror of
https://github.com/storytold/storyteller-bevy.git
synced 2026-10-28 08:58:07 +00:00
Merge with main
This commit is contained in:
@@ -79,35 +79,6 @@ fn sync_editor_selected(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn sync_editor_selected(
|
|
||||||
mut cmd: Commands,
|
|
||||||
q_new_selected: Query<Entity, (Added<Selected>, Without<space_editor::prelude::Selected>)>,
|
|
||||||
q_editor_selected: Query<Entity, With<space_editor::prelude::Selected>>,
|
|
||||||
q_selected: Query<Entity, With<Selected>>,
|
|
||||||
q_added_editor_selected: Query<
|
|
||||||
Entity,
|
|
||||||
(Without<Selected>, Added<space_editor::prelude::Selected>),
|
|
||||||
>,
|
|
||||||
) {
|
|
||||||
for ent in q_new_selected.iter() {
|
|
||||||
for ed_ent in q_editor_selected.iter() {
|
|
||||||
cmd.entity(ed_ent)
|
|
||||||
.remove::<space_editor::prelude::Selected>();
|
|
||||||
}
|
|
||||||
cmd.entity(ent).insert(space_editor::prelude::Selected);
|
|
||||||
}
|
|
||||||
|
|
||||||
for ent in q_added_editor_selected.iter() {
|
|
||||||
cmd.entity(ent).insert(Selected);
|
|
||||||
cmd.insert_resource(Selection(ent));
|
|
||||||
|
|
||||||
for ent in q_selected.iter() {
|
|
||||||
cmd.entity(ent).remove::<Selected>();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn tag_scene_elements(
|
fn tag_scene_elements(
|
||||||
mut cmd: Commands,
|
mut cmd: Commands,
|
||||||
q_scene_elements: Query<(Entity, &Children), (With<SceneElement>, Without<Selectable>)>,
|
q_scene_elements: Query<(Entity, &Children), (With<SceneElement>, Without<Selectable>)>,
|
||||||
|
|||||||
@@ -175,11 +175,6 @@ pub struct SceneData {
|
|||||||
pub scene_path: String,
|
pub scene_path: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Component)]
|
|
||||||
pub struct SceneData {
|
|
||||||
pub scene_path: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct SkeletalJoint(pub Color);
|
pub struct SkeletalJoint(pub Color);
|
||||||
|
|
||||||
#[derive(Component)]
|
#[derive(Component)]
|
||||||
|
|||||||
Reference in New Issue
Block a user