This commit is contained in:
1 parent
19c4d017dc
commit
2fa64106c8
12 files changed
+747
-174
No files matched your search
@@ -92,22 +92,26 @@ fn handle_pick_events(
|
||||
proxies: Query<&EditorVisualizerProxy>,
|
||||
icon_proxies: Query<&ActorIconProxy>,
|
||||
keys: Res<ButtonInput<KeyCode>>,
|
||||
buttons: Res<ButtonInput<MouseButton>>,
|
||||
display: Res<ViewportDisplayMode>,
|
||||
gizmo_targets: Query<&GizmoTarget>,
|
||||
hierarchy: Option<Res<HierarchyPanelState>>,
|
||||
) {
|
||||
if keys.just_pressed(KeyCode::Escape) {
|
||||
) -> Result {
|
||||
if ui_state.pointer_in_viewport
|
||||
&& !buttons.any_pressed([MouseButton::Right, MouseButton::Middle])
|
||||
&& keys.just_pressed(KeyCode::Escape)
|
||||
{
|
||||
ui_state.selected_entities.clear();
|
||||
selected.0 = None;
|
||||
pick_stack.entities.clear();
|
||||
pick_stack.index = 0;
|
||||
pick_stack.anchor = None;
|
||||
return;
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
if display.clean_game_view {
|
||||
viewport_click.0 = None;
|
||||
return;
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
if gizmo_targets
|
||||
@@ -115,7 +119,7 @@ fn handle_pick_events(
|
||||
.any(|g| GizmoTarget::is_focused(g) || GizmoTarget::is_active(g))
|
||||
{
|
||||
viewport_click.0 = None;
|
||||
return;
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
let additive = keys.any_pressed([KeyCode::ControlLeft, KeyCode::ShiftLeft]);
|
||||
@@ -134,11 +138,11 @@ fn handle_pick_events(
|
||||
pointer_pos,
|
||||
additive,
|
||||
);
|
||||
return;
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
if !ui_state.pointer_in_viewport {
|
||||
return;
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
for event in click_events.read() {
|
||||
@@ -187,6 +191,7 @@ fn handle_pick_events(
|
||||
additive,
|
||||
);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn cycle_overlapping_viewport_pick(
|
||||
@@ -194,25 +199,29 @@ fn cycle_overlapping_viewport_pick(
|
||||
mut selected: ResMut<SelectedEntity>,
|
||||
mut pick_stack: ResMut<ViewportPickStack>,
|
||||
keys: Res<ButtonInput<KeyCode>>,
|
||||
buttons: Res<ButtonInput<MouseButton>>,
|
||||
display: Res<ViewportDisplayMode>,
|
||||
) {
|
||||
) -> Result {
|
||||
if display.clean_game_view {
|
||||
return;
|
||||
return Ok(());
|
||||
}
|
||||
if !ui_state.pointer_in_viewport
|
||||
|| buttons.any_pressed([MouseButton::Right, MouseButton::Middle])
|
||||
{
|
||||
return Ok(());
|
||||
}
|
||||
if !keys.just_pressed(KeyCode::Tab) || pick_stack.entities.len() < 2 {
|
||||
return;
|
||||
return Ok(());
|
||||
}
|
||||
if keys.any_pressed([KeyCode::ControlLeft, KeyCode::ShiftLeft]) {
|
||||
return;
|
||||
}
|
||||
if !ui_state.pointer_in_viewport {
|
||||
return;
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
pick_stack.index = (pick_stack.index + 1) % pick_stack.entities.len();
|
||||
let entity = pick_stack.entities[pick_stack.index];
|
||||
ui_state.selected_entities.select_replace(entity);
|
||||
selected.0 = Some(entity);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn apply_viewport_pick(
|
||||
|
||||
Reference in new issue
Block a user