4847f7e3ad
Remove unnecessary calls to `iter()`/`iter_mut()`.
Mainly updates the use of queries in our code, docs, and examples.
```rust
// From
for _ in list.iter() {
for _ in list.iter_mut() {
// To
for _ in &list {
for _ in &mut list {
```
We already enable the pedantic lint [clippy::explicit_iter_loop](https://rust-lang.github.io/rust-clippy/stable/) inside of Bevy. However, this only warns for a few known types from the standard library.
## Note for reviewers
As you can see the additions and deletions are exactly equal.
Maybe give it a quick skim to check I didn't sneak in a crypto miner, but you don't have to torture yourself by reading every line.
I already experienced enough pain making this PR :)
Co-authored-by: devil-ira <justthecooldude@gmail.com>
96 lines
2.8 KiB
Rust
96 lines
2.8 KiB
Rust
//! This example illustrates how `FontAtlas`'s are populated.
|
|
//! Bevy uses `FontAtlas`'s under the hood to optimize text rendering.
|
|
|
|
use bevy::{prelude::*, text::FontAtlasSet};
|
|
|
|
fn main() {
|
|
App::new()
|
|
.init_resource::<State>()
|
|
.insert_resource(ClearColor(Color::BLACK))
|
|
.add_plugins(DefaultPlugins)
|
|
.add_startup_system(setup)
|
|
.add_system(text_update_system)
|
|
.add_system(atlas_render_system)
|
|
.run();
|
|
}
|
|
|
|
struct State {
|
|
atlas_count: u32,
|
|
handle: Handle<Font>,
|
|
timer: Timer,
|
|
}
|
|
|
|
impl Default for State {
|
|
fn default() -> Self {
|
|
Self {
|
|
atlas_count: 0,
|
|
handle: Handle::default(),
|
|
timer: Timer::from_seconds(0.05, true),
|
|
}
|
|
}
|
|
}
|
|
|
|
fn atlas_render_system(
|
|
mut commands: Commands,
|
|
mut state: ResMut<State>,
|
|
font_atlas_sets: Res<Assets<FontAtlasSet>>,
|
|
texture_atlases: Res<Assets<TextureAtlas>>,
|
|
) {
|
|
if let Some(set) = font_atlas_sets.get(&state.handle.as_weak::<FontAtlasSet>()) {
|
|
if let Some((_size, font_atlas)) = set.iter().next() {
|
|
let x_offset = state.atlas_count as f32;
|
|
if state.atlas_count == font_atlas.len() as u32 {
|
|
return;
|
|
}
|
|
let texture_atlas = texture_atlases
|
|
.get(&font_atlas[state.atlas_count as usize].texture_atlas)
|
|
.unwrap();
|
|
state.atlas_count += 1;
|
|
commands.spawn_bundle(ImageBundle {
|
|
image: texture_atlas.texture.clone().into(),
|
|
style: Style {
|
|
position_type: PositionType::Absolute,
|
|
position: UiRect {
|
|
top: Val::Px(0.0),
|
|
left: Val::Px(512.0 * x_offset),
|
|
..default()
|
|
},
|
|
..default()
|
|
},
|
|
..default()
|
|
});
|
|
}
|
|
}
|
|
}
|
|
|
|
fn text_update_system(mut state: ResMut<State>, time: Res<Time>, mut query: Query<&mut Text>) {
|
|
if state.timer.tick(time.delta()).finished() {
|
|
for mut text in &mut query {
|
|
let c = rand::random::<u8>() as char;
|
|
if !text.sections[0].value.contains(c) {
|
|
text.sections[0].value.push(c);
|
|
}
|
|
}
|
|
|
|
state.timer.reset();
|
|
}
|
|
}
|
|
|
|
fn setup(mut commands: Commands, asset_server: Res<AssetServer>, mut state: ResMut<State>) {
|
|
let font_handle = asset_server.load("fonts/FiraSans-Bold.ttf");
|
|
state.handle = font_handle.clone();
|
|
commands.spawn_bundle(Camera2dBundle::default());
|
|
commands.spawn_bundle(TextBundle {
|
|
text: Text::with_section(
|
|
"a",
|
|
TextStyle {
|
|
font: font_handle,
|
|
font_size: 60.0,
|
|
color: Color::YELLOW,
|
|
},
|
|
Default::default(),
|
|
),
|
|
..default()
|
|
});
|
|
}
|