Add pause menu

Author: benfrankel

assets/config/theme.ron

@@ -27,5 +27,7 @@
         Srgba(Srgba(red: 0.384, green: 0.827, blue: 0.769, alpha: 1.000)),
         // CardBorder
         Srgba(Srgba(red: 0.071, green: 0.082, blue: 0.133, alpha: 1.000)),
+        // Overlay
+        Srgba(Srgba(red: 0.161, green: 0.157, blue: 0.231, alpha: 0.970)),
     )),
 )

src/animation/transition.rs

@@ -86,7 +86,7 @@ fn apply_fade_out(
             .0
             .set_alpha(1.0 - (fade.remaining / fade.duration).max(0.0));
         if fade.remaining <= 0.0 {
-            screen.enter(fade.to_screen);
+            screen.trigger().enter(fade.to_screen);
             despawn.recursive(entity);
         }
         fade.remaining -= dt;

src/core/theme.rs

@@ -71,6 +71,7 @@ pub enum ThemeColor {
     Popup,
     Indicator,
     CardBorder,
+    Overlay,
 }
 
 impl ThemeColor {

src/game.rs

@@ -9,9 +9,14 @@ pub mod spotlight;
 pub mod sprite;
 pub mod wave;
 
+use std::borrow::Cow;
+
 use avian2d::prelude::*;
+use bevy::ecs::system::EntityCommand;
 use bevy::prelude::*;
+use pyri_state::prelude::*;
 
+use crate::screen::Screen;
 use crate::util::prelude::*;
 
 pub(super) fn plugin(app: &mut App) {
@@ -42,23 +47,16 @@ impl Configure for GameRoot {
     fn configure(app: &mut App) {
         app.register_type::<Self>();
         app.init_resource::<Self>();
+        app.add_systems(StateFlush, Screen::ANY.on_exit(clear_game_root));
     }
 }
 
 impl FromWorld for GameRoot {
     fn from_world(world: &mut World) -> Self {
-        let players = world
-            .spawn((Name::new("Players"), SpatialBundle::default()))
-            .id();
-        let enemies = world
-            .spawn((Name::new("Enemies"), SpatialBundle::default()))
-            .id();
-        let projectiles = world
-            .spawn((Name::new("Projectiles"), SpatialBundle::default()))
-            .id();
-        let vfx = world
-            .spawn((Name::new("Vfx"), SpatialBundle::default()))
-            .id();
+        let players = world.spawn_with(root("Players")).id();
+        let enemies = world.spawn_with(root("Enemies")).id();
+        let projectiles = world.spawn_with(root("Projectiles")).id();
+        let vfx = world.spawn_with(root("Vfx")).id();
 
         Self {
             players,
@@ -69,12 +67,18 @@ impl FromWorld for GameRoot {
     }
 }
 
-impl GameRoot {
-    pub fn despawn_descendants(&self, commands: &mut Commands) {
-        commands.entity(self.players).despawn_descendants();
-        commands.entity(self.enemies).despawn_descendants();
-        commands.entity(self.projectiles).despawn_descendants();
-        commands.entity(self.vfx).despawn_descendants();
+fn clear_game_root(mut commands: Commands, game_root: Res<GameRoot>) {
+    commands.entity(game_root.players).despawn_descendants();
+    commands.entity(game_root.enemies).despawn_descendants();
+    commands.entity(game_root.projectiles).despawn_descendants();
+    commands.entity(game_root.vfx).despawn_descendants();
+}
+
+fn root(name: impl Into<Cow<'static, str>>) -> impl EntityCommand<World> {
+    let name = name.into();
+
+    move |mut entity: EntityWorldMut| {
+        entity.insert((Name::new(name), SpatialBundle::default()));
     }
 }
 

src/screen.rs

@@ -10,6 +10,7 @@ use pyri_state::prelude::*;
 
 use crate::animation::transition::FadeIn;
 use crate::animation::transition::FadeOut;
+use crate::core::camera::CameraRoot;
 use crate::core::window::WindowReady;
 use crate::ui::prelude::*;
 use crate::util::prelude::*;
@@ -28,6 +29,7 @@ pub fn plugin(app: &mut App) {
 
 #[derive(State, Copy, Clone, Eq, PartialEq, Hash, Debug, Reflect, Default)]
 #[state(after(WindowReady), entity_scope, bevy_state, log_flush)]
+#[reflect(Resource)]
 pub enum Screen {
     #[default]
     Splash,
@@ -39,11 +41,23 @@ pub enum Screen {
 
 impl Configure for Screen {
     fn configure(app: &mut App) {
+        app.register_type::<Self>();
         app.add_state::<Self>();
-        app.add_systems(StateFlush, WindowReady.on_enter(Screen::enable_default));
+        app.add_systems(
+            StateFlush,
+            (
+                WindowReady.on_enter(Screen::enable_default),
+                Screen::ANY.on_exit(reset_camera),
+            ),
+        );
     }
 }
 
+fn reset_camera(camera_root: Res<CameraRoot>, mut camera_query: Query<&mut Transform>) {
+    let mut transform = r!(camera_query.get_mut(camera_root.primary));
+    transform.translation = Vec2::ZERO.extend(transform.translation.z);
+}
+
 const FADE_IN_SECS: f32 = 0.5;
 
 fn fade_in(mut entity: EntityWorldMut) {

src/screen/end.rs

@@ -64,14 +64,13 @@ fn enter_end(mut commands: Commands, ui_root: Res<UiRoot>) {
     );
 }
 
-fn exit_end(mut commands: Commands, ui_root: Res<UiRoot>) {
+fn exit_end(mut commands: Commands) {
     commands.remove_resource::<InputMap<EndScreenAction>>();
-    commands.entity(ui_root.body).despawn_descendants();
 }
 
 fn end_screen(mut entity: EntityWorldMut) {
     entity
-        .add(widget::column_mid)
+        .add(Style::COLUMN_MID.div())
         .insert(Name::new("EndScreen"))
         .with_children(|children| {
             children.spawn_with(end_text);

src/screen/loading.rs

@@ -23,10 +23,7 @@ pub(super) fn plugin(app: &mut App) {
         LoadingState::new(Screen::Loading.bevy()).load_collection::<PlayingAssets>(),
     );
     app.add_plugins(ProgressPlugin::new(Screen::Loading.bevy()));
-    app.add_systems(
-        StateFlush,
-        Screen::Loading.on_edge(exit_loading, enter_loading),
-    );
+    app.add_systems(StateFlush, Screen::Loading.on_enter(enter_loading));
     app.add_systems(
         Update,
         // TODO: This is kinda silly. Find a better way later.
@@ -89,13 +86,9 @@ fn enter_loading(mut commands: Commands, ui_root: Res<UiRoot>) {
     commands.spawn_with(loading_screen).set_parent(ui_root.body);
 }
 
-fn exit_loading(mut commands: Commands, ui_root: Res<UiRoot>) {
-    commands.entity(ui_root.body).despawn_descendants();
-}
-
 fn loading_screen(mut entity: EntityWorldMut) {
     entity
-        .add(widget::column_center)
+        .add(Style::COLUMN_CENTER.div())
         .insert(Name::new("LoadingScreen"))
         .with_children(|children| {
             children.spawn_with(loading_text);