9f906fdc8b
# Objective
Creating UI elements is very boilerplate-y with lots of indentation.
This PR aims to reduce boilerplate around creating text elements.
## Changelog
* Renamed `Text::with_section` to `from_section`.
It no longer takes a `TextAlignment` as argument, as the vast majority of cases left it `Default::default()`.
* Added `Text::from_sections` which creates a `Text` from a list of `TextSections`.
Reduces line-count and reduces indentation by one level.
* Added `Text::with_alignment`.
A builder style method for setting the `TextAlignment` of a `Text`.
* Added `TextSection::new`.
Does not reduce line count, but reduces character count and made it easier to read. No more `.to_string()` calls!
* Added `TextSection::from_style` which creates an empty `TextSection` with a style.
No more empty strings! Reduces indentation.
* Added `TextAlignment::CENTER` and friends.
* Added methods to `TextBundle`. `from_section`, `from_sections`, `with_text_alignment` and `with_style`.
## Note for reviewers.
Because of the nature of these changes I recommend setting diff view to 'split'.
~~Look for the book icon~~ cog in the top-left of the Files changed tab.
Have fun reviewing ❤️
<sup> >:D </sup>
## Migration Guide
`Text::with_section` was renamed to `from_section` and no longer takes a `TextAlignment` as argument.
Use `with_alignment` to set the alignment instead.
Co-authored-by: devil-ira <justthecooldude@gmail.com>
92 lines
2.7 KiB
Rust
92 lines
2.7 KiB
Rust
//! How to use an external thread to run an infinite task and communicate with a channel.
|
|
|
|
use bevy::prelude::*;
|
|
// Using crossbeam_channel instead of std as std `Receiver` is `!Sync`
|
|
use crossbeam_channel::{bounded, Receiver};
|
|
use rand::Rng;
|
|
use std::time::{Duration, Instant};
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_event::<StreamEvent>()
|
|
.add_plugins(DefaultPlugins)
|
|
.add_startup_system(setup)
|
|
.add_system(read_stream)
|
|
.add_system(spawn_text)
|
|
.add_system(move_text)
|
|
.run();
|
|
}
|
|
|
|
#[derive(Deref)]
|
|
struct StreamReceiver(Receiver<u32>);
|
|
struct StreamEvent(u32);
|
|
|
|
#[derive(Deref)]
|
|
struct LoadedFont(Handle<Font>);
|
|
|
|
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
|
|
commands.spawn_bundle(Camera2dBundle::default());
|
|
|
|
let (tx, rx) = bounded::<u32>(10);
|
|
std::thread::spawn(move || loop {
|
|
// Everything here happens in another thread
|
|
// This is where you could connect to an external data source
|
|
let mut rng = rand::thread_rng();
|
|
let start_time = Instant::now();
|
|
let duration = Duration::from_secs_f32(rng.gen_range(0.0..0.2));
|
|
while start_time.elapsed() < duration {
|
|
// Spinning for 'duration', simulating doing hard work!
|
|
}
|
|
|
|
tx.send(rng.gen_range(0..2000)).unwrap();
|
|
});
|
|
|
|
commands.insert_resource(StreamReceiver(rx));
|
|
commands.insert_resource(LoadedFont(asset_server.load("fonts/FiraSans-Bold.ttf")));
|
|
}
|
|
|
|
// This system reads from the receiver and sends events to Bevy
|
|
fn read_stream(receiver: ResMut<StreamReceiver>, mut events: EventWriter<StreamEvent>) {
|
|
for from_stream in receiver.try_iter() {
|
|
events.send(StreamEvent(from_stream));
|
|
}
|
|
}
|
|
|
|
fn spawn_text(
|
|
mut commands: Commands,
|
|
mut reader: EventReader<StreamEvent>,
|
|
loaded_font: Res<LoadedFont>,
|
|
) {
|
|
let text_style = TextStyle {
|
|
font: loaded_font.clone(),
|
|
font_size: 20.0,
|
|
color: Color::WHITE,
|
|
};
|
|
|
|
for (per_frame, event) in reader.iter().enumerate() {
|
|
commands.spawn_bundle(Text2dBundle {
|
|
text: Text::from_section(event.0.to_string(), text_style.clone())
|
|
.with_alignment(TextAlignment::CENTER),
|
|
transform: Transform::from_xyz(
|
|
per_frame as f32 * 100.0 + rand::thread_rng().gen_range(-40.0..40.0),
|
|
300.0,
|
|
0.0,
|
|
),
|
|
..default()
|
|
});
|
|
}
|
|
}
|
|
|
|
fn move_text(
|
|
mut commands: Commands,
|
|
mut texts: Query<(Entity, &mut Transform), With<Text>>,
|
|
time: Res<Time>,
|
|
) {
|
|
for (entity, mut position) in &mut texts {
|
|
position.translation -= Vec3::new(0.0, 100.0 * time.delta_seconds(), 0.0);
|
|
if position.translation.y < -300.0 {
|
|
commands.entity(entity).despawn();
|
|
}
|
|
}
|
|
}
|