Merge branch 'demo-state-saving'

Author: polymonster

.vscode/launch.json

@@ -11,7 +11,7 @@
             "program": "${workspaceFolder}/target/debug/client.exe",
             "args": [],
             "stopAtEntry": false,
-            "cwd": "${fileDirname}",
+            "cwd": "${workspaceFolder}",
             "environment": [],
             "console": "externalTerminal",
             "preLaunchTask": "pmbuild-debug"
@@ -23,7 +23,7 @@
             "program": "${workspaceFolder}/target/release/client.exe",
             "args": [],
             "stopAtEntry": false,
-            "cwd": "${fileDirname}",
+            "cwd": "${workspaceFolder}",
             "environment": [],
             "console": "externalTerminal",
             "preLaunchTask": "pmbuild-release"
@@ -35,7 +35,7 @@
             "program": "${workspaceFolder}/target/debug/examples/window.exe",
             "args": [],
             "stopAtEntry": false,
-            "cwd": "${fileDirname}",
+            "cwd": "${workspaceFolder}",
             "environment": [],
             "console": "externalTerminal",
             "preLaunchTask": "examples"
@@ -47,7 +47,7 @@
             "program": "${workspaceFolder}/target/debug/examples/swap_chain.exe",
             "args": [],
             "stopAtEntry": false,
-            "cwd": "${fileDirname}",
+            "cwd": "${workspaceFolder}",
             "environment": [],
             "console": "externalTerminal",
             "preLaunchTask": "examples"
@@ -59,7 +59,7 @@
             "program": "${workspaceFolder}/target/debug/examples/triangle.exe",
             "args": [],
             "stopAtEntry": false,
-            "cwd": "${fileDirname}",
+            "cwd": "${workspaceFolder}",
             "environment": [],
             "console": "externalTerminal",
             "preLaunchTask": "examples"
@@ -71,7 +71,7 @@
             "program": "${workspaceFolder}/target/debug/examples/bindless.exe",
             "args": [],
             "stopAtEntry": false,
-            "cwd": "${fileDirname}",
+            "cwd": "${workspaceFolder}",
             "environment": [],
             "console": "externalTerminal",
             "preLaunchTask": "examples"
@@ -83,7 +83,7 @@
             "program": "${workspaceFolder}/target/debug/examples/bindful.exe",
             "args": [],
             "stopAtEntry": false,
-            "cwd": "${fileDirname}",
+            "cwd": "${workspaceFolder}",
             "environment": [],
             "console": "externalTerminal",
             "preLaunchTask": "examples"
@@ -95,7 +95,7 @@
             "program": "${workspaceFolder}/target/debug/examples/imgui_demo.exe",
             "args": [],
             "stopAtEntry": false,
-            "cwd": "${fileDirname}",
+            "cwd": "${workspaceFolder}",
             "environment": [],
             "console": "externalTerminal",
             "preLaunchTask": "examples"
@@ -107,7 +107,7 @@
             "program": "${workspaceFolder}/target/debug/examples/play_video.exe",
             "args": [],
             "stopAtEntry": false,
-            "cwd": "${fileDirname}",
+            "cwd": "${workspaceFolder}",
             "environment": [],
             "console": "externalTerminal",
             "preLaunchTask": "examples"
@@ -119,7 +119,7 @@
             "program": "${workspaceFolder}/target/debug/examples/resource_tests.exe",
             "args": ["--test-threads=1", "--nocapture"],
             "stopAtEntry": false,
-            "cwd": "${fileDirname}",
+            "cwd": "${workspaceFolder}",
             "environment": [],
             "console": "externalTerminal",
             "preLaunchTask": "examples"
@@ -131,7 +131,7 @@
             "program": "${workspaceFolder}/target/debug/examples/raytraced_triangle.exe",
             "args": [],
             "stopAtEntry": false,
-            "cwd": "${fileDirname}",
+            "cwd": "${workspaceFolder}",
             "environment": [],
             "console": "externalTerminal",
             "preLaunchTask": "examples"
@@ -143,7 +143,7 @@
             "program": "${workspaceFolder}/target/debug/deps/tests-9d060b7b8785eb4b.exe",
             "args": ["--test-threads=1", "--nocapture"],
             "stopAtEntry": false,
-            "cwd": "${fileDirname}",
+            "cwd": "${workspaceFolder}",
             "environment": [],
             "console": "externalTerminal",
         },

plugins/ecs/src/lib.rs

