bit of a restructure, moved some stuff into mod.rs and stop redefining the same thing all over the place

Author: ybettles

src/main.rs

@@ -87,10 +87,6 @@ pub(crate) enum GameState {
     Splash,
 }
 
-// a label component to tell us which things are loaded in the Game GameState
-#[derive(Component)]
-struct OnGameScreen;
-
 #[derive(Component)]
 struct Player {
     health: i32
@@ -114,7 +110,6 @@ fn setup_sys(
         Mesh2d(meshes.add(Annulus::new(25.0, 50.0))),
         MeshMaterial2d(materials.add(Color::WHITE)),
         Transform::from_xyz(0., - window_height / 2. + 75., 0.),
-        OnGameScreen,
     ));
 }
 
@@ -134,12 +129,4 @@ fn player_move_sys(
             player_tf.translation.x = (player_tf.translation.x + move_distance).min(width / 2.)
         }
     }
-}
-
-// stole this directly from an example but it seems a sensible way of removing
-// unneeded Entities with a given Component indiscriminantly
-fn despawn_entities<T: Component>(to_despawn: Query<Entity, With<T>>, mut commands: Commands) {
-    for entity in &to_despawn {
-        commands.entity(entity).despawn_recursive();
-    }
-}
+}

src/ui/main_menu.rs

@@ -10,6 +10,7 @@ use super::{
     MenuContainerNode,
     MenuButtonAction,
     MenuFont,
+    OnMenuScreen,
     MENU_TEXT_COLOR
 };
 
@@ -38,16 +39,7 @@ impl Plugin for MenuPlugin {
     }
 }
 
-/// Tag Entities with this if they appear on any menu screen
-///
-/// Can be useful to despawn (or otherwise affect)
-/// the entire Menu regardless of where you are in it
-/// e.g. if you hit Esc while in [`GameState::Menu`] it should despawn all
-/// [`OnMenuScreen`] entities and switch to [`GameState::Gam`e], which would be difficult to do
-/// if we used only [`OnMainMenuScreen`] and [`OnSettingsMenuScreen`]
-#[derive(Component)]
-struct OnMenuScreen;
-/// Tag Entities with this if they are visible on [MenuState::MainMenu]
+// Tag Entities with this if they are visible on [MenuState::MainMenu]
 #[derive(Component)]
 struct OnMainMenuScreen;
 /// Tag Entities with this if they are visible on [MenuState::Settings]

src/ui/mod.rs

@@ -4,10 +4,7 @@ pub mod main_menu;
 
 use bevy::prelude::*;
 use std::{path::PathBuf, sync::LazyLock};
-use super::{
-    GameState,
-    despawn_entities
-};
+use super::GameState;
 use main_menu::{
     MenuState,
     MenuPlugin
@@ -43,6 +40,17 @@ impl Plugin for UiPlugin {
     }
 }
 
+/// Tag Entities with this if they appear on any menu screen
+///
+/// Can be useful to despawn (or otherwise affect)
+/// the entire Menu regardless of where you are in it
+/// e.g. if you hit Esc while in [`GameState::Menu`] it should despawn all
+/// [`OnMenuScreen`] entities and switch to [`GameState::Gam`e], which would be difficult to do
+/// if we used only [`OnMainMenuScreen`] and [`OnSettingsMenuScreen`]
+
+#[derive (Component)]
+pub struct OnMenuScreen;
+
 /// Enum of all the actions a [Button] should be able to perform,
 /// with [MenuButtonAction] and [PauseButtonAction] variants
 /// To use the variants:
@@ -253,4 +261,12 @@ pub fn pause_menu_listener_sys(
             }
         }
     }
+}
+
+// stole this directly from an example but it seems a sensible way of removing
+// unneeded Entities with a given Component indiscriminantly
+fn despawn_entities<T: Component>(to_despawn: Query<Entity, With<T>>, mut commands: Commands) {
+    for entity in &to_despawn {
+        commands.entity(entity).despawn_recursive();
+    }
 }

src/ui/pause.rs

@@ -10,6 +10,7 @@ use super::{
     MenuContainerNode,
     ButtonNode,
     MenuFont,
+    OnMenuScreen,
     MENU_TEXT_COLOR
 };
 use super::main_menu::{
@@ -38,15 +39,6 @@ impl Plugin for PausePlugin {
     }
 }
 
-/// Tag Entities with this if they appear on any menu screen
-/// 
-/// Can be useful to despawn (or otherwise affect)
-/// the entire Menu regardless of where you are in it
-/// e.g. if you hit Esc while in [`GameState::Menu`] it should despawn all 
-/// [`OnMenuScreen`] entities and switch to [`GameState::Game`], which would be difficult to do
-/// if we used only [`OnPauseMenuScreen`] and [`OnSettingsMenuScreen`]
-#[derive(Component)]
-struct OnMenuScreen;
 /// Tag Entities with this if they are visible on [PauseMenuState::PauseMenu]
 #[derive(Component)]
 struct OnPauseMenuScreen;