From 51b4ac6cdf82d4c706ae83b4bca7f9c72b97abec Mon Sep 17 00:00:00 2001
From: Victor Giers <mail@victorgiers.com>
Date: Sat, 11 Apr 2026 04:37:19 +0200
Subject: [PATCH] Update scene handling logic in App.tsx

---
 src/app/App.tsx | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/app/App.tsx b/src/app/App.tsx
index 088efe68..f6635dfa 100644
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -6506,19 +6506,16 @@ export function App({ store, initialStatusMessage }: AppProps) {
     }
 
     try {
-      const nextRuntimeScene = buildRuntimeSceneFromDocument(
-        editorState.document,
-        {
-          navigationMode: preferredNavigationMode,
-          loadedModelAssets
-        }
+      const nextRuntimeScene = buildRuntimeSceneForProjectScene(
+        editorState.activeSceneId
       );
       const nextNavigationMode = preferredNavigationMode;
 
-      setRuntimeScene(nextRuntimeScene);
+      applyRuntimeSceneSession(editorState.activeSceneId, nextRuntimeScene);
       setRuntimeMessage(null);
       setFirstPersonTelemetry(null);
       setRuntimeInteractionPrompt(null);
+      setRuntimeGlobalState(createDefaultRuntimeGlobalState());
       setActiveNavigationMode(nextNavigationMode);
       store.enterPlayMode();
       setStatusMessage(
@@ -6533,6 +6530,10 @@ export function App({ store, initialStatusMessage }: AppProps) {
 
   const handleExitPlayMode = () => {
     setRuntimeScene(null);
+    setRuntimeSceneId(null);
+    setRuntimeSceneName(null);
+    setRuntimeSceneLoadingScreen(null);
+    setRuntimeGlobalState(createDefaultRuntimeGlobalState());
     setRuntimeMessage(null);
     setFirstPersonTelemetry(null);
     setRuntimeInteractionPrompt(null);