merge mission & intro

src/world/World.tsx

@@ -1,4 +1,4 @@
-import { Suspense } from "react";
+import { Suspense, useEffect } from "react";
 import { Physics } from "@react-three/rapier";
 import {
   PLAYER_SPAWN_POSITION_GAME,
@@ -8,6 +8,7 @@ import { useCameraMode } from "@/hooks/debug/useCameraMode";
 import { useSceneMode } from "@/hooks/debug/useSceneMode";
 import { useHandTrackingSnapshot } from "@/hooks/handTracking/useHandTrackingSnapshot";
 import { useWorldSceneLoading } from "@/hooks/world/useWorldSceneLoading";
+import { useGameStore } from "@/managers/stores/useGameStore";
 import { GameFlow } from "@/components/game/GameFlow";
 import {
   ZoneDebugVisuals,
@@ -33,23 +34,19 @@ interface WorldProps {
   onLoadingStateChange?: SceneLoadingChangeHandler | undefined;
 }
 
-function hasBootFlag(name: string): boolean {
-  if (typeof window === "undefined") return false;
-  return new URLSearchParams(window.location.search).has(name);
-}
-
 export function World({ onLoadingStateChange }: WorldProps): React.JSX.Element {
   const cameraMode = useCameraMode();
   const sceneMode = useSceneMode();
+  const mainState = useGameStore((state) => state.mainState);
   const { status, usageStatus } = useHandTrackingSnapshot();
-  const { octree, showGameStage, handleGameMapLoaded, handleOctreeReady } =
-    useWorldSceneLoading({ sceneMode, onLoadingStateChange });
-  const noCinematics = hasBootFlag("noCinematics");
-  const noDialogues = hasBootFlag("noDialogues");
-  const noMap = hasBootFlag("noMap");
-  const noMusic = hasBootFlag("noMusic");
-  const noOctree = hasBootFlag("noOctree");
-  const noPlayer = hasBootFlag("noPlayer");
+  const {
+    octree,
+    gameplayReady,
+    showGameStage,
+    handleGameStageLoaded,
+    handleGameMapLoaded,
+    handleOctreeReady,
+  } = useWorldSceneLoading({ sceneMode, onLoadingStateChange });
   const playerSpawnPosition =
     sceneMode === "game"
       ? PLAYER_SPAWN_POSITION_GAME
@@ -57,6 +54,9 @@ export function World({ onLoadingStateChange }: WorldProps): React.JSX.Element {
   const showHandTrackingGloves =
     sceneMode === "physics" ||
     (status !== "idle" && usageStatus !== "inactive");
+  const spawnPlayer =
+    cameraMode !== "debug" &&
+    (sceneMode === "game" ? gameplayReady : octree !== null);
 
   return (
     <>
@@ -77,30 +77,41 @@ export function World({ onLoadingStateChange }: WorldProps): React.JSX.Element {
           <ZoneDebugVisuals />
           <NPCHelper position={[1, 12, -55]} />
           <PyloneDestroyed position={[1, 15, -45]} />
-          {noMusic ? null : <GameMusic />}
-          {noCinematics ? null : <GameCinematics />}
-          {noDialogues ? null : <GameDialogues />}
-          {noMap ? null : (
-            <GameMap
-              buildOctree={!noOctree}
-              onLoaded={handleGameMapLoaded}
-              onLoadingStateChange={onLoadingStateChange}
-              onOctreeReady={handleOctreeReady}
-            />
-          )}
-          {noMap || showGameStage ? (
+          <GameMap
+            onLoaded={handleGameMapLoaded}
+            onLoadingStateChange={onLoadingStateChange}
+            onOctreeReady={handleOctreeReady}
+          />
+          {showGameStage ? (
             <Physics>
+              <GameStageLoaded onLoaded={handleGameStageLoaded} />
               <GameStageContent />
             </Physics>
           ) : null}
+          {spawnPlayer ? (
+            <>
+              <GameMusic />
+              {mainState === "outro" ? <GameCinematics /> : null}
+              <GameDialogues />
+              <Player octree={octree} spawnPosition={playerSpawnPosition} />
+            </>
+          ) : null}
         </>
       ) : (
         <TestMap onOctreeReady={handleOctreeReady} />
       )}
 
-      {cameraMode !== "debug" && !noPlayer ? (
+      {sceneMode !== "game" && spawnPlayer ? (
         <Player octree={octree} spawnPosition={playerSpawnPosition} />
       ) : null}
     </>
   );
 }
+
+function GameStageLoaded({ onLoaded }: { onLoaded: () => void }): null {
+  useEffect(() => {
+    onLoaded();
+  }, [onLoaded]);
+
+  return null;
+}