2022-06-07 02:02:53 +00:00
|
|
|
use bevy::{ecs::event::Events, prelude::*};
|
2021-04-15 00:57:37 +00:00
|
|
|
|
2021-10-03 19:23:44 +00:00
|
|
|
#[derive(Component, Default)]
|
2021-04-15 00:57:37 +00:00
|
|
|
struct Enemy {
|
|
|
|
hit_points: u32,
|
2022-06-07 02:02:53 +00:00
|
|
|
score_value: u32,
|
2021-04-15 00:57:37 +00:00
|
|
|
}
|
|
|
|
|
2023-06-06 14:44:32 +00:00
|
|
|
#[derive(Event)]
|
2022-06-07 02:02:53 +00:00
|
|
|
struct EnemyDied(u32);
|
|
|
|
|
Make `Resource` trait opt-in, requiring `#[derive(Resource)]` V2 (#5577)
*This PR description is an edited copy of #5007, written by @alice-i-cecile.*
# Objective
Follow-up to https://github.com/bevyengine/bevy/pull/2254. The `Resource` trait currently has a blanket implementation for all types that meet its bounds.
While ergonomic, this results in several drawbacks:
* it is possible to make confusing, silent mistakes such as inserting a function pointer (Foo) rather than a value (Foo::Bar) as a resource
* it is challenging to discover if a type is intended to be used as a resource
* we cannot later add customization options (see the [RFC](https://github.com/bevyengine/rfcs/blob/main/rfcs/27-derive-component.md) for the equivalent choice for Component).
* dependencies can use the same Rust type as a resource in invisibly conflicting ways
* raw Rust types used as resources cannot preserve privacy appropriately, as anyone able to access that type can read and write to internal values
* we cannot capture a definitive list of possible resources to display to users in an editor
## Notes to reviewers
* Review this commit-by-commit; there's effectively no back-tracking and there's a lot of churn in some of these commits.
*ira: My commits are not as well organized :')*
* I've relaxed the bound on Local to Send + Sync + 'static: I don't think these concerns apply there, so this can keep things simple. Storing e.g. a u32 in a Local is fine, because there's a variable name attached explaining what it does.
* I think this is a bad place for the Resource trait to live, but I've left it in place to make reviewing easier. IMO that's best tackled with https://github.com/bevyengine/bevy/issues/4981.
## Changelog
`Resource` is no longer automatically implemented for all matching types. Instead, use the new `#[derive(Resource)]` macro.
## Migration Guide
Add `#[derive(Resource)]` to all types you are using as a resource.
If you are using a third party type as a resource, wrap it in a tuple struct to bypass orphan rules. Consider deriving `Deref` and `DerefMut` to improve ergonomics.
`ClearColor` no longer implements `Component`. Using `ClearColor` as a component in 0.8 did nothing.
Use the `ClearColorConfig` in the `Camera3d` and `Camera2d` components instead.
Co-authored-by: Alice <alice.i.cecile@gmail.com>
Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
Co-authored-by: devil-ira <justthecooldude@gmail.com>
Co-authored-by: Carter Anderson <mcanders1@gmail.com>
2022-08-08 21:36:35 +00:00
|
|
|
#[derive(Resource)]
|
2022-06-07 02:02:53 +00:00
|
|
|
struct Score(u32);
|
|
|
|
|
|
|
|
fn update_score(mut dead_enemies: EventReader<EnemyDied>, mut score: ResMut<Score>) {
|
2023-08-30 14:20:03 +00:00
|
|
|
for value in dead_enemies.read() {
|
2022-06-07 02:02:53 +00:00
|
|
|
score.0 += value.0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn despawn_dead_enemies(
|
|
|
|
mut commands: Commands,
|
|
|
|
mut dead_enemies: EventWriter<EnemyDied>,
|
|
|
|
enemies: Query<(Entity, &Enemy)>,
|
|
|
|
) {
|
2022-07-11 15:28:50 +00:00
|
|
|
for (entity, enemy) in &enemies {
|
2021-04-15 00:57:37 +00:00
|
|
|
if enemy.hit_points == 0 {
|
|
|
|
commands.entity(entity).despawn_recursive();
|
2022-06-07 02:02:53 +00:00
|
|
|
dead_enemies.send(EnemyDied(enemy.score_value));
|
2021-04-15 00:57:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn hurt_enemies(mut enemies: Query<&mut Enemy>) {
|
2022-07-11 15:28:50 +00:00
|
|
|
for mut enemy in &mut enemies {
|
2021-04-15 00:57:37 +00:00
|
|
|
enemy.hit_points -= 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn spawn_enemy(mut commands: Commands, keyboard_input: Res<Input<KeyCode>>) {
|
|
|
|
if keyboard_input.just_pressed(KeyCode::Space) {
|
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(Enemy {
|
2022-06-07 02:02:53 +00:00
|
|
|
hit_points: 5,
|
|
|
|
score_value: 3,
|
|
|
|
});
|
2021-04-15 00:57:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn did_hurt_enemy() {
|
2022-06-07 02:02:53 +00:00
|
|
|
// Setup app
|
|
|
|
let mut app = App::new();
|
|
|
|
|
|
|
|
// Add Score resource
|
|
|
|
app.insert_resource(Score(0));
|
2021-04-15 00:57:37 +00:00
|
|
|
|
2022-06-07 02:02:53 +00:00
|
|
|
// Add `EnemyDied` event
|
|
|
|
app.add_event::<EnemyDied>();
|
|
|
|
|
|
|
|
// Add our two systems
|
2023-03-18 01:45:34 +00:00
|
|
|
app.add_systems(Update, (hurt_enemies, despawn_dead_enemies).chain());
|
2021-04-15 00:57:37 +00:00
|
|
|
|
|
|
|
// Setup test entities
|
2022-06-07 02:02:53 +00:00
|
|
|
let enemy_id = app
|
|
|
|
.world
|
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(Enemy {
|
2022-06-07 02:02:53 +00:00
|
|
|
hit_points: 5,
|
|
|
|
score_value: 3,
|
|
|
|
})
|
|
|
|
.id();
|
2021-04-15 00:57:37 +00:00
|
|
|
|
|
|
|
// Run systems
|
2022-06-07 02:02:53 +00:00
|
|
|
app.update();
|
2021-04-15 00:57:37 +00:00
|
|
|
|
|
|
|
// Check resulting changes
|
2022-06-07 02:02:53 +00:00
|
|
|
assert!(app.world.get::<Enemy>(enemy_id).is_some());
|
|
|
|
assert_eq!(app.world.get::<Enemy>(enemy_id).unwrap().hit_points, 4);
|
2021-04-15 00:57:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn did_despawn_enemy() {
|
2022-06-07 02:02:53 +00:00
|
|
|
// Setup app
|
|
|
|
let mut app = App::new();
|
|
|
|
|
|
|
|
// Add Score resource
|
|
|
|
app.insert_resource(Score(0));
|
|
|
|
|
|
|
|
// Add `EnemyDied` event
|
|
|
|
app.add_event::<EnemyDied>();
|
2021-04-15 00:57:37 +00:00
|
|
|
|
2022-06-07 02:02:53 +00:00
|
|
|
// Add our two systems
|
2023-03-18 01:45:34 +00:00
|
|
|
app.add_systems(Update, (hurt_enemies, despawn_dead_enemies).chain());
|
2021-04-15 00:57:37 +00:00
|
|
|
|
|
|
|
// Setup test entities
|
2022-06-07 02:02:53 +00:00
|
|
|
let enemy_id = app
|
|
|
|
.world
|
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(Enemy {
|
2022-06-07 02:02:53 +00:00
|
|
|
hit_points: 1,
|
|
|
|
score_value: 1,
|
|
|
|
})
|
|
|
|
.id();
|
2021-04-15 00:57:37 +00:00
|
|
|
|
|
|
|
// Run systems
|
2022-06-07 02:02:53 +00:00
|
|
|
app.update();
|
2021-04-15 00:57:37 +00:00
|
|
|
|
2022-06-07 02:02:53 +00:00
|
|
|
// 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();
|
2023-08-30 14:20:03 +00:00
|
|
|
let enemy_died = enemy_died_reader.read(enemy_died_events).next().unwrap();
|
2022-06-07 02:02:53 +00:00
|
|
|
|
|
|
|
// Check the event has been sent
|
|
|
|
assert_eq!(enemy_died.0, 1);
|
2021-04-15 00:57:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn spawn_enemy_using_input_resource() {
|
2022-06-07 02:02:53 +00:00
|
|
|
// Setup app
|
|
|
|
let mut app = App::new();
|
2021-04-15 00:57:37 +00:00
|
|
|
|
2022-06-07 02:02:53 +00:00
|
|
|
// Add our systems
|
2023-03-18 01:45:34 +00:00
|
|
|
app.add_systems(Update, spawn_enemy);
|
2021-04-15 00:57:37 +00:00
|
|
|
|
|
|
|
// Setup test resource
|
|
|
|
let mut input = Input::<KeyCode>::default();
|
|
|
|
input.press(KeyCode::Space);
|
2022-06-07 02:02:53 +00:00
|
|
|
app.insert_resource(input);
|
2021-04-15 00:57:37 +00:00
|
|
|
|
|
|
|
// Run systems
|
2022-06-07 02:02:53 +00:00
|
|
|
app.update();
|
2021-04-15 00:57:37 +00:00
|
|
|
|
|
|
|
// Check resulting changes, one entity has been spawned with `Enemy` component
|
2022-06-07 02:02:53 +00:00
|
|
|
assert_eq!(app.world.query::<&Enemy>().iter(&app.world).len(), 1);
|
2021-04-15 00:57:37 +00:00
|
|
|
|
|
|
|
// Clear the `just_pressed` status for all `KeyCode`s
|
2022-06-07 02:02:53 +00:00
|
|
|
app.world.resource_mut::<Input<KeyCode>>().clear();
|
2021-04-15 00:57:37 +00:00
|
|
|
|
|
|
|
// Run systems
|
2022-06-07 02:02:53 +00:00
|
|
|
app.update();
|
2021-04-15 00:57:37 +00:00
|
|
|
|
|
|
|
// Check resulting changes, no new entity has been spawned
|
2022-06-07 02:02:53 +00:00
|
|
|
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
|
2023-03-18 01:45:34 +00:00
|
|
|
app.add_systems(Update, update_score);
|
2022-06-07 02:02:53 +00:00
|
|
|
|
|
|
|
// 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);
|
2021-04-15 00:57:37 +00:00
|
|
|
}
|