mirror of
https://github.com/bevyengine/bevy
synced 2024-11-26 14:40:19 +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%:  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(); ```
84 lines
2.9 KiB
Rust
84 lines
2.9 KiB
Rust
//! In this example we generate a new texture atlas (sprite sheet) from a folder containing
|
|
//! individual sprites.
|
|
|
|
use bevy::{asset::LoadState, prelude::*};
|
|
|
|
fn main() {
|
|
App::new()
|
|
.init_resource::<RpgSpriteHandles>()
|
|
.insert_resource(ImageSettings::default_nearest()) // prevents blurry sprites
|
|
.add_plugins(DefaultPlugins)
|
|
.add_state(AppState::Setup)
|
|
.add_system_set(SystemSet::on_enter(AppState::Setup).with_system(load_textures))
|
|
.add_system_set(SystemSet::on_update(AppState::Setup).with_system(check_textures))
|
|
.add_system_set(SystemSet::on_enter(AppState::Finished).with_system(setup))
|
|
.run();
|
|
}
|
|
|
|
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
|
|
enum AppState {
|
|
Setup,
|
|
Finished,
|
|
}
|
|
|
|
#[derive(Resource, Default)]
|
|
struct RpgSpriteHandles {
|
|
handles: Vec<HandleUntyped>,
|
|
}
|
|
|
|
fn load_textures(mut rpg_sprite_handles: ResMut<RpgSpriteHandles>, asset_server: Res<AssetServer>) {
|
|
rpg_sprite_handles.handles = asset_server.load_folder("textures/rpg").unwrap();
|
|
}
|
|
|
|
fn check_textures(
|
|
mut state: ResMut<State<AppState>>,
|
|
rpg_sprite_handles: ResMut<RpgSpriteHandles>,
|
|
asset_server: Res<AssetServer>,
|
|
) {
|
|
if let LoadState::Loaded =
|
|
asset_server.get_group_load_state(rpg_sprite_handles.handles.iter().map(|handle| handle.id))
|
|
{
|
|
state.set(AppState::Finished).unwrap();
|
|
}
|
|
}
|
|
|
|
fn setup(
|
|
mut commands: Commands,
|
|
rpg_sprite_handles: Res<RpgSpriteHandles>,
|
|
asset_server: Res<AssetServer>,
|
|
mut texture_atlases: ResMut<Assets<TextureAtlas>>,
|
|
mut textures: ResMut<Assets<Image>>,
|
|
) {
|
|
let mut texture_atlas_builder = TextureAtlasBuilder::default();
|
|
for handle in &rpg_sprite_handles.handles {
|
|
let handle = handle.typed_weak();
|
|
let texture = textures.get(&handle).expect("Textures folder contained a file which way matched by a loader which did not create an `Image` asset");
|
|
texture_atlas_builder.add_texture(handle, texture);
|
|
}
|
|
|
|
let texture_atlas = texture_atlas_builder.finish(&mut textures).unwrap();
|
|
let texture_atlas_texture = texture_atlas.texture.clone();
|
|
let vendor_handle = asset_server.get_handle("textures/rpg/chars/vendor/generic-rpg-vendor.png");
|
|
let vendor_index = texture_atlas.get_texture_index(&vendor_handle).unwrap();
|
|
let atlas_handle = texture_atlases.add(texture_atlas);
|
|
|
|
// set up a scene to display our texture atlas
|
|
commands.spawn(Camera2dBundle::default());
|
|
// draw a sprite from the atlas
|
|
commands.spawn(SpriteSheetBundle {
|
|
transform: Transform {
|
|
translation: Vec3::new(150.0, 0.0, 0.0),
|
|
scale: Vec3::splat(4.0),
|
|
..default()
|
|
},
|
|
sprite: TextureAtlasSprite::new(vendor_index),
|
|
texture_atlas: atlas_handle,
|
|
..default()
|
|
});
|
|
// draw the atlas itself
|
|
commands.spawn(SpriteBundle {
|
|
texture: texture_atlas_texture,
|
|
transform: Transform::from_xyz(-300.0, 0.0, 0.0),
|
|
..default()
|
|
});
|
|
}
|