Merge branch 'main' into vscode-settings

TheBevyFlock · Jul 7, 2024 · ad8b210 · ad8b210
2 parents 8e0422e + e98929e
commit ad8b210
Show file tree

Hide file tree

Showing 9 changed files with 152 additions and 95 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/core/game/mod.rs b/src/core/game/mod.rs
diff --git a/src/core/loading/mod.rs b/src/core/loading/mod.rs
@@ -0,0 +1,16 @@
+use bevy::core::FrameCount;
+pub use bevy::prelude::*;
+
+use super::AppState;
+
+pub(super) fn plugin(app: &mut App) {
+    // Setup(s), update(s), teardown(s)
+    app.add_systems(Update, frames_elapsed.run_if(in_state(AppState::Loading)));
+}
+
+// Based on: <https://github.com/bevyengine/bevy/blob/v0.14.0/examples/window/window_settings.rs#L56>
+fn frames_elapsed(mut next_app_state: ResMut<NextState<AppState>>, frames: Res<FrameCount>) {
+    if frames.0 >= 3 {
+        next_app_state.set(AppState::Ready);
+    }
+}