big refactoring of plugin management

Author: tyler274

src/camera/mod.rs

@@ -16,8 +16,10 @@ use bevy::prelude::*;
 use crate::camera::config::CameraConfig;
 use crate::camera::systems::{
     camera_movement, debug_draw_card_positions, handle_window_resize,
-    manage_game_camera_visibility, set_initial_zoom, setup_camera,
+    manage_game_camera_visibility, set_initial_zoom,
 };
+// Import the player debug system
+use crate::player::systems::debug::debug_draw_player_positions;
 #[cfg(feature = "snapshot")]
 use crate::snapshot::SnapshotPlugin;
 
@@ -30,7 +32,8 @@ impl Plugin for CameraPlugin {
         #[cfg(feature = "snapshot")]
         app.add_plugins(SnapshotPlugin::new());
 
-        app.add_systems(Startup, setup_camera)
+        // app.add_systems(Startup, setup_camera) // Moved to setup_game in RummagePlugin
+        app // Removed setup_camera from Startup
             .add_systems(PostStartup, set_initial_zoom)
             .add_systems(
                 Update,
@@ -39,6 +42,8 @@ impl Plugin for CameraPlugin {
                     camera_movement,
                     manage_game_camera_visibility,
                     debug_draw_card_positions,
+                    // Add player debug drawing system here
+                    debug_draw_player_positions,
                 ),
             );
     }

src/menu/cleanup/main_menu.rs

@@ -1,8 +1,14 @@
 use crate::menu::components::MenuRoot;
+use crate::menu::main_menu::components::{MainMenuBackground, MainMenuMusic};
 use bevy::prelude::*;
 
-/// Cleans up main menu entities by despawning the root node
-pub fn cleanup_main_menu(mut commands: Commands, menu_root_query: Query<Entity, With<MenuRoot>>) {
+/// Cleans up main menu entities including root, background, and music
+pub fn cleanup_main_menu(
+    mut commands: Commands,
+    menu_root_query: Query<Entity, With<MenuRoot>>,
+    background_query: Query<Entity, With<MainMenuBackground>>,
+    music_query: Query<Entity, With<MainMenuMusic>>,
+) {
     // Despawn the root entity recursively
     if let Ok(root_entity) = menu_root_query.get_single() {
         info!("Despawning main menu root entity: {:?}", root_entity);
@@ -20,6 +26,18 @@ pub fn cleanup_main_menu(mut commands: Commands, menu_root_query: Query<Entity,
         info!("No MenuRoot entity found to clean up.");
     }
 
+    // Despawn background entities
+    for entity in background_query.iter() {
+        info!("Despawning main menu background entity: {:?}", entity);
+        commands.entity(entity).despawn_recursive();
+    }
+
+    // Despawn music entities
+    for entity in music_query.iter() {
+        info!("Despawning main menu music entity: {:?}", entity);
+        commands.entity(entity).despawn_recursive();
+    }
+
     // Log the completion of cleanup
     info!("Main menu cleanup complete");
 }

src/menu/logo/plugin.rs

@@ -4,7 +4,7 @@ use crate::menu::components::{MenuItem, ZLayers};
 use crate::menu::decorations::MenuDecorativeElement;
 use crate::menu::logo::text::{create_english_text, create_hebrew_text};
 use crate::menu::star_of_david::create_star_of_david;
-use crate::menu::state::{GameMenuState, StateTransitionContext};
+use crate::menu::state::{AppState, GameMenuState, StateTransitionContext};
 use bevy::prelude::*;
 
 /// Resource to track logo initialization attempts
@@ -47,7 +47,9 @@ impl Plugin for LogoPlugin {
             .add_systems(
                 OnExit(GameMenuState::PauseMenu),
                 cleanup_non_persistent_logo,
-            );
+            )
+            // Add general cleanup when exiting the overall Menu AppState
+            .add_systems(OnExit(AppState::Menu), cleanup_all_logos);
 
         debug!("Logo plugin registered - combines Star of David with text");
     }
@@ -302,6 +304,21 @@ fn cleanup_non_persistent_logo(
     }
 }
 
+/// Cleans up ALL logo entities, regardless of persistence
+fn cleanup_all_logos(mut commands: Commands, logos: Query<Entity, With<MenuDecorativeElement>>) {
+    let mut count = 0;
+    for entity in logos.iter() {
+        commands.entity(entity).despawn_recursive();
+        count += 1;
+    }
+    if count > 0 {
+        info!(
+            "Cleaned up {} logo entities on exiting AppState::Menu",
+            count
+        );
+    }
+}
+
 /// Sets up the pause menu logo
 fn setup_pause_logo(
     commands: Commands,

src/menu/pause.rs

@@ -7,7 +7,7 @@ use bevy::prelude::*;
 
 use super::systems::pause_menu::{
     // Correct path for systems
-    input_handler::esc_key_system,
+    input_handler::{esc_key_system, handle_pause_trigger},
     interactions::pause_menu_action,
     setup::setup_pause_menu,
 };
@@ -29,6 +29,8 @@ impl Plugin for PauseMenuPlugin {
                 )
                 .run_if(in_state(GameMenuState::PauseMenu).and(in_state(AppState::Paused))),
             )
+            // System to *trigger* the pause menu from the game
+            .add_systems(Update, handle_pause_trigger.run_if(in_state(AppState::InGame)))
             // Exit pause menu cleanup - Commented out
             // .add_systems(
             //     OnExit(GameMenuState::PauseMenu),

src/menu/save_load/systems/interactions.rs

