diff --git a/src/App.tsx b/src/App.tsx index 7b093ff..98a951f 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,11 +1,11 @@ -import React, { useEffect, useState, Suspense, useMemo } from "react"; +import React, { Suspense, useEffect, useMemo } from "react"; import MainScene from "./scenes/MainScene"; import "./static/css/page.css"; import { Canvas } from "react-three-fiber"; import MediaPlayer from "./components/MediaScene/MediaPlayer"; import MediaScene from "./scenes/MediaScene"; import EventManager from "./core/StateManagers/EventManager"; -import { useMediaStore, useSceneStore } from "./store"; +import { useSceneStore } from "./store"; import GateScene from "./scenes/GateScene"; import BootScene from "./scenes/BootScene"; import SSknScene from "./scenes/SSknScene"; diff --git a/src/components/MainScene/SyncedComponents/MiddleRing.tsx b/src/components/MainScene/SyncedComponents/MiddleRing.tsx index 2ba88d6..ad10ca9 100644 --- a/src/components/MainScene/SyncedComponents/MiddleRing.tsx +++ b/src/components/MainScene/SyncedComponents/MiddleRing.tsx @@ -204,10 +204,6 @@ const MiddleRing = () => { } }); - useEffect(() => { - console.log(mainRingVisible); - }, [mainRingVisible]); - return ( { setPercentageElapsed(percentageElapsed); if (percentageElapsed === 100) { videoRef.current.currentTime = 0; - if (currentScene === "idle_media") { - setScene("main"); - } else if (currentScene === "end") { + if (currentScene === "end") { incrementEndMediaPlayedCount(); } else { if ( @@ -179,9 +177,6 @@ const MediaPlayer = () => { } ); } - if (videoRef.current) { - videoRef.current.play(); - } } } } diff --git a/src/core/StateManagers/EventManager.tsx b/src/core/StateManagers/EventManager.tsx index 51f8323..db1dc9b 100644 --- a/src/core/StateManagers/EventManager.tsx +++ b/src/core/StateManagers/EventManager.tsx @@ -146,6 +146,7 @@ const EventManager = () => { if ( timePassedSinceLastKeyPress.current > -1 && mainSubscene !== "pause" && + mainSubscene !== "level_selection" && currentScene === "main" ) { if (now > timePassedSinceLastKeyPress.current + 10000) { @@ -191,10 +192,10 @@ const EventManager = () => { const keyPress = getKeyCodeAssociation(keyCode); if (keyPress && !inputCooldown) { - timePassedSinceLastKeyPress.current = Date.now() + 2500; let event; switch (currentScene) { case "main": + timePassedSinceLastKeyPress.current = Date.now() + 2500; event = handleMainSceneEvent({ mainSubscene: mainSubscene, keyPress: keyPress, @@ -210,6 +211,7 @@ const EventManager = () => { }); break; case "media": + case "idle_media": event = handleMediaSceneEvent({ keyPress: keyPress, activeMediaComponent: activeMediaComponent, diff --git a/src/core/StateManagers/MainSceneManagers/IdleManager.tsx b/src/core/StateManagers/MainSceneManagers/IdleManager.tsx index ddc0b79..e6eb7fd 100644 --- a/src/core/StateManagers/MainSceneManagers/IdleManager.tsx +++ b/src/core/StateManagers/MainSceneManagers/IdleManager.tsx @@ -83,8 +83,6 @@ const IdleManager = (props: StateManagerProps) => { idleNodes.video[Math.floor(Math.random() * idleNodes.video.length)] ); } - - console.log('s') }, [setImages, setMedia] ); diff --git a/src/scenes/MediaScene.tsx b/src/scenes/MediaScene.tsx index f6055a7..783d58d 100644 --- a/src/scenes/MediaScene.tsx +++ b/src/scenes/MediaScene.tsx @@ -62,28 +62,18 @@ const MediaScene = () => { return ( - {currentScene !== "idle_media" ? ( - <> - - - - - - - - {activeNodeName.split("").map((letter, idx) => ( - - ))} - - - - ) : ( - <> - )} + + + + + + + + {activeNodeName.split("").map((letter, idx) => ( + + ))} + + {activeNodeMedia.includes("XA") || idleMedia.includes("XA") ? ( <> {currentScene !== "idle_media" ? ( diff --git a/src/scenes/TaKScene.tsx b/src/scenes/TaKScene.tsx index 476ab16..fbf4985 100644 --- a/src/scenes/TaKScene.tsx +++ b/src/scenes/TaKScene.tsx @@ -35,6 +35,7 @@ const TaKScene = () => { setAudioAnalyser(new THREE.AudioAnalyser(audio, 2048)); if (mediaElement) { + mediaElement.currentTime = 0; mediaElement.play(); setIsIntro(false); } diff --git a/src/store.ts b/src/store.ts index c1ec336..b1a3dcd 100644 --- a/src/store.ts +++ b/src/store.ts @@ -338,7 +338,7 @@ export const useNodeStore = create( ); export const useIdleStore = create((set) => ({ - media: undefined, + media: "INS01.STR", // this may be undefined depending on whether or not the media is audio or not images: undefined, setMedia: (to) => set(() => ({ media: to })),