Add brush authoring schema
CI / Format, lint, test, build (push) Waiting to run

This commit is contained in:
Rbanh committed 2026-06-06 05:42:19 -04:00
1 parent cc6acb188d
commit 9f95ba3082
24 files changed
+891 -78

No files matched your search

+56 -44
View File
@@ -1,3 +1,4 @@
use bevy::ecs::system::SystemParam;
use bevy::picking::mesh_picking::ray_cast::{MeshRayCast, MeshRayCastSettings, RayCastVisibility};
use bevy::picking::pointer::{PointerAction, PointerInput, PointerInteraction};
use bevy::prelude::*;
@@ -36,6 +37,15 @@ pub struct ViewportPickStack {
pub struct EditorSelectionPlugin;
#[derive(SystemParam)]
struct PickTargetQueries<'w, 's> {
level_objects: Query<'w, 's, Entity, (With<LevelObject>, Without<EditorOnly>)>,
proxies: Query<'w, 's, &'static EditorVisualizerProxy>,
icon_proxies: Query<'w, 's, &'static ActorIconProxy>,
parents: Query<'w, 's, &'static ChildOf>,
editor_only: Query<'w, 's, (), With<EditorOnly>>,
}
impl Plugin for EditorSelectionPlugin {
fn build(&self, app: &mut App) {
app.init_resource::<SelectedEntity>()
@@ -88,9 +98,7 @@ fn handle_pick_events(
pointers: Query<&PointerInteraction>,
editor_cameras: Query<(&Camera, &GlobalTransform), With<EditorCamera>>,
mut mesh_ray_cast: MeshRayCast,
level_objects: Query<Entity, (With<LevelObject>, Without<EditorOnly>)>,
proxies: Query<&EditorVisualizerProxy>,
icon_proxies: Query<&ActorIconProxy>,
pick_targets: PickTargetQueries,
keys: Res<ButtonInput<KeyCode>>,
buttons: Res<ButtonInput<MouseButton>>,
display: Res<ViewportDisplayMode>,
@@ -132,9 +140,7 @@ fn handle_pick_events(
&mut pick_stack,
&editor_cameras,
&mut mesh_ray_cast,
&level_objects,
&proxies,
&icon_proxies,
&pick_targets,
pointer_pos,
additive,
);
@@ -152,9 +158,11 @@ fn handle_pick_events(
let mut picked = None;
for interaction in &pointers {
if let Some(entity) = interaction.as_slice().iter().find_map(|(entity, _hit)| {
pick_target_for_entity(*entity, &level_objects, &proxies, &icon_proxies)
}) {
if let Some(entity) = interaction
.as_slice()
.iter()
.find_map(|(entity, _hit)| pick_target_for_entity(*entity, &pick_targets))
{
picked = Some(entity);
break;
}
@@ -167,9 +175,7 @@ fn handle_pick_events(
let hits = collect_viewport_pick_hits(
&editor_cameras,
&mut mesh_ray_cast,
&level_objects,
&proxies,
&icon_proxies,
&pick_targets,
ui_state.viewport_rect,
pointer_pos,
);
@@ -231,18 +237,14 @@ fn apply_viewport_pick(
pick_stack: &mut ViewportPickStack,
editor_cameras: &Query<(&Camera, &GlobalTransform), With<EditorCamera>>,
mesh_ray_cast: &mut MeshRayCast,
level_objects: &Query<Entity, (With<LevelObject>, Without<EditorOnly>)>,
proxies: &Query<&EditorVisualizerProxy>,
icon_proxies: &Query<&ActorIconProxy>,
pick_targets: &PickTargetQueries,
pointer_pos: egui::Pos2,
additive: bool,
) {
let hits = collect_viewport_pick_hits(
editor_cameras,
mesh_ray_cast,
level_objects,
proxies,
icon_proxies,
pick_targets,
ui_state.viewport_rect,
pointer_pos,
);
@@ -277,9 +279,7 @@ fn apply_pick_result(
fn collect_viewport_pick_hits(
editor_cameras: &Query<(&Camera, &GlobalTransform), With<EditorCamera>>,
mesh_ray_cast: &mut MeshRayCast,
level_objects: &Query<Entity, (With<LevelObject>, Without<EditorOnly>)>,
proxies: &Query<&EditorVisualizerProxy>,
icon_proxies: &Query<&ActorIconProxy>,
pick_targets: &PickTargetQueries,
scene_rect: egui::Rect,
pointer_pos: egui::Pos2,
) -> Vec<Entity> {
@@ -298,15 +298,7 @@ fn collect_viewport_pick_hits(
let Some(ray) = scene_view_ray(camera, transform, pointer_pos, scene_rect) else {
return Vec::new();
};
let filter = |entity: Entity| {
level_objects.contains(entity)
|| proxies
.get(entity)
.is_ok_and(|proxy| level_objects.contains(proxy.target) || proxy.target != entity)
|| icon_proxies
.get(entity)
.is_ok_and(|proxy| level_objects.contains(proxy.target))
};
let filter = |entity: Entity| pick_target_for_entity(entity, pick_targets).is_some();
let settings = MeshRayCastSettings::default()
.with_visibility(RayCastVisibility::Any)
.with_filter(&filter)
@@ -317,13 +309,11 @@ fn collect_viewport_pick_hits(
let mut ordered = Vec::new();
for icon_priority in [true, false] {
for (entity, _) in hits {
let is_icon = icon_proxies.get(*entity).is_ok();
let is_icon = pick_targets.icon_proxies.get(*entity).is_ok();
if is_icon != icon_priority {
continue;
}
let Some(target) =
pick_target_for_entity(*entity, level_objects, proxies, icon_proxies)
else {
let Some(target) = pick_target_for_entity(*entity, pick_targets) else {
continue;
};
if seen.insert(target) {
@@ -334,19 +324,41 @@ fn collect_viewport_pick_hits(
ordered
}
fn pick_target_for_entity(
entity: Entity,
level_objects: &Query<Entity, (With<LevelObject>, Without<EditorOnly>)>,
proxies: &Query<&EditorVisualizerProxy>,
icon_proxies: &Query<&ActorIconProxy>,
) -> Option<Entity> {
if let Ok(proxy) = icon_proxies.get(entity) {
return level_objects.contains(proxy.target).then_some(proxy.target);
fn pick_target_for_entity(entity: Entity, pick_targets: &PickTargetQueries) -> Option<Entity> {
if let Ok(proxy) = pick_targets.icon_proxies.get(entity) {
return pick_targets
.level_objects
.contains(proxy.target)
.then_some(proxy.target);
}
if let Ok(proxy) = proxies.get(entity) {
if let Ok(proxy) = pick_targets.proxies.get(entity) {
return Some(proxy.target);
}
level_objects.contains(entity).then_some(entity)
if pick_targets.editor_only.contains(entity) {
return None;
}
if pick_targets.level_objects.contains(entity) {
return Some(entity);
}
let mut current = pick_targets
.parents
.get(entity)
.ok()
.map(|parent| parent.parent());
while let Some(parent) = current {
if pick_targets.editor_only.contains(parent) {
return None;
}
if pick_targets.level_objects.contains(parent) {
return Some(parent);
}
current = pick_targets
.parents
.get(parent)
.ok()
.map(|parent| parent.parent());
}
None
}
fn sync_gizmo_targets(