mirror of
https://github.com/bevyengine/bevy
synced 2024-11-22 20:53:53 +00:00
2148518758
# Objective After #6547, `Query::for_each` has been capable of automatic vectorization on certain queries, which is seeing a notable (>50% CPU time improvements) for iteration. However, `Query::for_each` isn't idiomatic Rust, and lacks the flexibility of iterator combinators. Ideally, `Query::iter` and friends should be able to achieve the same results. However, this does seem to blocked upstream (rust-lang/rust#104914) by Rust's loop optimizations. ## Solution This is an intermediate solution and refactor. This moves the `Query::for_each` implementation onto the `Iterator::fold` implementation for `QueryIter` instead. This should result in the same automatic vectorization optimization on all `Iterator` functions that internally use fold, including `Iterator::for_each`, `Iterator::count`, etc. With this, it should close the gap between the two completely. Internally, this PR changes `Query::for_each` to use `query.iter().for_each(..)` instead of the duplicated implementation. Separately, the duplicate implementations of internal iteration (i.e. `Query::par_for_each`) now use portions of the current `Query::for_each` implementation factored out into their own functions. This also massively cleans up our internal fragmentation of internal iteration options, deduplicating the iteration code used in `for_each` and `par_iter().for_each()`. --- ## Changelog Changed: `Query::for_each`, `Query::for_each_mut`, `Query::for_each`, and `Query::for_each_mut` have been moved to `QueryIter`'s `Iterator::for_each` implementation, and still retains their performance improvements over normal iteration. These APIs are deprecated in 0.13 and will be removed in 0.14. --------- Co-authored-by: JoJoJet <21144246+JoJoJet@users.noreply.github.com> Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
263 lines
7.9 KiB
Rust
263 lines
7.9 KiB
Rust
/// General UI benchmark that stress tests layouting, text, interaction and rendering
|
|
use argh::FromArgs;
|
|
use bevy::{
|
|
diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin},
|
|
prelude::*,
|
|
window::{PresentMode, WindowPlugin, WindowResolution},
|
|
};
|
|
|
|
const FONT_SIZE: f32 = 7.0;
|
|
|
|
#[derive(FromArgs, Resource)]
|
|
/// `many_buttons` general UI benchmark that stress tests layouting, text, interaction and rendering
|
|
struct Args {
|
|
/// whether to add text to each button
|
|
#[argh(switch)]
|
|
no_text: bool,
|
|
|
|
/// whether to add borders to each button
|
|
#[argh(switch)]
|
|
no_borders: bool,
|
|
|
|
/// whether to perform a full relayout each frame
|
|
#[argh(switch)]
|
|
relayout: bool,
|
|
|
|
/// whether to recompute all text each frame
|
|
#[argh(switch)]
|
|
recompute_text: bool,
|
|
|
|
/// how many buttons per row and column of the grid.
|
|
#[argh(option, default = "110")]
|
|
buttons: usize,
|
|
|
|
/// give every nth button an image
|
|
#[argh(option, default = "4")]
|
|
image_freq: usize,
|
|
|
|
/// use the grid layout model
|
|
#[argh(switch)]
|
|
grid: bool,
|
|
}
|
|
|
|
/// This example shows what happens when there is a lot of buttons on screen.
|
|
fn main() {
|
|
let args: Args = argh::from_env();
|
|
let mut app = App::new();
|
|
|
|
app.add_plugins((
|
|
DefaultPlugins.set(WindowPlugin {
|
|
primary_window: Some(Window {
|
|
present_mode: PresentMode::AutoNoVsync,
|
|
resolution: WindowResolution::new(1920.0, 1080.0).with_scale_factor_override(1.0),
|
|
..default()
|
|
}),
|
|
..default()
|
|
}),
|
|
FrameTimeDiagnosticsPlugin,
|
|
LogDiagnosticsPlugin::default(),
|
|
))
|
|
.add_systems(Update, button_system);
|
|
|
|
if args.grid {
|
|
app.add_systems(Startup, setup_grid);
|
|
} else {
|
|
app.add_systems(Startup, setup_flex);
|
|
}
|
|
|
|
if args.relayout {
|
|
app.add_systems(Update, |mut style_query: Query<&mut Style>| {
|
|
style_query
|
|
.iter_mut()
|
|
.for_each(|mut style| style.set_changed());
|
|
});
|
|
}
|
|
|
|
if args.recompute_text {
|
|
app.add_systems(Update, |mut text_query: Query<&mut Text>| {
|
|
text_query
|
|
.iter_mut()
|
|
.for_each(|mut text| text.set_changed());
|
|
});
|
|
}
|
|
|
|
app.insert_resource(args).run();
|
|
}
|
|
|
|
#[derive(Component)]
|
|
struct IdleColor(BackgroundColor);
|
|
|
|
fn button_system(
|
|
mut interaction_query: Query<
|
|
(&Interaction, &mut BackgroundColor, &IdleColor),
|
|
Changed<Interaction>,
|
|
>,
|
|
) {
|
|
for (interaction, mut button_color, IdleColor(idle_color)) in interaction_query.iter_mut() {
|
|
*button_color = match interaction {
|
|
Interaction::Hovered => Color::ORANGE_RED.into(),
|
|
_ => *idle_color,
|
|
};
|
|
}
|
|
}
|
|
|
|
fn setup_flex(mut commands: Commands, asset_server: Res<AssetServer>, args: Res<Args>) {
|
|
warn!(include_str!("warning_string.txt"));
|
|
let image = if 0 < args.image_freq {
|
|
Some(asset_server.load("branding/icon.png"))
|
|
} else {
|
|
None
|
|
};
|
|
|
|
let buttons_f = args.buttons as f32;
|
|
let border = if args.no_borders {
|
|
UiRect::ZERO
|
|
} else {
|
|
UiRect::all(Val::VMin(0.05 * 90. / buttons_f))
|
|
};
|
|
|
|
let as_rainbow = |i: usize| Color::hsl((i as f32 / buttons_f) * 360.0, 0.9, 0.8);
|
|
commands.spawn(Camera2dBundle::default());
|
|
commands
|
|
.spawn(NodeBundle {
|
|
style: Style {
|
|
flex_direction: FlexDirection::Column,
|
|
justify_content: JustifyContent::Center,
|
|
align_items: AlignItems::Center,
|
|
width: Val::Percent(100.),
|
|
height: Val::Percent(100.),
|
|
..default()
|
|
},
|
|
..default()
|
|
})
|
|
.with_children(|commands| {
|
|
for column in 0..args.buttons {
|
|
commands
|
|
.spawn(NodeBundle::default())
|
|
.with_children(|commands| {
|
|
for row in 0..args.buttons {
|
|
let color = as_rainbow(row % column.max(1)).into();
|
|
let border_color = Color::WHITE.with_a(0.5).into();
|
|
spawn_button(
|
|
commands,
|
|
color,
|
|
buttons_f,
|
|
column,
|
|
row,
|
|
!args.no_text,
|
|
border,
|
|
border_color,
|
|
image
|
|
.as_ref()
|
|
.filter(|_| (column + row) % args.image_freq == 0)
|
|
.cloned(),
|
|
);
|
|
}
|
|
});
|
|
}
|
|
});
|
|
}
|
|
|
|
fn setup_grid(mut commands: Commands, asset_server: Res<AssetServer>, args: Res<Args>) {
|
|
warn!(include_str!("warning_string.txt"));
|
|
let image = if 0 < args.image_freq {
|
|
Some(asset_server.load("branding/icon.png"))
|
|
} else {
|
|
None
|
|
};
|
|
|
|
let buttons_f = args.buttons as f32;
|
|
let border = if args.no_borders {
|
|
UiRect::ZERO
|
|
} else {
|
|
UiRect::all(Val::VMin(0.05 * 90. / buttons_f))
|
|
};
|
|
|
|
let as_rainbow = |i: usize| Color::hsl((i as f32 / buttons_f) * 360.0, 0.9, 0.8);
|
|
commands.spawn(Camera2dBundle::default());
|
|
commands
|
|
.spawn(NodeBundle {
|
|
style: Style {
|
|
display: Display::Grid,
|
|
width: Val::Percent(100.),
|
|
height: Val::Percent(100.0),
|
|
grid_template_columns: RepeatedGridTrack::flex(args.buttons as u16, 1.0),
|
|
grid_template_rows: RepeatedGridTrack::flex(args.buttons as u16, 1.0),
|
|
..default()
|
|
},
|
|
..default()
|
|
})
|
|
.with_children(|commands| {
|
|
for column in 0..args.buttons {
|
|
for row in 0..args.buttons {
|
|
let color = as_rainbow(row % column.max(1)).into();
|
|
let border_color = Color::WHITE.with_a(0.5).into();
|
|
spawn_button(
|
|
commands,
|
|
color,
|
|
buttons_f,
|
|
column,
|
|
row,
|
|
!args.no_text,
|
|
border,
|
|
border_color,
|
|
image
|
|
.as_ref()
|
|
.filter(|_| (column + row) % args.image_freq == 0)
|
|
.cloned(),
|
|
);
|
|
}
|
|
}
|
|
});
|
|
}
|
|
|
|
#[allow(clippy::too_many_arguments)]
|
|
fn spawn_button(
|
|
commands: &mut ChildBuilder,
|
|
background_color: BackgroundColor,
|
|
buttons: f32,
|
|
column: usize,
|
|
row: usize,
|
|
spawn_text: bool,
|
|
border: UiRect,
|
|
border_color: BorderColor,
|
|
image: Option<Handle<Image>>,
|
|
) {
|
|
let width = Val::Vw(90.0 / buttons);
|
|
let height = Val::Vh(90.0 / buttons);
|
|
let margin = UiRect::axes(width * 0.05, height * 0.05);
|
|
let mut builder = commands.spawn((
|
|
ButtonBundle {
|
|
style: Style {
|
|
width,
|
|
height,
|
|
margin,
|
|
align_items: AlignItems::Center,
|
|
justify_content: JustifyContent::Center,
|
|
border,
|
|
..default()
|
|
},
|
|
background_color,
|
|
border_color,
|
|
..default()
|
|
},
|
|
IdleColor(background_color),
|
|
));
|
|
|
|
if let Some(image) = image {
|
|
builder.insert(UiImage::new(image));
|
|
}
|
|
|
|
if spawn_text {
|
|
builder.with_children(|parent| {
|
|
parent.spawn(TextBundle::from_section(
|
|
format!("{column}, {row}"),
|
|
TextStyle {
|
|
font_size: FONT_SIZE,
|
|
color: Color::rgb(0.2, 0.2, 0.2),
|
|
..default()
|
|
},
|
|
));
|
|
});
|
|
}
|
|
}
|