015f2c69ca
# Objective Continue improving the user experience of our UI Node API in the direction specified by [Bevy's Next Generation Scene / UI System](https://github.com/bevyengine/bevy/discussions/14437) ## Solution As specified in the document above, merge `Style` fields into `Node`, and move "computed Node fields" into `ComputedNode` (I chose this name over something like `ComputedNodeLayout` because it currently contains more than just layout info. If we want to break this up / rename these concepts, lets do that in a separate PR). `Style` has been removed. This accomplishes a number of goals: ## Ergonomics wins Specifying both `Node` and `Style` is now no longer required for non-default styles Before: ```rust commands.spawn(( Node::default(), Style { width: Val::Px(100.), ..default() }, )); ``` After: ```rust commands.spawn(Node { width: Val::Px(100.), ..default() }); ``` ## Conceptual clarity `Style` was never a comprehensive "style sheet". It only defined "core" style properties that all `Nodes` shared. Any "styled property" that couldn't fit that mold had to be in a separate component. A "real" style system would style properties _across_ components (`Node`, `Button`, etc). We have plans to build a true style system (see the doc linked above). By moving the `Style` fields to `Node`, we fully embrace `Node` as the driving concept and remove the "style system" confusion. ## Next Steps * Consider identifying and splitting out "style properties that aren't core to Node". This should not happen for Bevy 0.15. --- ## Migration Guide Move any fields set on `Style` into `Node` and replace all `Style` component usage with `Node`. Before: ```rust commands.spawn(( Node::default(), Style { width: Val::Px(100.), ..default() }, )); ``` After: ```rust commands.spawn(Node { width: Val::Px(100.), ..default() }); ``` For any usage of the "computed node properties" that used to live on `Node`, use `ComputedNode` instead: Before: ```rust fn system(nodes: Query<&Node>) { for node in &nodes { let computed_size = node.size(); } } ``` After: ```rust fn system(computed_nodes: Query<&ComputedNode>) { for computed_node in &computed_nodes { let computed_size = computed_node.size(); } } ```
88 lines
2.5 KiB
Rust
88 lines
2.5 KiB
Rust
//! Simple text rendering benchmark.
|
|
//!
|
|
//! Creates a text block with a single span containing `100_000` glyphs,
|
|
//! and renders it with the UI in a white color and with Text2d in a red color.
|
|
//!
|
|
//! To recompute all text each frame run
|
|
//! `cargo run --example many_glyphs --release recompute-text`
|
|
use bevy::{
|
|
color::palettes::basic::RED,
|
|
diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin},
|
|
prelude::*,
|
|
text::{LineBreak, TextBounds},
|
|
window::{PresentMode, WindowResolution},
|
|
winit::{UpdateMode, WinitSettings},
|
|
};
|
|
|
|
fn main() {
|
|
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(),
|
|
))
|
|
.insert_resource(WinitSettings {
|
|
focused_mode: UpdateMode::Continuous,
|
|
unfocused_mode: UpdateMode::Continuous,
|
|
})
|
|
.add_systems(Startup, setup);
|
|
|
|
if std::env::args().any(|arg| arg == "recompute-text") {
|
|
app.add_systems(Update, force_text_recomputation);
|
|
}
|
|
|
|
app.run();
|
|
}
|
|
|
|
fn setup(mut commands: Commands) {
|
|
warn!(include_str!("warning_string.txt"));
|
|
|
|
commands.spawn(Camera2d);
|
|
let text_string = "0123456789".repeat(10_000);
|
|
let text_font = TextFont {
|
|
font_size: 4.,
|
|
..Default::default()
|
|
};
|
|
let text_block = TextLayout {
|
|
justify: JustifyText::Left,
|
|
linebreak: LineBreak::AnyCharacter,
|
|
};
|
|
|
|
commands
|
|
.spawn(Node {
|
|
width: Val::Percent(100.),
|
|
align_items: AlignItems::Center,
|
|
justify_content: JustifyContent::Center,
|
|
..default()
|
|
})
|
|
.with_children(|commands| {
|
|
commands
|
|
.spawn(Node {
|
|
width: Val::Px(1000.),
|
|
..Default::default()
|
|
})
|
|
.with_child((Text(text_string.clone()), text_font.clone(), text_block));
|
|
});
|
|
|
|
commands.spawn((
|
|
Text2d::new(text_string),
|
|
TextColor(RED.into()),
|
|
bevy::sprite::Anchor::Center,
|
|
TextBounds::new_horizontal(1000.),
|
|
text_block,
|
|
));
|
|
}
|
|
|
|
fn force_text_recomputation(mut text_query: Query<&mut TextLayout>) {
|
|
for mut block in &mut text_query {
|
|
block.set_changed();
|
|
}
|
|
}
|