Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Corrected use of visibility to drive rendering on unsupported platforms #12607

Closed
wants to merge 3 commits into from
Closed

Corrected use of visibility to drive rendering on unsupported platforms #12607

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e6dcb3
corrected use of visibility to drive rendering on unsupported platforms
thebluefish Mar 21, 2024
18dd12a
formatting
thebluefish Mar 21, 2024
2c8610c
decoupled control flow and update
thebluefish Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 19 additions & 41 deletions crates/bevy_winit/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,8 @@ fn handle_winit_event(
let focused = windows.iter().any(|window| window.focused);
let mut should_update = match config.update_mode(focused) {
UpdateMode::Continuous => {
runner_state.redraw_requested
runner_state.wait_elapsed
|| runner_state.redraw_requested
|| runner_state.window_event_received
|| runner_state.device_event_received
}
Expand Down Expand Up @@ -387,29 +388,30 @@ fn handle_winit_event(
}

if should_update {
let visible = windows.iter().any(|window| window.visible);
// Attempt to update
let (_, winit_windows, _, _) = event_writer_system_state.get_mut(&mut app.world);
if visible && runner_state.active != ActiveState::WillSuspend {
if runner_state.active != ActiveState::WillSuspend {
for window in winit_windows.windows.values() {
window.request_redraw();
}
} else {
// there are no windows, or they are not visible.
// Winit won't send events on some platforms, so trigger an update manually.
run_app_update_if_should(
runner_state,
app,
focused_windows_state,
event_loop,
create_window,
app_exit_event_reader,
redraw_event_reader,
winit_events,
);
if runner_state.active != ActiveState::Suspended {
}

// Decide when to run the next update
let (config, windows) = focused_windows_state.get(&app.world);
let focused = windows.iter().any(|window| window.focused);
match config.update_mode(focused) {
UpdateMode::Continuous => {
event_loop.set_control_flow(ControlFlow::Poll);
}
UpdateMode::Reactive { wait } | UpdateMode::ReactiveLowPower { wait } => {
if let Some(next) = runner_state.last_update.checked_add(*wait) {
event_loop.set_control_flow(ControlFlow::WaitUntil(next));
} else {
event_loop.set_control_flow(ControlFlow::Wait);
}
}
}

}
}
Event::NewEvents(cause) => {
Expand Down Expand Up @@ -626,7 +628,6 @@ fn handle_winit_event(
run_app_update_if_should(
runner_state,
app,
focused_windows_state,
event_loop,
create_window,
app_exit_event_reader,
Expand Down Expand Up @@ -726,7 +727,6 @@ fn handle_winit_event(
fn run_app_update_if_should(
runner_state: &mut WinitAppRunnerState,
app: &mut App,
focused_windows_state: &mut SystemState<(Res<WinitSettings>, Query<&Window>)>,
event_loop: &EventLoopWindowTarget<UserEvent>,
create_window: &mut SystemState<CreateWindowParams<Added<Window>>>,
app_exit_event_reader: &mut ManualEventReader<AppExit>,
Expand Down Expand Up @@ -759,28 +759,6 @@ fn run_app_update_if_should(

app.update();

// decide when to run the next update
let (config, windows) = focused_windows_state.get(&app.world);
let focused = windows.iter().any(|window| window.focused);
match config.update_mode(focused) {
UpdateMode::Continuous => {
runner_state.redraw_requested = true;
event_loop.set_control_flow(ControlFlow::Wait);
}
UpdateMode::Reactive { wait } | UpdateMode::ReactiveLowPower { wait } => {
// TODO(bug): this is unexpected behavior.
// When Reactive, user expects bevy to actually wait that amount of time,
// and not potentially infinitely depending on plateform specifics (which this does)
// Need to verify the plateform specifics (whether this can occur in
// rare-but-possible cases) and replace this with a panic or a log warn!
if let Some(next) = runner_state.last_update.checked_add(*wait) {
event_loop.set_control_flow(ControlFlow::WaitUntil(next));
} else {
event_loop.set_control_flow(ControlFlow::Wait);
}
}
}

if let Some(app_redraw_events) = app.world.get_resource::<Events<RequestRedraw>>() {
if redraw_event_reader.read(app_redraw_events).last().is_some() {
runner_state.redraw_requested = true;
Expand Down