mirror of
https://github.com/bevyengine/bevy
synced 2024-11-22 12:43:34 +00:00
01aedc8431
# 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(); ```
172 lines
3.9 KiB
Rust
172 lines
3.9 KiB
Rust
use bevy::{ecs::event::Events, prelude::*};
|
|
|
|
#[derive(Component, Default)]
|
|
struct Enemy {
|
|
hit_points: u32,
|
|
score_value: u32,
|
|
}
|
|
|
|
struct EnemyDied(u32);
|
|
|
|
#[derive(Resource)]
|
|
struct Score(u32);
|
|
|
|
fn update_score(mut dead_enemies: EventReader<EnemyDied>, mut score: ResMut<Score>) {
|
|
for value in dead_enemies.iter() {
|
|
score.0 += value.0;
|
|
}
|
|
}
|
|
|
|
fn despawn_dead_enemies(
|
|
mut commands: Commands,
|
|
mut dead_enemies: EventWriter<EnemyDied>,
|
|
enemies: Query<(Entity, &Enemy)>,
|
|
) {
|
|
for (entity, enemy) in &enemies {
|
|
if enemy.hit_points == 0 {
|
|
commands.entity(entity).despawn_recursive();
|
|
dead_enemies.send(EnemyDied(enemy.score_value));
|
|
}
|
|
}
|
|
}
|
|
|
|
fn hurt_enemies(mut enemies: Query<&mut Enemy>) {
|
|
for mut enemy in &mut enemies {
|
|
enemy.hit_points -= 1;
|
|
}
|
|
}
|
|
|
|
fn spawn_enemy(mut commands: Commands, keyboard_input: Res<Input<KeyCode>>) {
|
|
if keyboard_input.just_pressed(KeyCode::Space) {
|
|
commands.spawn(Enemy {
|
|
hit_points: 5,
|
|
score_value: 3,
|
|
});
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn did_hurt_enemy() {
|
|
// Setup app
|
|
let mut app = App::new();
|
|
|
|
// Add Score resource
|
|
app.insert_resource(Score(0));
|
|
|
|
// Add `EnemyDied` event
|
|
app.add_event::<EnemyDied>();
|
|
|
|
// Add our two systems
|
|
app.add_system(hurt_enemies.before(despawn_dead_enemies));
|
|
app.add_system(despawn_dead_enemies);
|
|
|
|
// Setup test entities
|
|
let enemy_id = app
|
|
.world
|
|
.spawn(Enemy {
|
|
hit_points: 5,
|
|
score_value: 3,
|
|
})
|
|
.id();
|
|
|
|
// Run systems
|
|
app.update();
|
|
|
|
// Check resulting changes
|
|
assert!(app.world.get::<Enemy>(enemy_id).is_some());
|
|
assert_eq!(app.world.get::<Enemy>(enemy_id).unwrap().hit_points, 4);
|
|
}
|
|
|
|
#[test]
|
|
fn did_despawn_enemy() {
|
|
// Setup app
|
|
let mut app = App::new();
|
|
|
|
// Add Score resource
|
|
app.insert_resource(Score(0));
|
|
|
|
// Add `EnemyDied` event
|
|
app.add_event::<EnemyDied>();
|
|
|
|
// Add our two systems
|
|
app.add_system(hurt_enemies.before(despawn_dead_enemies));
|
|
app.add_system(despawn_dead_enemies);
|
|
|
|
// Setup test entities
|
|
let enemy_id = app
|
|
.world
|
|
.spawn(Enemy {
|
|
hit_points: 1,
|
|
score_value: 1,
|
|
})
|
|
.id();
|
|
|
|
// Run systems
|
|
app.update();
|
|
|
|
// Check enemy was despawned
|
|
assert!(app.world.get::<Enemy>(enemy_id).is_none());
|
|
|
|
// Get `EnemyDied` event reader
|
|
let enemy_died_events = app.world.resource::<Events<EnemyDied>>();
|
|
let mut enemy_died_reader = enemy_died_events.get_reader();
|
|
let enemy_died = enemy_died_reader.iter(enemy_died_events).next().unwrap();
|
|
|
|
// Check the event has been sent
|
|
assert_eq!(enemy_died.0, 1);
|
|
}
|
|
|
|
#[test]
|
|
fn spawn_enemy_using_input_resource() {
|
|
// Setup app
|
|
let mut app = App::new();
|
|
|
|
// Add our systems
|
|
app.add_system(spawn_enemy);
|
|
|
|
// Setup test resource
|
|
let mut input = Input::<KeyCode>::default();
|
|
input.press(KeyCode::Space);
|
|
app.insert_resource(input);
|
|
|
|
// Run systems
|
|
app.update();
|
|
|
|
// Check resulting changes, one entity has been spawned with `Enemy` component
|
|
assert_eq!(app.world.query::<&Enemy>().iter(&app.world).len(), 1);
|
|
|
|
// Clear the `just_pressed` status for all `KeyCode`s
|
|
app.world.resource_mut::<Input<KeyCode>>().clear();
|
|
|
|
// Run systems
|
|
app.update();
|
|
|
|
// Check resulting changes, no new entity has been spawned
|
|
assert_eq!(app.world.query::<&Enemy>().iter(&app.world).len(), 1);
|
|
}
|
|
|
|
#[test]
|
|
fn update_score_on_event() {
|
|
// Setup app
|
|
let mut app = App::new();
|
|
|
|
// Add Score resource
|
|
app.insert_resource(Score(0));
|
|
|
|
// Add `EnemyDied` event
|
|
app.add_event::<EnemyDied>();
|
|
|
|
// Add our systems
|
|
app.add_system(update_score);
|
|
|
|
// Send an `EnemyDied` event
|
|
app.world
|
|
.resource_mut::<Events<EnemyDied>>()
|
|
.send(EnemyDied(3));
|
|
|
|
// Run systems
|
|
app.update();
|
|
|
|
// Check resulting changes
|
|
assert_eq!(app.world.resource::<Score>().0, 3);
|
|
}
|