d3e020a1e7
I'm opening this prematurely; consider this an RFC that predates RFCs and therefore not super-RFC-like. This PR does two "big" things: decouple run criteria from system sets, reimagine system sets as weapons of mass system description. ### What it lets us do: * Reuse run criteria within a stage. * Pipe output of one run criteria as input to another. * Assign labels, dependencies, run criteria, and ambiguity sets to many systems at the same time. ### Things already done: * Decoupled run criteria from system sets. * Mass system description superpowers to `SystemSet`. * Implemented `RunCriteriaDescriptor`. * Removed `VirtualSystemSet`. * Centralized all run criteria of `SystemStage`. * Extended system descriptors with per-system run criteria. * `.before()` and `.after()` for run criteria. * Explicit order between state driver and related run criteria. Fixes #1672. * Opt-in run criteria deduplication; default behavior is to panic. * Labels (not exposed) for state run criteria; state run criteria are deduplicated. ### API issues that need discussion: * [`FixedTimestep::step(1.0).label("my label")`](eaccf857cd/crates/bevy_ecs/src/schedule/run_criteria.rs (L120-L122)) and [`FixedTimestep::step(1.0).with_label("my label")`](eaccf857cd/crates/bevy_core/src/time/fixed_timestep.rs (L86-L89)) are both valid but do very different things. --- I will try to maintain this post up-to-date as things change. Do check the diffs in "edited" thingy from time to time. Co-authored-by: Carter Anderson <mcanders1@gmail.com>
83 lines
2.9 KiB
Rust
83 lines
2.9 KiB
Rust
use bevy::{asset::LoadState, prelude::*, sprite::TextureAtlasBuilder};
|
|
|
|
/// In this example we generate a new texture atlas (sprite sheet) from a folder containing
|
|
/// individual sprites
|
|
fn main() {
|
|
App::build()
|
|
.init_resource::<RpgSpriteHandles>()
|
|
.add_plugins(DefaultPlugins)
|
|
.add_state(AppState::Setup)
|
|
.add_system_set(SystemSet::on_enter(AppState::Setup).with_system(load_textures.system()))
|
|
.add_system_set(SystemSet::on_update(AppState::Setup).with_system(check_textures.system()))
|
|
.add_system_set(SystemSet::on_enter(AppState::Finished).with_system(setup.system()))
|
|
.run();
|
|
}
|
|
|
|
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
|
|
enum AppState {
|
|
Setup,
|
|
Finished,
|
|
}
|
|
|
|
#[derive(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_next(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<Texture>>,
|
|
mut materials: ResMut<Assets<ColorMaterial>>,
|
|
) {
|
|
let mut texture_atlas_builder = TextureAtlasBuilder::default();
|
|
for handle in rpg_sprite_handles.handles.iter() {
|
|
let texture = textures.get(handle).unwrap();
|
|
texture_atlas_builder.add_texture(handle.clone_weak().typed::<Texture>(), 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_bundle(OrthographicCameraBundle::new_2d());
|
|
// draw a sprite from the atlas
|
|
commands.spawn_bundle(SpriteSheetBundle {
|
|
transform: Transform {
|
|
translation: Vec3::new(150.0, 0.0, 0.0),
|
|
scale: Vec3::splat(4.0),
|
|
..Default::default()
|
|
},
|
|
sprite: TextureAtlasSprite::new(vendor_index as u32),
|
|
texture_atlas: atlas_handle,
|
|
..Default::default()
|
|
});
|
|
// draw the atlas itself
|
|
commands.spawn_bundle(SpriteBundle {
|
|
material: materials.add(texture_atlas_texture.into()),
|
|
transform: Transform::from_xyz(-300.0, 0.0, 0.0),
|
|
..Default::default()
|
|
});
|
|
}
|