From 4882e8de7231c976a0d5bb742156ca00c63091ce Mon Sep 17 00:00:00 2001 From: ad044 Date: Thu, 4 Mar 2021 17:30:13 +0400 Subject: [PATCH] added resize handling and mobile/tablet detection, fixed some stuff --- src/App.tsx | 60 +++++++++- src/components/InputHandler.tsx | 188 ++++++++++++++++-------------- src/scenes/ChangeDiscScene.tsx | 20 +++- src/scenes/MainScene.tsx | 4 +- src/store.ts | 4 +- src/types/types.ts | 1 + src/utils/mobileAndTabletCheck.ts | 19 +++ 7 files changed, 195 insertions(+), 101 deletions(-) create mode 100644 src/utils/mobileAndTabletCheck.ts diff --git a/src/App.tsx b/src/App.tsx index 0eaafa8..554148f 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,4 +1,10 @@ -import React, { Suspense, useEffect, useMemo } from "react"; +import React, { + Suspense, + useCallback, + useEffect, + useMemo, + useState, +} from "react"; import MainScene from "./scenes/MainScene"; import "./static/css/page.css"; import { Canvas } from "react-three-fiber"; @@ -14,6 +20,7 @@ import ChangeDiscScene from "./scenes/ChangeDiscScene"; import EndScene from "./scenes/EndScene"; import IdleMediaScene from "./scenes/IdleMediaScene"; import InputHandler from "./components/InputHandler"; +import mobileAndTabletCheck from "./utils/mobileAndTabletCheck"; const App = () => { const currentScene = useStore((state) => state.currentScene); @@ -39,8 +46,51 @@ const App = () => { [] ); + const [width, setWidth] = useState((window.screen.height / 1.8) * 1.3); + const [height, setHeight] = useState(window.screen.height / 1.8); + + const [isMobile, setIsMobile] = useState(false); + + const handleGameResize = useCallback((event) => { + switch (event.key) { + case "k": + setWidth((prevWidth) => prevWidth * 1.1); + setHeight((prevHeight) => prevHeight * 1.1); + break; + case "j": + setWidth((prevWidth) => prevWidth / 1.1); + setHeight((prevHeight) => prevHeight / 1.1); + } + }, []); + + const handleScreenResize = useCallback(() => { + const isMobile = mobileAndTabletCheck(); + if (!isMobile) { + const h = window.screen.height / 1.8; + setWidth(h * 1.3); + setHeight(h); + setIsMobile(false); + } else { + const h = window.screen.height / 1.05; + setHeight(h); + setWidth(h * 1.3); + setIsMobile(true); + } + }, []); + + useEffect(() => { + if (!isMobile) window.addEventListener("keydown", handleGameResize); + + window.addEventListener("resize", handleScreenResize); + + return () => { + window.removeEventListener("keydown", handleGameResize); + window.removeEventListener("resize", handleScreenResize); + }; + }, [handleGameResize, handleScreenResize, isMobile]); + return ( -
+
{ {/**/} {dispatchScene[currentScene as keyof typeof dispatchScene]} - + {["media", "idle_media", "tak", "end"].includes(currentScene) && ( - +
+ +
)}
); diff --git a/src/components/InputHandler.tsx b/src/components/InputHandler.tsx index c967b95..f28a882 100644 --- a/src/components/InputHandler.tsx +++ b/src/components/InputHandler.tsx @@ -26,7 +26,11 @@ import * as THREE from "three"; import { useGesture } from "react-use-gesture"; import IdleManager from "./IdleManager"; -const InputHandler = () => { +type InputHandlerProps = { + isMobile: boolean; +}; + +const InputHandler = (props: InputHandlerProps) => { const scene = useStore((state) => state.currentScene); const inputCooldown = useStore((state) => state.inputCooldown); @@ -166,98 +170,102 @@ const InputHandler = () => { return ( <> - - - + {props.isMobile && ( + <> + + + - - - + + + - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + )} { const disc1Tex = useLoader(THREE.TextureLoader, disc1); const disc2Tex = useLoader(THREE.TextureLoader, disc2); + const fixedTextures = useMemo(() => { + changeSiteTex.magFilter = THREE.NearestFilter; + + checkingInProgressTex.magFilter = THREE.NearestFilter; + + return { + changeSite: changeSiteTex, + checkingInProgress: checkingInProgressTex, + }; + }, [changeSiteTex, checkingInProgressTex]); + useEffect(() => { setTimeout(() => setScene("main"), 3500); }, [activeSite, setScene]); @@ -40,7 +51,7 @@ const ChangeDiscScene = () => { - + {[...Array(2).keys()].map((idx) => ( @@ -50,7 +61,10 @@ const ChangeDiscScene = () => { ))} - + {[...Array(7).keys()].map((idx) => ( diff --git a/src/scenes/MainScene.tsx b/src/scenes/MainScene.tsx index fee6a03..f5fdd46 100644 --- a/src/scenes/MainScene.tsx +++ b/src/scenes/MainScene.tsx @@ -1,4 +1,3 @@ -import { OrbitControls } from "@react-three/drei"; import React, { Suspense, useEffect, useRef, useState } from "react"; import { playAudio, useStore } from "../store"; import LevelSelection from "../components/MainScene/LevelSelection"; @@ -17,7 +16,7 @@ import * as audio from "../static/audio/sfx"; import Loading from "../components/Loading"; import usePrevious from "../hooks/usePrevious"; import MainSceneBackground from "../components/MainScene/Site/MainSceneBackground"; -import { useSpring, a } from "@react-spring/three"; +import { a, useSpring } from "@react-spring/three"; import Pause from "../components/MainScene/Pause/Pause"; const MainScene = () => { @@ -155,7 +154,6 @@ const MainScene = () => { > - diff --git a/src/store.ts b/src/store.ts index 3428c67..b0fed0c 100644 --- a/src/store.ts +++ b/src/store.ts @@ -112,7 +112,7 @@ export const useStore = create( combine( { // scene data - currentScene: "boot", + currentScene: "main", // game progress gameProgress: game_progress, @@ -323,6 +323,7 @@ export const useStore = create( activeLevel: userState.activeLevel, activeSite: userState.activeSite, gameProgress: userState.gameProgress, + playerName: userState.playerName, })), }) ) @@ -414,6 +415,7 @@ export const getCurrentUserState = (): UserSaveState => { activeLevel: state.activeLevel, activeSite: state.activeSite, gameProgress: state.gameProgress, + playerName: state.playerName, }; }; diff --git a/src/types/types.ts b/src/types/types.ts index c99e495..5c148b0 100644 --- a/src/types/types.ts +++ b/src/types/types.ts @@ -201,4 +201,5 @@ export type UserSaveState = { activeLevel: string; activeSite: ActiveSite; gameProgress: GameProgress; + playerName: string; }; diff --git a/src/utils/mobileAndTabletCheck.ts b/src/utils/mobileAndTabletCheck.ts new file mode 100644 index 0000000..14af6fd --- /dev/null +++ b/src/utils/mobileAndTabletCheck.ts @@ -0,0 +1,19 @@ +/* eslint-disable */ + +const mobileAndTabletCheck = () => { + let check = false; + (function (a) { + if ( + /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test( + a + ) || + /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test( + a.substr(0, 4) + ) + ) + check = true; + })(navigator.userAgent || navigator.vendor); + return check; +}; + +export default mobileAndTabletCheck;