mirror of
https://github.com/bevyengine/bevy
synced 2024-11-23 13:13:49 +00:00
989fb8a78d
# Objective - Closes #335. - Related #4285. - Part of the splitting process of #3503. ## Solution - Move `Rect` to `bevy_ui` and rename it to `UiRect`. ## Reasons - `Rect` is only used in `bevy_ui` and therefore calling it `UiRect` makes the intent clearer. - We have two types that are called `Rect` currently and it's missleading (see `bevy_sprite::Rect` and #335). - Discussion in #3503. ## Changelog ### Changed - The `Rect` type got moved from `bevy_math` to `bevy_ui` and renamed to `UiRect`. ## Migration Guide - The `Rect` type got renamed to `UiRect`. To migrate you just have to change every occurrence of `Rect` to `UiRect`. Co-authored-by: KDecay <KDecayMusic@protonmail.com>
205 lines
6.6 KiB
Rust
205 lines
6.6 KiB
Rust
use bevy::{
|
|
diagnostic::{Diagnostics, FrameTimeDiagnosticsPlugin},
|
|
prelude::*,
|
|
window::PresentMode,
|
|
};
|
|
|
|
/// This example is for debugging text layout
|
|
fn main() {
|
|
App::new()
|
|
.insert_resource(WindowDescriptor {
|
|
present_mode: PresentMode::Immediate,
|
|
..default()
|
|
})
|
|
.add_plugins(DefaultPlugins)
|
|
.add_plugin(FrameTimeDiagnosticsPlugin)
|
|
.add_startup_system(infotext_system)
|
|
.add_system(change_text_system)
|
|
.run();
|
|
}
|
|
|
|
#[derive(Component)]
|
|
struct TextChanges;
|
|
|
|
fn infotext_system(mut commands: Commands, asset_server: Res<AssetServer>) {
|
|
let font = asset_server.load("fonts/FiraSans-Bold.ttf");
|
|
commands.spawn_bundle(UiCameraBundle::default());
|
|
commands.spawn_bundle(TextBundle {
|
|
style: Style {
|
|
align_self: AlignSelf::FlexEnd,
|
|
position_type: PositionType::Absolute,
|
|
position: UiRect {
|
|
top: Val::Px(5.0),
|
|
left: Val::Px(15.0),
|
|
..default()
|
|
},
|
|
..default()
|
|
},
|
|
text: Text::with_section(
|
|
"This is\ntext with\nline breaks\nin the top left",
|
|
TextStyle {
|
|
font: font.clone(),
|
|
font_size: 50.0,
|
|
color: Color::WHITE,
|
|
},
|
|
Default::default(),
|
|
),
|
|
..default()
|
|
});
|
|
commands.spawn_bundle(TextBundle {
|
|
style: Style {
|
|
align_self: AlignSelf::FlexEnd,
|
|
position_type: PositionType::Absolute,
|
|
position: UiRect {
|
|
top: Val::Px(5.0),
|
|
right: Val::Px(15.0),
|
|
..default()
|
|
},
|
|
max_size: Size {
|
|
width: Val::Px(400.),
|
|
height: Val::Undefined,
|
|
},
|
|
..default()
|
|
},
|
|
text: Text::with_section(
|
|
"This text is very long, has a limited width, is centred, is positioned in the top right and is also coloured pink.",
|
|
TextStyle {
|
|
font: font.clone(),
|
|
font_size: 50.0,
|
|
color: Color::rgb(0.8, 0.2, 0.7),
|
|
},
|
|
TextAlignment {
|
|
horizontal: HorizontalAlign::Center,
|
|
vertical: VerticalAlign::Center,
|
|
},
|
|
),
|
|
..default()
|
|
});
|
|
commands
|
|
.spawn_bundle(TextBundle {
|
|
style: Style {
|
|
align_self: AlignSelf::FlexEnd,
|
|
position_type: PositionType::Absolute,
|
|
position: UiRect {
|
|
bottom: Val::Px(5.0),
|
|
right: Val::Px(15.0),
|
|
..default()
|
|
},
|
|
..default()
|
|
},
|
|
text: Text {
|
|
sections: vec![
|
|
TextSection {
|
|
value: "This text changes in the bottom right".to_string(),
|
|
style: TextStyle {
|
|
font: font.clone(),
|
|
font_size: 30.0,
|
|
color: Color::WHITE,
|
|
},
|
|
},
|
|
TextSection {
|
|
value: "\nThis text changes in the bottom right - ".to_string(),
|
|
style: TextStyle {
|
|
font: font.clone(),
|
|
font_size: 30.0,
|
|
color: Color::RED,
|
|
},
|
|
},
|
|
TextSection {
|
|
value: "".to_string(),
|
|
style: TextStyle {
|
|
font: font.clone(),
|
|
font_size: 30.0,
|
|
color: Color::ORANGE_RED,
|
|
},
|
|
},
|
|
TextSection {
|
|
value: " fps, ".to_string(),
|
|
style: TextStyle {
|
|
font: font.clone(),
|
|
font_size: 30.0,
|
|
color: Color::YELLOW,
|
|
},
|
|
},
|
|
TextSection {
|
|
value: "".to_string(),
|
|
style: TextStyle {
|
|
font: font.clone(),
|
|
font_size: 30.0,
|
|
color: Color::GREEN,
|
|
},
|
|
},
|
|
TextSection {
|
|
value: " ms/frame".to_string(),
|
|
style: TextStyle {
|
|
font: font.clone(),
|
|
font_size: 30.0,
|
|
color: Color::BLUE,
|
|
},
|
|
},
|
|
],
|
|
alignment: Default::default(),
|
|
},
|
|
..default()
|
|
})
|
|
.insert(TextChanges);
|
|
commands.spawn_bundle(TextBundle {
|
|
style: Style {
|
|
align_self: AlignSelf::FlexEnd,
|
|
position_type: PositionType::Absolute,
|
|
position: UiRect {
|
|
bottom: Val::Px(5.0),
|
|
left: Val::Px(15.0),
|
|
..default()
|
|
},
|
|
size: Size {
|
|
width: Val::Px(200.0),
|
|
..default()
|
|
},
|
|
..default()
|
|
},
|
|
text: Text::with_section(
|
|
"This\ntext has\nline breaks and also a set width in the bottom left".to_string(),
|
|
TextStyle {
|
|
font,
|
|
font_size: 50.0,
|
|
color: Color::WHITE,
|
|
},
|
|
Default::default(),
|
|
),
|
|
..default()
|
|
});
|
|
}
|
|
|
|
fn change_text_system(
|
|
time: Res<Time>,
|
|
diagnostics: Res<Diagnostics>,
|
|
mut query: Query<&mut Text, With<TextChanges>>,
|
|
) {
|
|
for mut text in query.iter_mut() {
|
|
let mut fps = 0.0;
|
|
if let Some(fps_diagnostic) = diagnostics.get(FrameTimeDiagnosticsPlugin::FPS) {
|
|
if let Some(fps_avg) = fps_diagnostic.average() {
|
|
fps = fps_avg;
|
|
}
|
|
}
|
|
|
|
let mut frame_time = time.delta_seconds_f64();
|
|
if let Some(frame_time_diagnostic) = diagnostics.get(FrameTimeDiagnosticsPlugin::FRAME_TIME)
|
|
{
|
|
if let Some(frame_time_avg) = frame_time_diagnostic.average() {
|
|
frame_time = frame_time_avg;
|
|
}
|
|
}
|
|
|
|
text.sections[0].value = format!(
|
|
"This text changes in the bottom right - {:.1} fps, {:.3} ms/frame",
|
|
fps,
|
|
frame_time * 1000.0,
|
|
);
|
|
|
|
text.sections[2].value = format!("{:.1}", fps);
|
|
|
|
text.sections[4].value = format!("{:.3}", frame_time * 1000.0);
|
|
}
|
|
}
|