From 16181153356c95a0352118efe21e46df5aa7d446 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Sun, 14 Jun 2026 00:01:44 +0100
Subject: [PATCH] Update notes and fix scene lifestyle issues

---
 NOTES.md                                                | 7 ++++---
 README.md                                               | 3 ++-
 src/prune/app/app.cpp                                   | 3 ++-
 src/prune/scene/artillery/artillery_scene.cpp           | 2 +-
 src/prune/scene/platformer/platformer_scene.cpp         | 2 +-
 src/prune/scene/scene.hpp                               | 4 ++++
 src/prune/scene/simple_shooter/simple_shooter_scene.cpp | 2 +-
 7 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/NOTES.md b/NOTES.md
index a117f05..f8d8c13 100644
--- a/NOTES.md
+++ b/NOTES.md
@@ -16,9 +16,10 @@ A selected object is not just a rectangle. It may be authored, runtime-created,
 
 ## Must do first
 
-- Keep player/controller ownership scene-specific unless a genuinely shared abstraction appears.
-- Introduce an editor command/change model before implementing undo/redo.
-- Keep undo/redo editor-only at first.
+- [x] Keep player/controller ownership scene-specific unless a genuinely shared abstraction appears.
+- [x] Introduce an editor command/change model before implementing undo/redo.
+- [x] Keep undo/redo editor-only at first.
+- [x] Keep scene activation separate from default scene creation so loading cannot be overwritten by `on_enter()`.
 
 ## Phase targets
 
diff --git a/README.md b/README.md
index c5b6dcc..78a1994 100644
--- a/README.md
+++ b/README.md
@@ -192,7 +192,8 @@ Current priorities:
 - [x] Command model for editor changes
 - [x] Undo/Redo on top of the command model
 - [x] Command history panel
-- [ ] Multi-select
+- [x] Multi-select
+- [x] Multi-select move/delete
 - [ ] Tool mode state
 - [ ] Scale tool
 - [ ] Basic audio hooks
diff --git a/src/prune/app/app.cpp b/src/prune/app/app.cpp
index c69ea32..540374f 100644
--- a/src/prune/app/app.cpp
+++ b/src/prune/app/app.cpp
@@ -28,6 +28,7 @@ namespace prune {
         m_input = std::make_unique<Input>();
         m_time = std::make_unique<Time>();
         m_scene = SceneFactory::create(SceneType::Platformer, m_window->width(), m_window->height());
+        m_scene->new_scene();
         m_scene->on_enter();
         m_ui = std::make_unique<Ui>();
 
@@ -99,7 +100,7 @@ namespace prune {
                         m_window->height()
                     );
 
-					m_scene->new_scene();
+                    m_scene->new_scene();
                     m_scene->on_enter();
                     m_ui->set_file_status("Created new scene", false);
                 }
diff --git a/src/prune/scene/artillery/artillery_scene.cpp b/src/prune/scene/artillery/artillery_scene.cpp
index b8925e8..e2873f0 100644
--- a/src/prune/scene/artillery/artillery_scene.cpp
+++ b/src/prune/scene/artillery/artillery_scene.cpp
@@ -82,7 +82,7 @@ namespace prune {
 
     void ArtilleryScene::on_enter()
     {
-        new_scene();
+        // Scene activation hook only. Default content is created explicitly via new_scene().
     }
 
     void ArtilleryScene::on_exit()
diff --git a/src/prune/scene/platformer/platformer_scene.cpp b/src/prune/scene/platformer/platformer_scene.cpp
index f1fb365..cd1c256 100644
--- a/src/prune/scene/platformer/platformer_scene.cpp
+++ b/src/prune/scene/platformer/platformer_scene.cpp
@@ -72,7 +72,7 @@ namespace prune {
 
     void PlatformerScene::on_enter()
     {
-        new_scene();
+        // Scene activation hook only. Default content is created explicitly via new_scene().
     }
 
     void PlatformerScene::on_exit()
diff --git a/src/prune/scene/scene.hpp b/src/prune/scene/scene.hpp
index 66919e2..4cef2f0 100644
--- a/src/prune/scene/scene.hpp
+++ b/src/prune/scene/scene.hpp
@@ -45,8 +45,12 @@ namespace prune {
         Scene(const Scene&) = delete;
         Scene& operator=(const Scene&) = delete;
 
+        // Called when an already-created scene becomes active. Must not create or restore default content.
         virtual void on_enter() = 0;
+
+        // Creates the default authored content for a new scene. Must not be called after loading a scene from disk.
         virtual void new_scene() = 0;
+
         virtual void on_exit() = 0;
         virtual void update(float dt, const Input& input) = 0;
         virtual void update_editor(float, const Input&) {}
diff --git a/src/prune/scene/simple_shooter/simple_shooter_scene.cpp b/src/prune/scene/simple_shooter/simple_shooter_scene.cpp
index f607ba8..49aec07 100644
--- a/src/prune/scene/simple_shooter/simple_shooter_scene.cpp
+++ b/src/prune/scene/simple_shooter/simple_shooter_scene.cpp
@@ -123,7 +123,7 @@ namespace prune {
 
     void SimpleShooterScene::on_enter()
     {
-        new_scene();
+        // Scene activation hook only. Default content is created explicitly via new_scene().
     }
 
     void SimpleShooterScene::on_exit()