@@ -676,21 +676,37 @@ impl Plugin<gfx_platform::Device, os_platform::App> for BevyPlugin {
             let (open, selected) = client.imgui.combo_list("Demo", &demo_list, &self.session_info.active_demo);
             if open {
                 if selected != self.session_info.active_demo {
+                    // save current demo's camera and debug flags
+                    let old_demo = self.session_info.active_demo.clone();
+                    if let Some(camera) = self.session_info.main_camera {
+                        self.session_info.demo_cameras
+                            .get_or_insert_with(HashMap::new)
+                            .insert(old_demo.clone(), camera);
+                    }
+                    self.session_info.demo_debug_flags
+                        .get_or_insert_with(HashMap::new)
+                        .insert(old_demo, self.session_info.debug_draw_flags);
+
                     // update session info
                     self.session_info.active_demo = selected;
                     resetup = true;
                 }
             }
 
-            // camera type select
+            // save per-demo camera + debug draw defaults
             if client.imgui.button_size(font_awesome::strs::CAMERA, 32.0, 0.0) {
-                // save default
-                if self.session_info.default_cameras.is_none() {
-                    self.session_info.default_cameras = Some(HashMap::new());
+                let demo = self.session_info.active_demo.clone();
+                if let Some(camera) = self.session_info.main_camera {
+                    self.session_info.default_cameras
+                        .get_or_insert_with(HashMap::new)
+                        .insert(demo.clone(), camera);
+                    self.session_info.demo_cameras
+                        .get_or_insert_with(HashMap::new)
+                        .insert(demo.clone(), camera);
                 }
-                let default_cam_map = self.session_info.default_cameras.as_mut().unwrap();
-                let entry = default_cam_map.entry(self.session_info.active_demo.to_string()).or_default();
-                *entry = self.session_info.main_camera.unwrap();
+                self.session_info.demo_debug_flags
+                    .get_or_insert_with(HashMap::new)
+                    .insert(demo, self.session_info.debug_draw_flags);
             }
             client.imgui.same_line();
 
@@ -786,12 +802,21 @@ impl Plugin<gfx_platform::Device, os_platform::App> for BevyPlugin {
 
         // preform any re-setup actions
         if resetup {
-            // set camera to the default position for the selected demo
-            if let Some(default_cameras) = &self.session_info.default_cameras {
-                if default_cameras.contains_key(&self.session_info.active_demo) {
-                    self.session_info.main_camera = Some(default_cameras[&self.session_info.active_demo]);
-                }
+            let demo = &self.session_info.active_demo.clone();
+
+            // restore per-demo camera: demo_cameras takes priority, then default_cameras, then keep current
+            if let Some(cam) = self.session_info.demo_cameras.as_ref().and_then(|m| m.get(demo)) {
+                self.session_info.main_camera = Some(*cam);
+            } else if let Some(cam) = self.session_info.default_cameras.as_ref().and_then(|m| m.get(demo)) {
+                self.session_info.main_camera = Some(*cam);
             }
+
+            // restore per-demo debug draw flags
+            self.session_info.debug_draw_flags = self.session_info.demo_debug_flags
+                .as_ref()
+                .and_then(|m| m.get(demo).copied())
+                .unwrap_or_default();
+
             self.resetup(client);
         }
 

src/client.rs

@@ -219,10 +219,26 @@ impl<D, A> Client<D, A> where D: gfx::Device, A: os::App, D::RenderPipeline: gfx
             depth_stencil_heap_size: info.depth_stencil_heap_size,
         });
 
+        // validate saved window rect is visible on a connected monitor and clamp to keep title bar accessible
+        let monitors = app.enumerate_display_monitors();
+        let mut window_rect = user_config.main_window_rect;
+        let target_monitor = monitors.iter().find(|m| {
+            let mid_x = window_rect.x + window_rect.width / 2;
+            mid_x >= m.rect.x && mid_x < m.rect.x + m.rect.width
+        });
+        if let Some(monitor) = target_monitor {
+            // clamp position to keep the window within the monitor's work area (excludes taskbar)
+            let work = &monitor.client_rect;
+            window_rect.x = window_rect.x.max(work.x).min(work.x + work.width - window_rect.width);
+            window_rect.y = window_rect.y.max(work.y).min(work.y + work.height - window_rect.height);
+        } else {
+            window_rect = info.window_rect;
+        };
+
         // main window
         let main_window = app.create_window(os::WindowInfo {
             title: info.name.to_string(),
-            rect: user_config.main_window_rect,
+            rect: window_rect,
             style: os::WindowStyleFlags::NONE,
             parent_handle: None,
         });
@@ -403,25 +419,20 @@ impl<D, A> Client<D, A> where D: gfx::Device, A: os::App, D::RenderPipeline: gfx
         // track any changes and write once
         let mut invalidated = false;
 
-        // main window pos / size
-        let current = self.main_window.get_window_rect();
-        if current.x > 0 && current.y > 0 && self.user_config.main_window_rect != current {
-            self.user_config.main_window_rect = self.main_window.get_window_rect();
-            invalidated = true;
-        }
-
-        // console window pos / size
-        if let Some(console_window_rect) = self.user_config.console_window_rect {
-            let current = self.app.get_console_window_rect();
-            if current.x > 0 && current.y > 0 && console_window_rect != current {
-                self.user_config.console_window_rect = Some(self.app.get_console_window_rect());
+        // main window pos / size (skip if minimised to avoid saving bad coordinates)
+        if !self.main_window.is_minimised() {
+            let current = self.main_window.get_window_rect();
+            if self.user_config.main_window_rect != current {
+                self.user_config.main_window_rect = current;
                 invalidated = true;
             }
         }
-        else {
-            let current = self.app.get_console_window_rect();
-            if current.x > 0 && current.y > 0 {
-                self.user_config.console_window_rect = Some(self.app.get_console_window_rect());
+
+        // console window pos / size
+        let console_current = self.app.get_console_window_rect();
+        if console_current.width > 0 && console_current.height > 0 {
+            if self.user_config.console_window_rect != Some(console_current) {
+                self.user_config.console_window_rect = Some(console_current);
                 invalidated = true;
             }
         }

src/ecs_base.rs

@@ -79,7 +79,11 @@ pub struct SessionInfo {
     /// Default camera for a demo, can be set by the camera button in the UI
     pub default_cameras: Option<HashMap<String, CameraInfo>>,
     /// Debug draw flags
-    pub debug_draw_flags: DebugDrawFlags
+    pub debug_draw_flags: DebugDrawFlags,
+    /// Per-demo camera state, auto-saved on demo switch
+    pub demo_cameras: Option<HashMap<String, CameraInfo>>,
+    /// Per-demo debug draw flags, auto-saved on demo switch
+    pub demo_debug_flags: Option<HashMap<String, DebugDrawFlags>>,
 }
 
 /// This macro allows you to create a newtype which will automatically deref and deref_mut