Skip to content

Commit

Permalink
Update to latest Bevy main 0.11 (IyesGames#23)
Browse files Browse the repository at this point in the history
* fix assets tracking logic

* depend on bevy main

* Udate to latest Bevy main; prep for 0.8 (IyesGames#16)

* Update to latest Bevy commit

* Manually derive StageLabel

* Do not pin the Bevy commit

* Cargo.toml: point back at non-forked iyes_loopless

Co-authored-by: Ida Iyes <40234599+inodentry@users.noreply.github.com>

* loopless moved some things around

* v0.4: Bevy 0.8

* refactor things conditional on loopless into separate files

* implement "hidden progress"

* abstract progress return types with a trait

* add hidden progress to example

* add dummy systems, they might be useful to someone

* version bump to 0.5.0

* update to iyes_loopless 0.8

* version bump to 0.6.0

* bevy 0.9 compat

* Mark progress plugin as not unique (IyesGames#18)

* Version bump to 0.7.1

* unique name for each plugin instance (IyesGames#19)

* add note about issue IyesGames#20

* Bump Bevy to main 0.11-dev

---------

Co-authored-by: Ida Iyes <identry@protonmail.com>
Co-authored-by: Niklas Eicker <git@nikl.me>
Co-authored-by: Ida Iyes <40234599+inodentry@users.noreply.github.com>
Co-authored-by: François <mockersf@gmail.com>
  • Loading branch information
5 people committed Oct 21, 2023
1 parent 3130161 commit d191399
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion examples/full.rs
Expand Up @@ -38,7 +38,7 @@ fn main() {
internal_thing.track_progress(),
// we can also add regular untracked systems to our loading screen,
// like to draw our progress bar:
ui_progress_bar,
ui_progress_bar.after(ProgressSystemSet::CheckProgress),
)
.run_if(in_state(AppState::GameLoading)),
)
Expand Down
6 changes: 3 additions & 3 deletions src/lib.rs
Expand Up @@ -44,13 +44,12 @@ use std::sync::atomic::AtomicU32;
use std::sync::atomic::Ordering as MemOrdering;

use bevy_app::{prelude::*, MainScheduleOrder};
use bevy_ecs::prelude::*;
use bevy_ecs::{prelude::*, schedule::SystemConfigs};
use bevy_ecs::schedule::{ExecutorKind, SystemConfigs, ScheduleLabel};
use bevy_utils::{Duration, Instant};

#[cfg(feature = "debug")]
use bevy_log::prelude::*;

#[cfg(feature = "assets")]
mod asset;

Expand All @@ -63,6 +62,7 @@ pub mod prelude {
pub use crate::ProgressCounter;
pub use crate::ProgressPlugin;
pub use crate::ProgressSystem;
pub use crate::ProgressSystemSet;
}

/// Progress reported by a system
Expand Down Expand Up @@ -303,7 +303,7 @@ where
{
fn track_progress(self) -> SystemConfigs {
self.pipe(|In(progress): In<T>, counter: Res<ProgressCounter>| {
progress.apply_progress(&*counter);
progress.apply_progress(&counter);
})
.in_set(TrackedProgressSet)
}
Expand Down

0 comments on commit d191399

Please sign in to comment.