This commit is contained in:
1 parent
d1a56f77cc
commit
0e7aed40f1
21 files changed
+1253
-19
No files matched your search
@@ -23,6 +23,7 @@ use crate::visualizers::EditorVisualizerProxy;
|
||||
use bevy_egui::egui;
|
||||
|
||||
use crate::viewport::material_drop::{MaterialDropSet, MaterialDropState};
|
||||
use crate::viewport::physics_placement::PhysicsPlacementState;
|
||||
use crate::viewport::scene_view_ray;
|
||||
use crate::viewport::terrain_paint::TerrainPaintState;
|
||||
use crate::viewport::terrain_sculpt::TerrainSculptState;
|
||||
@@ -54,6 +55,7 @@ struct PickTargetQueries<'w, 's> {
|
||||
material_drop: Option<Res<'w, MaterialDropState>>,
|
||||
terrain_sculpt: Res<'w, TerrainSculptState>,
|
||||
terrain_paint: Res<'w, TerrainPaintState>,
|
||||
physics_placement: Option<Res<'w, PhysicsPlacementState>>,
|
||||
viewport_ui: Res<'w, ViewportUiState>,
|
||||
}
|
||||
|
||||
@@ -129,7 +131,13 @@ fn handle_pick_events(
|
||||
for _ in click_events.read() {}
|
||||
return Ok(());
|
||||
}
|
||||
if pick_targets.terrain_sculpt.active || pick_targets.terrain_paint.active {
|
||||
if pick_targets.terrain_sculpt.active
|
||||
|| pick_targets.terrain_paint.active
|
||||
|| pick_targets
|
||||
.physics_placement
|
||||
.as_deref()
|
||||
.is_some_and(PhysicsPlacementState::active)
|
||||
{
|
||||
viewport_click.0 = None;
|
||||
for _ in click_events.read() {}
|
||||
return Ok(());
|
||||
@@ -447,6 +455,7 @@ fn sync_gizmo_targets(
|
||||
brush_mode: Res<BrushEditMode>,
|
||||
terrain_sculpt: Res<TerrainSculptState>,
|
||||
terrain_paint: Res<TerrainPaintState>,
|
||||
physics_placement: Option<Res<PhysicsPlacementState>>,
|
||||
) {
|
||||
ui_state
|
||||
.selected_entities
|
||||
@@ -457,6 +466,9 @@ fn sync_gizmo_targets(
|
||||
|| brush_mode.is_element_mode()
|
||||
|| terrain_sculpt.active
|
||||
|| terrain_paint.active
|
||||
|| physics_placement
|
||||
.as_deref()
|
||||
.is_some_and(PhysicsPlacementState::active)
|
||||
{
|
||||
for (entity, brush_element_gizmo) in &targets {
|
||||
if brush_element_gizmo.is_none() {
|
||||
|
||||
Reference in new issue
Block a user