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

Fix picking for bundles and gltf entities (#103)

Browse Source
This commit is contained in:
rewin
2024-03-23 00:35:38 +03:00
committed by GitHub
parent 87ecf2d7e4
commit 53f0a165e3
4 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
studio/src/interaction/selection.rs
+11 -8
View File
@@ -53,7 +53,8 @@ impl Plugin for SelectionPlugin {
}
}
#[derive(Component, Clone, Copy)]
#[derive(Component, Clone, Copy, Reflect, Default)]
#[reflect(Component, Default)]
pub struct Selectable;
#[derive(Resource, Deref, DerefMut, Debug)]
@@ -101,17 +102,19 @@ fn propagate_space_editor_to_studio(
fn tag_scene_elements(
mut cmd: Commands,
q_scene_elements: Query<(Entity, &Children), (With<SceneElement>, Without<Selectable>)>,
q_scene_elements: Query<(Entity, Option<&Children>), (With<SceneElement>, Without<Selectable>)>,
q_primitives: Query<&Handle<Mesh>>,
) {
for (ent, children) in q_scene_elements.iter() {
cmd.entity(ent).insert(Selectable);
cmd.entity(ent).insert(Selectable).insert(PickableBundle::default());
for &ent_child in children
.iter()
.filter(|child| q_primitives.contains(**child))
{
cmd.entity(ent_child).insert(PickableBundle::default());
if let Some(children) = children {
for &ent_child in children
.iter()
.filter(|child| q_primitives.contains(**child))
{
cmd.entity(ent_child).insert(PickableBundle::default());
}
}
}
}