From 11ef39688cbe7db85fcfbaf8c3174e96d9d24c9e Mon Sep 17 00:00:00 2001
From: Space Nerd <71553327+SpaceNerde@users.noreply.github.com>
Date: Sun, 10 Dec 2023 15:53:17 +0100
Subject: [PATCH] fix scene switch problem and code cleanup

---
 src/menu.rs          | 7 ++-----
 src/player.rs        | 7 +++----
 src/scene_handler.rs | 6 ------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/menu.rs b/src/menu.rs
index 03d2f53..b590e75 100644
--- a/src/menu.rs
+++ b/src/menu.rs
@@ -1,9 +1,7 @@
 use crate::core_components::ChangeState;
 use crate::loading::TextureAssets;
 use crate::GameState;
-use crate::scene_handler::MenuCamera;
 use bevy::prelude::*;
-use bevy_voxel_world::prelude::*;
 
 pub struct MenuPlugin;
 
@@ -38,7 +36,6 @@ struct Menu;
 fn setup_menu(
     mut commands: Commands,
     textures: Res<TextureAssets>,
-    mut game_camera_query: Query<&mut Camera, With<VoxelWorldCamera>>,
 ) {
     info!("menu");
     commands
@@ -196,14 +193,14 @@ fn click_play_button(
         ),
         (Changed<Interaction>, With<Button>),
     >,
-    mut menu_camera_query: Query<&mut Camera, With<MenuCamera>>,
-    mut game_camera_query: Query<&mut Camera, (With<VoxelWorldCamera>, Without<MenuCamera>)>,
+    mut commands: Commands,
 ) {
     for (interaction, mut color, button_colors, change_state, open_link) in &mut interaction_query {
         match *interaction {
             Interaction::Pressed => {
                 if let Some(state) = change_state {
                     next_state.set(state.0.clone());
+                    commands.spawn(ChangeState(GameState::Playing));
                 } else if let Some(link) = open_link {
                     if let Err(error) = webbrowser::open(link.0) {
                         warn!("Failed to open link {error:?}");
diff --git a/src/player.rs b/src/player.rs
index 873dc12..81ef318 100644
--- a/src/player.rs
+++ b/src/player.rs
@@ -127,10 +127,9 @@ fn open_menu(
     }
 }
 
-fn cleanup(mut game_camera_query: Query<&mut Camera, With<VoxelWorldCamera>>, mut windows: Query<&mut Window>) {
-    let mut camera = game_camera_query.single_mut();
-    camera.is_active = false;
-
+fn cleanup(
+    mut windows: Query<&mut Window>
+) {
     let mut window = windows.single_mut();
 
     window.cursor.visible = true;
diff --git a/src/scene_handler.rs b/src/scene_handler.rs
index 7b6f5f3..4724614 100644
--- a/src/scene_handler.rs
+++ b/src/scene_handler.rs
@@ -18,15 +18,11 @@ pub struct MenuCamera;
 
 fn setup_cameras(
     mut commands: Commands,
-    //mut menu_camera_query: Query<&mut Camera, With<MenuCamera>>,
-    //mut game_camera_query: Query<&mut Camera, (With<VoxelWorldCamera>, Without<MenuCamera>)>,
 ){
     // Spawn Cameras
 
     // Menu Camera
     commands.spawn((Camera2dBundle::default(), MenuCamera));
-    //let mut menu_camera = menu_camera_query.single_mut();
-    //menu_camera.is_active = false;
 
     // Game Camera
     commands.spawn((
@@ -37,8 +33,6 @@ fn setup_cameras(
         // This tells bevy_voxel_world tos use this cameras transform to calculate spawning area
         VoxelWorldCamera,
     ));
-    //let mut game_camera = game_camera_query.single_mut();
-    //game_camera.is_active = false;
 }
 
 fn enter_playing(