Fix debug UI not working at all

src/menus/character_select/mod.rs

@@ -1,19 +1,8 @@
 use bevy::{picking::pointer::PointerId, prelude::*};
 
 use crate::{
-    AppState,
-    fighter::manifest::{FighterManifest, FighterManifestRegistry},
-    game_settings::CommonAssets,
-    input::{LocalInputAssignments, LocalInputSource},
-    menus::{
-        MenuMarker,
-        button::FGUiButton,
-        character_select::{character_box::CharacterBox, token::CharacterSelectToken},
-        cursor::{FGMenuCursor, MenuCursorInputSource},
-        errors::MenuErrors::FighterManifestNotFound,
-        match_config::{MenuMatchConfig, MenuMatchPlayerSlot},
-        scaling, spawn_menu,
-        style::{FGUiButtonType, FGUiStyle},
+    AppState, fighter::manifest::{FighterManifest, FighterManifestRegistry}, game_settings::CommonAssets, input::{LocalInputAssignments, LocalInputSource}, menus::{
+        MenuCameraMarker, MenuMarker, button::FGUiButton, character_select::{character_box::CharacterBox, token::CharacterSelectToken}, cursor::{FGMenuCursor, MenuCursorInputSource}, errors::MenuErrors::FighterManifestNotFound, match_config::{MenuMatchConfig, MenuMatchPlayerSlot}, scaling, spawn_menu, style::{FGUiButtonType, FGUiStyle},
     },
 };
 
@@ -241,7 +230,7 @@ pub fn copy_cursor_transform_to_token(
     character_boxes: Query<(&CharacterBox, &ComputedNode, &UiGlobalTransform)>,
     match_config: Res<MenuMatchConfig>,
     cursors: Query<&UiGlobalTransform, With<FGMenuCursor>>,
-    cam: Single<&Camera>,
+    cam: Single<&Camera, With<MenuCameraMarker>>,
     ui_scale: Res<UiScale>,
 ) -> Result {
     let camera = cam.into_inner();

src/menus/cursor.rs

@@ -9,11 +9,8 @@ use bevy::{
 };
 
 use crate::{
-    input::{LocalInputAssignments, LocalInputSource},
-    menus::{
-        input::{MenuInput, MenuInputState},
-        scaling,
-        style::FGUiStyle,
+    input::{LocalInputAssignments, LocalInputSource}, menus::{
+        MenuCameraMarker, input::{MenuInput, MenuInputState}, scaling, style::FGUiStyle,
     },
 };
 
@@ -181,7 +178,7 @@ pub fn cursor_input(
 }
 
 pub fn update_cursor_transform(
-    camera: Single<&Camera>,
+    camera: Single<&Camera, With<MenuCameraMarker>>,
     query: Query<(&mut Node, &PointerLocation), With<FGMenuCursor>>,
     ui_scale: Res<UiScale>,
 ) {

src/menus/mod.rs

@@ -53,6 +53,7 @@ pub fn wrap_menu(menu: impl Scene) -> impl Scene {
                 #MenuCamera
                 Camera
                 Camera2d
+                MenuCameraMarker
             ),
             (
                 #MenuContainer
@@ -73,7 +74,6 @@ pub fn wrap_menu(menu: impl Scene) -> impl Scene {
 
 pub fn despawn_menu(
     existing_menu: Option<Single<Entity, With<MenuMarker>>>,
-    existing_menu_camera: Option<Single<Entity, With<MenuCameraMarker>>>,
     mut commands: Commands,
 ) {
     if let Some(entity) = existing_menu {
@@ -82,9 +82,6 @@ pub fn despawn_menu(
             .despawn();
     }
 
-    if let Some(menu_cam) = existing_menu_camera {
-        commands.entity(*menu_cam).despawn();
-    }
 }
 
 pub fn spawn_menu(