@@ -22,7 +22,7 @@ pub fn handle_save_load_buttons(
     mut interaction_query: SaveLoadButtonInteractionQuery,
     mut save_load_state: ResMut<NextState<SaveLoadUiState>>,
     mut game_state: ResMut<NextState<GameMenuState>>,
-    mut app_state: ResMut<NextState<AppState>>,
+    mut _app_state: ResMut<NextState<AppState>>,
     mut save_events: EventWriter<SaveGameEvent>,
     mut load_events: EventWriter<LoadGameEvent>,
     context: ResMut<SaveLoadUiContext>,

src/menu/visibility/plugin.rs

@@ -6,6 +6,7 @@ use super::systems::{
     force_main_menu_items_visibility, force_startup_visibility, update_menu_background,
 };
 use crate::menu::components::MenuVisibilityState;
+use crate::menu::state::AppState;
 use crate::menu::ui::update_menu_visibility_state;
 
 /// Plugin for managing menu item visibility and UI hierarchy
@@ -24,7 +25,8 @@ impl Plugin for MenuVisibilityPlugin {
                     detect_ui_hierarchy_issues,
                     update_menu_visibility_state,
                     debug_menu_visibility,
-                ),
+                )
+                    .run_if(in_state(AppState::Menu)),
             )
             // Main update systems - handle visibility changes
             .add_systems(
@@ -34,10 +36,14 @@ impl Plugin for MenuVisibilityPlugin {
                     fix_visibility_for_changed_items,
                     fix_changed_main_menu_visibility,
                     force_main_menu_items_visibility,
-                ),
+                )
+                    .run_if(in_state(AppState::Menu)),
             )
             // Background update system runs last
-            .add_systems(Last, update_menu_background);
+            .add_systems(
+                Last,
+                update_menu_background.run_if(in_state(AppState::Menu)),
+            );
 
         debug!("Visibility plugin registered");
     }

src/player/mod.rs

@@ -8,11 +8,11 @@ pub mod systems;
 
 use bevy::prelude::*;
 
-// Re-export the core components and systems
+// Import and re-export common player components and systems
 pub use components::Player;
 pub use playmat::PlayerPlaymatPlugin;
 pub use resources::PlayerConfig;
-pub use systems::{PlayerPositionTracker, debug_draw_player_positions};
+pub use systems::debug::{PlayerPositionTracker, debug_draw_player_positions};
 
 /// Plugin for player-related functionality
 pub struct PlayerPlugin;

src/player/systems/mod.rs

@@ -1,4 +1,12 @@
-mod debug;
+//! Player systems module - aggregates all player related logic
+
+// Keep spawn module public as it's used by game setup
 pub mod spawn;
 
-pub use debug::{PlayerPositionTracker, debug_draw_player_positions};
+// Make debug module public for external use (e.g., CameraPlugin)
+pub mod debug;
+
+// Other player systems can remain private for now
+// mod interactions; // Example: handle player clicks, etc.
+// mod movement; // Example: if players could move independently
+// ... add other player system modules here

src/player/systems/spawn/cards.rs

@@ -1,5 +1,5 @@
 use super::table::TableLayout;
-use crate::camera::components::{AppLayer, GameCamera};
+use crate::camera::components::AppLayer;
 use crate::cards::components::card_entity::CardZone;
 use crate::cards::drag::Draggable;
 use crate::cards::text::card_text::spawn_card_text_components;
@@ -10,7 +10,6 @@ use bevy::prelude::*;
 /// Helper function to spawn visual card entities
 pub fn spawn_visual_cards(
     commands: &mut Commands,
-    game_cameras: &Query<Entity, With<GameCamera>>,
     card_size: &Vec2,
     spacing_multiplier: f32,
     player_position: Vec3,
@@ -76,8 +75,8 @@ pub fn spawn_visual_cards(
         let card_clone = card.clone(); // Clone card to use later
 
         // Calculate z-index based on position to ensure proper layering
-        // Use a higher base z-value (30.0) to ensure cards are always above playmats (which use around 10.0)
-        let z = 30.0 + (i as f32 * 1.0); // Increased z-index base to stay above playmats
+        // Use a smaller base z-value to ensure cards are closer to the camera
+        let z = 1.0 + (i as f32 * 0.1); // Drastically reduced z-index base
 
         // Calculate the position for this card
         let position = Vec3::new(
@@ -161,7 +160,8 @@ pub fn spawn_visual_cards(
         // The RenderLayers component should handle visibility via the camera's layers.
         // Parenting to the camera makes the card's transform relative to the camera,
         // which is likely incorrect given the world-space position calculation above.
-        // for camera in game_cameras.iter() {
+        // We are relying on RenderLayers now.
+        // for camera in game_cameras.iter() { // This loop is now invalid as game_cameras is removed
         //     debug!(
         //         "Attaching card for player {} to game camera {:?}",
         //         player_index, camera

src/player/systems/spawn/mod.rs

@@ -25,7 +25,6 @@ use bevy::prelude::*;
 pub fn spawn_players<'w, 's>(
     commands: &mut Commands<'w, 's>,
     asset_server: Res<AssetServer>,
-    game_cameras: Query<'w, 's, Entity, With<crate::camera::components::GameCamera>>,
     player_config: Option<Res<PlayerConfig>>,
 ) {
     // Use default config if none exists
@@ -133,14 +132,13 @@ pub fn spawn_players<'w, 's>(
             // Remove context creation, call spawn_visual_cards directly
             cards::spawn_visual_cards(
                 commands, // Pass mutable commands directly
-                &game_cameras,
                 &config.card_size,
                 config.card_spacing_multiplier,
                 card_position,
                 player_index,
                 player_entity,
                 &table,
-                Some(&asset_server),
+                Some(&asset_server).map(|v| &**v), // Convert Option<&Res<AssetServer>> to Option<&AssetServer>
                 display_cards,
             );
         } else {