2023-03-18 22:58:17 +00:00
|
|
|
//! This example shows what happens when there is a lot of buttons on screen.
|
|
|
|
//!
|
|
|
|
//! To start the demo without text run
|
|
|
|
//! `cargo run --example many_buttons --release no-text`
|
2023-04-17 17:49:11 +00:00
|
|
|
//!
|
|
|
|
//| To do a full layout update each frame run
|
|
|
|
//! `cargo run --example many_buttons --release recompute-layout`
|
|
|
|
//!
|
|
|
|
//! To recompute all text each frame run
|
|
|
|
//! `cargo run --example many_buttons --release recompute-text`
|
2023-03-18 22:58:17 +00:00
|
|
|
|
2022-07-21 14:39:03 +00:00
|
|
|
use bevy::{
|
|
|
|
diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin},
|
|
|
|
prelude::*,
|
2023-01-19 00:38:28 +00:00
|
|
|
window::{PresentMode, WindowPlugin},
|
2022-07-21 14:39:03 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
// For a total of 110 * 110 = 12100 buttons with text
|
|
|
|
const ROW_COLUMN_COUNT: usize = 110;
|
|
|
|
const FONT_SIZE: f32 = 7.0;
|
|
|
|
|
|
|
|
/// This example shows what happens when there is a lot of buttons on screen.
|
|
|
|
fn main() {
|
2023-04-17 17:49:11 +00:00
|
|
|
let mut app = App::new();
|
|
|
|
|
|
|
|
app.add_plugins(DefaultPlugins.set(WindowPlugin {
|
|
|
|
primary_window: Some(Window {
|
|
|
|
present_mode: PresentMode::Immediate,
|
2022-07-21 14:39:03 +00:00
|
|
|
..default()
|
2023-04-17 17:49:11 +00:00
|
|
|
}),
|
|
|
|
..default()
|
|
|
|
}))
|
|
|
|
.add_plugin(FrameTimeDiagnosticsPlugin::default())
|
|
|
|
.add_plugin(LogDiagnosticsPlugin::default())
|
|
|
|
.add_systems(Startup, setup)
|
|
|
|
.add_systems(Update, button_system);
|
|
|
|
|
|
|
|
if std::env::args().any(|arg| arg == "recompute-layout") {
|
|
|
|
app.add_systems(Update, |mut ui_scale: ResMut<UiScale>| {
|
|
|
|
ui_scale.set_changed();
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
if std::env::args().any(|arg| arg == "recompute-text") {
|
|
|
|
app.add_systems(Update, |mut text_query: Query<&mut Text>| {
|
|
|
|
text_query.for_each_mut(|mut text| text.set_changed());
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
app.run();
|
2022-07-21 14:39:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Component)]
|
2022-09-25 00:39:17 +00:00
|
|
|
struct IdleColor(BackgroundColor);
|
2022-07-21 14:39:03 +00:00
|
|
|
|
|
|
|
fn button_system(
|
2022-09-25 00:39:17 +00:00
|
|
|
mut interaction_query: Query<
|
|
|
|
(&Interaction, &mut BackgroundColor, &IdleColor),
|
|
|
|
Changed<Interaction>,
|
|
|
|
>,
|
2022-07-21 14:39:03 +00:00
|
|
|
) {
|
|
|
|
for (interaction, mut material, IdleColor(idle_color)) in interaction_query.iter_mut() {
|
|
|
|
if matches!(interaction, Interaction::Hovered) {
|
|
|
|
*material = Color::ORANGE_RED.into();
|
|
|
|
} else {
|
|
|
|
*material = *idle_color;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-04-21 22:30:18 +00:00
|
|
|
fn setup(mut commands: Commands) {
|
2023-04-24 14:35:03 +00:00
|
|
|
warn!(include_str!("warning_string.txt"));
|
|
|
|
|
2022-07-21 14:39:03 +00:00
|
|
|
let count = ROW_COLUMN_COUNT;
|
|
|
|
let count_f = count as f32;
|
|
|
|
let as_rainbow = |i: usize| Color::hsl((i as f32 / count_f) * 360.0, 0.9, 0.8);
|
Spawn now takes a Bundle (#6054)
# Objective
Now that we can consolidate Bundles and Components under a single insert (thanks to #2975 and #6039), almost 100% of world spawns now look like `world.spawn().insert((Some, Tuple, Here))`. Spawning an entity without any components is an extremely uncommon pattern, so it makes sense to give spawn the "first class" ergonomic api. This consolidated api should be made consistent across all spawn apis (such as World and Commands).
## Solution
All `spawn` apis (`World::spawn`, `Commands:;spawn`, `ChildBuilder::spawn`, and `WorldChildBuilder::spawn`) now accept a bundle as input:
```rust
// before:
commands
.spawn()
.insert((A, B, C));
world
.spawn()
.insert((A, B, C);
// after
commands.spawn((A, B, C));
world.spawn((A, B, C));
```
All existing instances of `spawn_bundle` have been deprecated in favor of the new `spawn` api. A new `spawn_empty` has been added, replacing the old `spawn` api.
By allowing `world.spawn(some_bundle)` to replace `world.spawn().insert(some_bundle)`, this opened the door to removing the initial entity allocation in the "empty" archetype / table done in `spawn()` (and subsequent move to the actual archetype in `.insert(some_bundle)`).
This improves spawn performance by over 10%:
![image](https://user-images.githubusercontent.com/2694663/191627587-4ab2f949-4ccd-4231-80eb-80dd4d9ad6b9.png)
To take this measurement, I added a new `world_spawn` benchmark.
Unfortunately, optimizing `Commands::spawn` is slightly less trivial, as Commands expose the Entity id of spawned entities prior to actually spawning. Doing the optimization would (naively) require assurances that the `spawn(some_bundle)` command is applied before all other commands involving the entity (which would not necessarily be true, if memory serves). Optimizing `Commands::spawn` this way does feel possible, but it will require careful thought (and maybe some additional checks), which deserves its own PR. For now, it has the same performance characteristics of the current `Commands::spawn_bundle` on main.
**Note that 99% of this PR is simple renames and refactors. The only code that needs careful scrutiny is the new `World::spawn()` impl, which is relatively straightforward, but it has some new unsafe code (which re-uses battle tested BundlerSpawner code path).**
---
## Changelog
- All `spawn` apis (`World::spawn`, `Commands:;spawn`, `ChildBuilder::spawn`, and `WorldChildBuilder::spawn`) now accept a bundle as input
- All instances of `spawn_bundle` have been deprecated in favor of the new `spawn` api
- World and Commands now have `spawn_empty()`, which is equivalent to the old `spawn()` behavior.
## Migration Guide
```rust
// Old (0.8):
commands
.spawn()
.insert_bundle((A, B, C));
// New (0.9)
commands.spawn((A, B, C));
// Old (0.8):
commands.spawn_bundle((A, B, C));
// New (0.9)
commands.spawn((A, B, C));
// Old (0.8):
let entity = commands.spawn().id();
// New (0.9)
let entity = commands.spawn_empty().id();
// Old (0.8)
let entity = world.spawn().id();
// New (0.9)
let entity = world.spawn_empty();
```
2022-09-23 19:55:54 +00:00
|
|
|
commands.spawn(Camera2dBundle::default());
|
2022-07-21 14:39:03 +00:00
|
|
|
commands
|
Spawn now takes a Bundle (#6054)
# Objective
Now that we can consolidate Bundles and Components under a single insert (thanks to #2975 and #6039), almost 100% of world spawns now look like `world.spawn().insert((Some, Tuple, Here))`. Spawning an entity without any components is an extremely uncommon pattern, so it makes sense to give spawn the "first class" ergonomic api. This consolidated api should be made consistent across all spawn apis (such as World and Commands).
## Solution
All `spawn` apis (`World::spawn`, `Commands:;spawn`, `ChildBuilder::spawn`, and `WorldChildBuilder::spawn`) now accept a bundle as input:
```rust
// before:
commands
.spawn()
.insert((A, B, C));
world
.spawn()
.insert((A, B, C);
// after
commands.spawn((A, B, C));
world.spawn((A, B, C));
```
All existing instances of `spawn_bundle` have been deprecated in favor of the new `spawn` api. A new `spawn_empty` has been added, replacing the old `spawn` api.
By allowing `world.spawn(some_bundle)` to replace `world.spawn().insert(some_bundle)`, this opened the door to removing the initial entity allocation in the "empty" archetype / table done in `spawn()` (and subsequent move to the actual archetype in `.insert(some_bundle)`).
This improves spawn performance by over 10%:
![image](https://user-images.githubusercontent.com/2694663/191627587-4ab2f949-4ccd-4231-80eb-80dd4d9ad6b9.png)
To take this measurement, I added a new `world_spawn` benchmark.
Unfortunately, optimizing `Commands::spawn` is slightly less trivial, as Commands expose the Entity id of spawned entities prior to actually spawning. Doing the optimization would (naively) require assurances that the `spawn(some_bundle)` command is applied before all other commands involving the entity (which would not necessarily be true, if memory serves). Optimizing `Commands::spawn` this way does feel possible, but it will require careful thought (and maybe some additional checks), which deserves its own PR. For now, it has the same performance characteristics of the current `Commands::spawn_bundle` on main.
**Note that 99% of this PR is simple renames and refactors. The only code that needs careful scrutiny is the new `World::spawn()` impl, which is relatively straightforward, but it has some new unsafe code (which re-uses battle tested BundlerSpawner code path).**
---
## Changelog
- All `spawn` apis (`World::spawn`, `Commands:;spawn`, `ChildBuilder::spawn`, and `WorldChildBuilder::spawn`) now accept a bundle as input
- All instances of `spawn_bundle` have been deprecated in favor of the new `spawn` api
- World and Commands now have `spawn_empty()`, which is equivalent to the old `spawn()` behavior.
## Migration Guide
```rust
// Old (0.8):
commands
.spawn()
.insert_bundle((A, B, C));
// New (0.9)
commands.spawn((A, B, C));
// Old (0.8):
commands.spawn_bundle((A, B, C));
// New (0.9)
commands.spawn((A, B, C));
// Old (0.8):
let entity = commands.spawn().id();
// New (0.9)
let entity = commands.spawn_empty().id();
// Old (0.8)
let entity = world.spawn().id();
// New (0.9)
let entity = world.spawn_empty();
```
2022-09-23 19:55:54 +00:00
|
|
|
.spawn(NodeBundle {
|
2022-07-21 14:39:03 +00:00
|
|
|
style: Style {
|
|
|
|
size: Size::new(Val::Percent(100.0), Val::Percent(100.0)),
|
|
|
|
..default()
|
|
|
|
},
|
|
|
|
..default()
|
|
|
|
})
|
|
|
|
.with_children(|commands| {
|
2023-04-17 17:49:11 +00:00
|
|
|
let spawn_text = std::env::args().all(|arg| arg != "no-text");
|
2022-07-21 14:39:03 +00:00
|
|
|
for i in 0..count {
|
|
|
|
for j in 0..count {
|
|
|
|
let color = as_rainbow(j % i.max(1)).into();
|
2023-04-21 22:30:18 +00:00
|
|
|
spawn_button(commands, color, count_f, i, j, spawn_text);
|
2022-07-21 14:39:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
2023-03-18 22:58:17 +00:00
|
|
|
|
2022-07-21 14:39:03 +00:00
|
|
|
fn spawn_button(
|
|
|
|
commands: &mut ChildBuilder,
|
2022-09-25 00:39:17 +00:00
|
|
|
color: BackgroundColor,
|
2022-07-21 14:39:03 +00:00
|
|
|
total: f32,
|
|
|
|
i: usize,
|
|
|
|
j: usize,
|
2023-03-18 22:58:17 +00:00
|
|
|
spawn_text: bool,
|
2022-07-21 14:39:03 +00:00
|
|
|
) {
|
|
|
|
let width = 90.0 / total;
|
2023-03-18 22:58:17 +00:00
|
|
|
let mut builder = commands.spawn((
|
|
|
|
ButtonBundle {
|
|
|
|
style: Style {
|
|
|
|
size: Size::new(Val::Percent(width), Val::Percent(width)),
|
|
|
|
bottom: Val::Percent(100.0 / total * i as f32),
|
|
|
|
left: Val::Percent(100.0 / total * j as f32),
|
|
|
|
align_items: AlignItems::Center,
|
|
|
|
position_type: PositionType::Absolute,
|
2022-07-21 14:39:03 +00:00
|
|
|
..default()
|
|
|
|
},
|
2023-03-18 22:58:17 +00:00
|
|
|
background_color: color,
|
|
|
|
..default()
|
|
|
|
},
|
|
|
|
IdleColor(color),
|
|
|
|
));
|
|
|
|
|
|
|
|
if spawn_text {
|
|
|
|
builder.with_children(|commands| {
|
Spawn now takes a Bundle (#6054)
# Objective
Now that we can consolidate Bundles and Components under a single insert (thanks to #2975 and #6039), almost 100% of world spawns now look like `world.spawn().insert((Some, Tuple, Here))`. Spawning an entity without any components is an extremely uncommon pattern, so it makes sense to give spawn the "first class" ergonomic api. This consolidated api should be made consistent across all spawn apis (such as World and Commands).
## Solution
All `spawn` apis (`World::spawn`, `Commands:;spawn`, `ChildBuilder::spawn`, and `WorldChildBuilder::spawn`) now accept a bundle as input:
```rust
// before:
commands
.spawn()
.insert((A, B, C));
world
.spawn()
.insert((A, B, C);
// after
commands.spawn((A, B, C));
world.spawn((A, B, C));
```
All existing instances of `spawn_bundle` have been deprecated in favor of the new `spawn` api. A new `spawn_empty` has been added, replacing the old `spawn` api.
By allowing `world.spawn(some_bundle)` to replace `world.spawn().insert(some_bundle)`, this opened the door to removing the initial entity allocation in the "empty" archetype / table done in `spawn()` (and subsequent move to the actual archetype in `.insert(some_bundle)`).
This improves spawn performance by over 10%:
![image](https://user-images.githubusercontent.com/2694663/191627587-4ab2f949-4ccd-4231-80eb-80dd4d9ad6b9.png)
To take this measurement, I added a new `world_spawn` benchmark.
Unfortunately, optimizing `Commands::spawn` is slightly less trivial, as Commands expose the Entity id of spawned entities prior to actually spawning. Doing the optimization would (naively) require assurances that the `spawn(some_bundle)` command is applied before all other commands involving the entity (which would not necessarily be true, if memory serves). Optimizing `Commands::spawn` this way does feel possible, but it will require careful thought (and maybe some additional checks), which deserves its own PR. For now, it has the same performance characteristics of the current `Commands::spawn_bundle` on main.
**Note that 99% of this PR is simple renames and refactors. The only code that needs careful scrutiny is the new `World::spawn()` impl, which is relatively straightforward, but it has some new unsafe code (which re-uses battle tested BundlerSpawner code path).**
---
## Changelog
- All `spawn` apis (`World::spawn`, `Commands:;spawn`, `ChildBuilder::spawn`, and `WorldChildBuilder::spawn`) now accept a bundle as input
- All instances of `spawn_bundle` have been deprecated in favor of the new `spawn` api
- World and Commands now have `spawn_empty()`, which is equivalent to the old `spawn()` behavior.
## Migration Guide
```rust
// Old (0.8):
commands
.spawn()
.insert_bundle((A, B, C));
// New (0.9)
commands.spawn((A, B, C));
// Old (0.8):
commands.spawn_bundle((A, B, C));
// New (0.9)
commands.spawn((A, B, C));
// Old (0.8):
let entity = commands.spawn().id();
// New (0.9)
let entity = commands.spawn_empty().id();
// Old (0.8)
let entity = world.spawn().id();
// New (0.9)
let entity = world.spawn_empty();
```
2022-09-23 19:55:54 +00:00
|
|
|
commands.spawn(TextBundle::from_section(
|
2022-07-21 14:39:03 +00:00
|
|
|
format!("{i}, {j}"),
|
|
|
|
TextStyle {
|
|
|
|
font_size: FONT_SIZE,
|
|
|
|
color: Color::rgb(0.2, 0.2, 0.2),
|
2023-04-21 22:30:18 +00:00
|
|
|
..default()
|
2022-07-21 14:39:03 +00:00
|
|
|
},
|
|
|
|
));
|
Spawn now takes a Bundle (#6054)
# Objective
Now that we can consolidate Bundles and Components under a single insert (thanks to #2975 and #6039), almost 100% of world spawns now look like `world.spawn().insert((Some, Tuple, Here))`. Spawning an entity without any components is an extremely uncommon pattern, so it makes sense to give spawn the "first class" ergonomic api. This consolidated api should be made consistent across all spawn apis (such as World and Commands).
## Solution
All `spawn` apis (`World::spawn`, `Commands:;spawn`, `ChildBuilder::spawn`, and `WorldChildBuilder::spawn`) now accept a bundle as input:
```rust
// before:
commands
.spawn()
.insert((A, B, C));
world
.spawn()
.insert((A, B, C);
// after
commands.spawn((A, B, C));
world.spawn((A, B, C));
```
All existing instances of `spawn_bundle` have been deprecated in favor of the new `spawn` api. A new `spawn_empty` has been added, replacing the old `spawn` api.
By allowing `world.spawn(some_bundle)` to replace `world.spawn().insert(some_bundle)`, this opened the door to removing the initial entity allocation in the "empty" archetype / table done in `spawn()` (and subsequent move to the actual archetype in `.insert(some_bundle)`).
This improves spawn performance by over 10%:
![image](https://user-images.githubusercontent.com/2694663/191627587-4ab2f949-4ccd-4231-80eb-80dd4d9ad6b9.png)
To take this measurement, I added a new `world_spawn` benchmark.
Unfortunately, optimizing `Commands::spawn` is slightly less trivial, as Commands expose the Entity id of spawned entities prior to actually spawning. Doing the optimization would (naively) require assurances that the `spawn(some_bundle)` command is applied before all other commands involving the entity (which would not necessarily be true, if memory serves). Optimizing `Commands::spawn` this way does feel possible, but it will require careful thought (and maybe some additional checks), which deserves its own PR. For now, it has the same performance characteristics of the current `Commands::spawn_bundle` on main.
**Note that 99% of this PR is simple renames and refactors. The only code that needs careful scrutiny is the new `World::spawn()` impl, which is relatively straightforward, but it has some new unsafe code (which re-uses battle tested BundlerSpawner code path).**
---
## Changelog
- All `spawn` apis (`World::spawn`, `Commands:;spawn`, `ChildBuilder::spawn`, and `WorldChildBuilder::spawn`) now accept a bundle as input
- All instances of `spawn_bundle` have been deprecated in favor of the new `spawn` api
- World and Commands now have `spawn_empty()`, which is equivalent to the old `spawn()` behavior.
## Migration Guide
```rust
// Old (0.8):
commands
.spawn()
.insert_bundle((A, B, C));
// New (0.9)
commands.spawn((A, B, C));
// Old (0.8):
commands.spawn_bundle((A, B, C));
// New (0.9)
commands.spawn((A, B, C));
// Old (0.8):
let entity = commands.spawn().id();
// New (0.9)
let entity = commands.spawn_empty().id();
// Old (0.8)
let entity = world.spawn().id();
// New (0.9)
let entity = world.spawn_empty();
```
2022-09-23 19:55:54 +00:00
|
|
|
});
|
2023-03-18 22:58:17 +00:00
|
|
|
}
|
2022-07-21 14:39:03 +00:00
|
|
|
}
|