Build production-ready editor authoring workflows
CI / Format, lint, test, build (push) Waiting to run

This commit is contained in:
Rbanh committed 2026-07-11 12:41:04 -04:00
1 parent cc1fa6ea3b
commit 0553a85220
163 files changed
+34547 -1565

No files matched your search

+52 -4
View File
@@ -2,11 +2,12 @@ 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::*;
use shared::LevelObject;
use shared::{HydratedPrefabMember, LevelObject};
use transform_gizmo_bevy::prelude::GizmoTarget;
use crate::camera::EditorCamera;
use crate::infra::EditorOnly;
use crate::scene_io::ComposedSceneMember;
use crate::state::scene_tools_active;
use crate::state::EditorMode;
use crate::ui::helpers::ensure_player_spawn_for_edit;
@@ -382,7 +383,15 @@ fn sync_gizmo_targets(
mut selected: ResMut<SelectedEntity>,
mut commands: Commands,
targets: Query<(Entity, Option<&BrushElementGizmo>), With<GizmoTarget>>,
level_objects: Query<(), (With<LevelObject>, Without<EditorOnly>)>,
level_objects: Query<
(),
(
With<LevelObject>,
Without<EditorOnly>,
Without<HydratedPrefabMember>,
Without<ComposedSceneMember>,
),
>,
editor_only: Query<(), With<EditorOnly>>,
transforms: Query<(), With<Transform>>,
hierarchy: Option<Res<HierarchyPanelState>>,
@@ -407,11 +416,11 @@ fn sync_gizmo_targets(
if brush_element_gizmo.is_some() {
continue;
}
if !ui_state.selected_entities.contains(entity) {
if !ui_state.selected_entities.contains(entity) || !level_objects.contains(entity) {
commands.entity(entity).remove::<GizmoTarget>();
}
}
if let Some(entity) = ui_state.selected_entities.as_slice().first().copied() {
for entity in ui_state.selected_entities.iter() {
if level_objects.contains(entity)
&& transforms.contains(entity)
&& !targets.contains(entity)
@@ -423,3 +432,42 @@ fn sync_gizmo_targets(
}
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn multi_selection_receives_grouped_gizmo_targets() {
let mut app = App::new();
let first = app
.world_mut()
.spawn((LevelObject, Transform::default()))
.id();
let second = app
.world_mut()
.spawn((LevelObject, Transform::default()))
.id();
let mut ui_state = UiState::default_layout();
ui_state.selected_entities.select_replace(first);
ui_state.selected_entities.select_maybe_add(second, true);
app.insert_resource(ui_state)
.init_resource::<SelectedEntity>()
.init_resource::<ViewportDisplayMode>()
.init_resource::<BrushEditMode>()
.add_systems(Update, sync_gizmo_targets);
app.update();
assert!(app.world().get::<GizmoTarget>(first).is_some());
assert!(app.world().get::<GizmoTarget>(second).is_some());
app.world_mut()
.resource_mut::<UiState>()
.selected_entities
.select_replace(first);
app.update();
assert!(app.world().get::<GizmoTarget>(first).is_some());
assert!(app.world().get::<GizmoTarget>(second).is_none());
}
}