forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use updated window size in bevymark example (#3335)

Browse Source 
# Objective

Have the bird spawning/collision systems in bevymark use the proper window size, instead of the size set in WindowDescriptor which isn't updated when the window is resized.

## Solution

Use the Windows resource to grab the width/height from the primary window. This is consistent with the other examples.
This commit is contained in:
Tobenaii 2021-12-18 00:29:36 +00:00
parent f30f833406
commit d3749a98f8
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
examples/tools/bevymark.rs
View File

@ -50,7 +50,7 @@ struct BirdTexture(Handle<Image>);
fn setup( fn setup(
mut commands: Commands, mut commands: Commands,
window: Res<WindowDescriptor>, windows: Res<Windows>,
mut counter: ResMut<BevyCounter>, mut counter: ResMut<BevyCounter>,
asset_server: Res<AssetServer>, asset_server: Res<AssetServer>,
) { ) {
@ -61,7 +61,7 @@ fn setup(
{ {
spawn_birds( spawn_birds(
&mut commands, &mut commands,
&window, &windows,
&mut counter, &mut counter,
initial_count, initial_count,
texture.clone_weak(), texture.clone_weak(),
@ -126,7 +126,7 @@ fn mouse_handler(
mut commands: Commands, mut commands: Commands,
time: Res<Time>, time: Res<Time>,
mouse_button_input: Res<Input<MouseButton>>, mouse_button_input: Res<Input<MouseButton>>,
window: Res<WindowDescriptor>, windows: Res<Windows>,
bird_texture: Res<BirdTexture>, bird_texture: Res<BirdTexture>,
mut counter: ResMut<BevyCounter>, mut counter: ResMut<BevyCounter>,
) { ) {
@ -138,7 +138,7 @@ fn mouse_handler(
let spawn_count = (BIRDS_PER_SECOND as f64 * time.delta_seconds_f64()) as u128; let spawn_count = (BIRDS_PER_SECOND as f64 * time.delta_seconds_f64()) as u128;
spawn_birds( spawn_birds(
&mut commands, &mut commands,
&window, &windows,
&mut counter, &mut counter,
spawn_count, spawn_count,
bird_texture.0.clone(), bird_texture.0.clone(),
@ -148,13 +148,14 @@ fn mouse_handler(
fn spawn_birds( fn spawn_birds(
commands: &mut Commands, commands: &mut Commands,
window: &WindowDescriptor, windows: &Windows,
counter: &mut BevyCounter, counter: &mut BevyCounter,
spawn_count: u128, spawn_count: u128,
texture: Handle<Image>, texture: Handle<Image>,
) { ) {
let bird_x = (window.width / -2.) + HALF_BIRD_SIZE; let window = windows.get_primary().unwrap();
let bird_y = (window.height / 2.) - HALF_BIRD_SIZE; let bird_x = (window.width() as f32 / -2.) + HALF_BIRD_SIZE;
let bird_y = (window.height() as f32 / 2.) - HALF_BIRD_SIZE;
for count in 0..spawn_count { for count in 0..spawn_count {
let bird_z = (counter.count + count) as f32 * 0.00001; let bird_z = (counter.count + count) as f32 * 0.00001;
commands commands
@ -190,9 +191,10 @@ fn movement_system(time: Res<Time>, mut bird_query: Query<(&mut Bird, &mut Trans
} }
} }
fn collision_system(window: Res<WindowDescriptor>, mut bird_query: Query<(&mut Bird, &Transform)>) { fn collision_system(windows: Res<Windows>, mut bird_query: Query<(&mut Bird, &Transform)>) {
let half_width = window.width as f32 * 0.5; let window = windows.get_primary().unwrap();
let half_height = window.height as f32 * 0.5; let half_width = window.width() as f32 * 0.5;
let half_height = window.height() as f32 * 0.5;
for (mut bird, transform) in bird_query.iter_mut() { for (mut bird, transform) in bird_query.iter_mut() {
let x_vel = bird.velocity.x; let x_vel = bird.velocity.x;