From cb7270602a1c3db6d7dfb9858f9faacc1e224f2d Mon Sep 17 00:00:00 2001 From: Louis Capitanchik <contact@louiscap.co> Date: Fri, 7 Apr 2023 02:01:00 +0100 Subject: [PATCH] Use base sets for animation stages --- Cargo.toml | 2 +- src/systems.rs | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5166754..04f4a1a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "micro_banimate" -version = "0.5.0-beta.0" +version = "0.5.0-beta.1" edition = "2021" license = "Apache-2.0" description = "Easily manage complex Bevy 2D sprite animations" diff --git a/src/systems.rs b/src/systems.rs index 98e75bc..4d74de9 100644 --- a/src/systems.rs +++ b/src/systems.rs @@ -4,6 +4,7 @@ use crate::definitions::*; use crate::query::AnimationQuery; #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, SystemSet)] +#[system_set(base)] pub enum AnimationSystems { TickAnimations, SyncAnimations, @@ -83,18 +84,18 @@ pub struct AnimationSystemsPlugin; impl Plugin for AnimationSystemsPlugin { fn build(&self, app: &mut App) { - app.configure_set( - AnimationSystems::SyncAnimations - .after(AnimationSystems::TickAnimations) - .in_base_set(CoreSet::PostUpdate), - ); + app.configure_sets(( + CoreSet::PostUpdate, + AnimationSystems::TickAnimations, + AnimationSystems::SyncAnimations, + )); app.add_event::<AnimationCompleted>() .add_systems( (tick_animations, tick_simple_sprite_animations) - .in_set(AnimationSystems::TickAnimations), + .in_base_set(AnimationSystems::TickAnimations), ) - .add_system(sync_parent_animations.in_set(AnimationSystems::SyncAnimations)); + .add_system(sync_parent_animations.in_base_set(AnimationSystems::SyncAnimations)); // #[cfg(feature = "ecs_tilemap")] // { -- GitLab