[#5] Adjust render resolution dynamically
All checks were successful
Publish Docker Image / Publish Docker Image (push) Successful in 5s

This commit is contained in:
2025-05-05 22:45:37 -04:00
parent 25e55272d9
commit 53fa9c815f
4 changed files with 211 additions and 203 deletions

View File

@@ -19,6 +19,7 @@
"ajv": "^8.17.1", "ajv": "^8.17.1",
"ajv-formats": "^3.0.1", "ajv-formats": "^3.0.1",
"awesome-ajv-errors": "^5.1.0", "awesome-ajv-errors": "^5.1.0",
"lodash": "^4.17.21",
"next": "15.3.0", "next": "15.3.0",
"react": "^19.1.0", "react": "^19.1.0",
"react-dom": "^19.1.0", "react-dom": "^19.1.0",
@@ -28,6 +29,7 @@
"devDependencies": { "devDependencies": {
"@eslint/eslintrc": "^3", "@eslint/eslintrc": "^3",
"@tailwindcss/postcss": "^4", "@tailwindcss/postcss": "^4",
"@types/lodash": "^4",
"@types/node": "^20", "@types/node": "^20",
"@types/react": "^19", "@types/react": "^19",
"@types/react-dom": "^19", "@types/react-dom": "^19",

View File

@@ -8,6 +8,7 @@ import {
Text, Text,
Html, Html,
type PerspectiveCameraProps, type PerspectiveCameraProps,
PerformanceMonitor,
} from "@react-three/drei"; } from "@react-three/drei";
import { import {
animated as threeAnimated, animated as threeAnimated,
@@ -25,11 +26,10 @@ import {
Suspense, Suspense,
useCallback, useCallback,
type JSX, type JSX,
type Dispatch,
type SetStateAction,
} from "react"; } from "react";
import round from "lodash/round";
import Stack from "@/util/stack"; import Stack from "@/util/stack";
import { Canvas, useFrame } from "@react-three/fiber"; import { Canvas } from "@react-three/fiber";
import { mdiArrowLeftBold } from "@mdi/js"; import { mdiArrowLeftBold } from "@mdi/js";
import { Icon } from "@mdi/react"; import { Icon } from "@mdi/react";
import { PDF } from "../util/PDF"; import { PDF } from "../util/PDF";
@@ -51,28 +51,6 @@ const AnimatedButton = webAnimated.button as React.ComponentType<
React.ButtonHTMLAttributes<HTMLButtonElement> & { children?: React.ReactNode } React.ButtonHTMLAttributes<HTMLButtonElement> & { children?: React.ReactNode }
>; >;
function FpsUpdater({
onUpdate,
}: {
onUpdate: Dispatch<SetStateAction<number>>;
}) {
const fpsRef = useRef([0]);
useFrame((_, delta) => fpsRef.current.push(1 / delta));
useEffect(() => {
const id = setInterval(() => {
const avg =
fpsRef.current.reduce((a, b) => a + b, 0) / fpsRef.current.length;
fpsRef.current = [];
onUpdate(avg);
}, 1000);
return () => clearInterval(id);
}, [onUpdate]);
return null;
}
export function Scene(props: JSX.IntrinsicElements["group"]) { export function Scene(props: JSX.IntrinsicElements["group"]) {
const { nodes, materials } = useGLTF("/scene.glb") as unknown as GLTFResult; const { nodes, materials } = useGLTF("/scene.glb") as unknown as GLTFResult;
const { width, height } = useWindowSize(); const { width, height } = useWindowSize();
@@ -80,6 +58,7 @@ export function Scene(props: JSX.IntrinsicElements["group"]) {
// States // States
const [fps, setFps] = useState(0); const [fps, setFps] = useState(0);
const [dpr, setDpr] = useState(2);
const [pendingView, setPendingView] = useState<View | null>(null); const [pendingView, setPendingView] = useState<View | null>(null);
const [backHovered, setBackHovered] = useState(false); const [backHovered, setBackHovered] = useState(false);
const [backClicked, setBackClicked] = useState(false); const [backClicked, setBackClicked] = useState(false);
@@ -134,7 +113,6 @@ export function Scene(props: JSX.IntrinsicElements["group"]) {
precision: 0.0001, precision: 0.0001,
friction: 80, friction: 80,
mass: 10, mass: 10,
clamp: true,
}, },
}); });
@@ -147,10 +125,10 @@ export function Scene(props: JSX.IntrinsicElements["group"]) {
// Scene // Scene
return ( return (
<main className="h-screen w-screen overscroll-none touch-none bg-[#1b1b1b]"> <main className="h-screen w-screen overscroll-none touch-none bg-[#1b1b1b]">
<Loader />
{isWebGL2Available() ? ( {isWebGL2Available() ? (
width >= 1.5 * height ? ( width >= 1.5 * height ? (
<> <>
<Loader />
<div className="pointer-events-none fixed z-[999999999] size-full"> <div className="pointer-events-none fixed z-[999999999] size-full">
<AnimatedButton <AnimatedButton
style={{ style={{
@@ -178,198 +156,210 @@ export function Scene(props: JSX.IntrinsicElements["group"]) {
</AnimatedButton> </AnimatedButton>
<div className="min-w-12 text-white bottom-0 right-0 absolute m-3 p-1 text-xs text-right text-stroke-2 text-stroke-black paint-sfm"> <div className="min-w-12 text-white bottom-0 right-0 absolute m-3 p-1 text-xs text-right text-stroke-2 text-stroke-black paint-sfm">
<Info /> <Info />
{fps > 0 && <>{fps.toFixed(0)} fps</>} {fps > 0 && (
<>
{fps.toFixed(0)} fps | {dpr}x
</>
)}
</div> </div>
</div> </div>
<Canvas <Canvas
shadows shadows
dpr={dpr}
gl={{ localClippingEnabled: true, antialias: true, alpha: true }} gl={{ localClippingEnabled: true, antialias: true, alpha: true }}
> >
<Suspense fallback={null}> <Suspense fallback={null}>
<group {...props} dispose={null}> <group {...props} dispose={null}>
<FpsUpdater onUpdate={setFps} /> <PerformanceMonitor
<Environment preset="apartment" /> ms={100}
<AnimatedCam makeDefault {...cameraSpring} /> onChange={(api) => {
<Buttons setFps(api.fps);
menuTraversal={menuTraversal} setDpr(round(1.5 * api.factor + 0.5, 1));
setMenuTraversal={setMenuTraversal} }}
pendingView={pendingView}
setPendingView={setPendingView}
goPreviousView={goPreviousView}
currentView={currentView}
/>
<group>
<primitive
object={spotlight}
position={[-1.915, 20, 1.0925]}
/>
<primitive
object={spotlight.target}
position={[-1.915, 0, 1.0925]}
/>
</group>
<group
position={[2.50415, 0.12973, 3.47808]}
rotation={[0, -Math.PI / 2, 0]}
scale={0.01}
> >
<mesh <Environment preset="apartment" />
castShadow <AnimatedCam makeDefault {...cameraSpring} />
receiveShadow <Buttons
geometry={nodes.Monitor.geometry} menuTraversal={menuTraversal}
material={materials.PlasticMaterial} setMenuTraversal={setMenuTraversal}
position={[-175, 415.25, -160]} pendingView={pendingView}
> setPendingView={setPendingView}
<Html goPreviousView={goPreviousView}
transform currentView={currentView}
receiveShadow />
castShadow <group>
pointerEvents={ <primitive
currentView === View.PCView ? "auto" : "none" object={spotlight}
} position={[-1.915, 20, 1.0925]}
occlude="blending" />
className="w-[1452px] h-[810px] bg-[#0e1838]" <primitive
scale={10} object={spotlight.target}
position={[0, 170, 0.25]} position={[-1.915, 0, 1.0925]}
raycast={ />
currentView === View.DesktopView </group>
? () => null <group
: undefined position={[2.50415, 0.12973, 3.47808]}
} rotation={[0, -Math.PI / 2, 0]}
distanceFactor={10}
>
<div className="size-full">
<PCUI />
</div>
</Html>
</mesh>
</group>
<group
position={[4.105, 4.2825, -2.085]}
rotation={[0, -Math.PI / 2, 0]}
>
<mesh
castShadow
receiveShadow
geometry={nodes.SecondaryMonitorMesh.geometry}
material={materials.SecondaryMonitorMaterial}
scale={0.01} scale={0.01}
> >
<Credits currentView={currentView} /> <mesh
</mesh>
</group>
<group
position={[3.81024, 3.85444, 6.13972]}
rotation={[-Math.PI, -0.44331, -Math.PI]}
scale={0.035}
>
<mesh
castShadow
receiveShadow
geometry={nodes.Paper3.geometry}
material={materials.PaperMaterial}
>
<Html
transform
receiveShadow
castShadow castShadow
pointerEvents={
currentView === View.ResumeView ? "auto" : "none"
}
occlude="blending"
className="w-[800px] h-[1074px] bg-white"
scale={15}
position={[28.7765, 12.431875, 3.725]}
rotation={[-Math.PI / 2, 0, (1 * Math.PI) / 9]}
raycast={
currentView === View.ResumeView
? () => null
: undefined
}
distanceFactor={1}
>
<PDF url="/config/resume.pdf" />
</Html>
</mesh>
</group>
<group
position={[2.58559, 4.69855, 3.29056]}
rotation={[-Math.PI, -0.43633, -Math.PI]}
scale={0.02}
>
<mesh
castShadow
receiveShadow
geometry={nodes.CellphoneMesh.geometry}
material={materials.CellphoneMaterial}
position={[-102.64982, -21.45192, 247.01788]}
>
<Html
transform
receiveShadow receiveShadow
castShadow geometry={nodes.Monitor.geometry}
pointerEvents={ material={materials.PlasticMaterial}
currentView === View.CellphoneView ? "auto" : "none" position={[-175, 415.25, -160]}
}
occlude="blending"
className="w-[1008px] h-[1614px] bg-blue-100"
position={[0, 2.8, 0]}
rotation={[-Math.PI / 2, 0, Math.PI / 2]}
raycast={
currentView === View.CellphoneView
? () => null
: undefined
}
style={{
backgroundImage: "url('/assets/cellphone-bg.webp')",
backgroundColor: "black",
}}
distanceFactor={10}
> >
<CellphoneUI /> <Html
</Html> transform
</mesh> receiveShadow
</group> castShadow
<Text pointerEvents={
position={[-2.415, 12.5, -6]} currentView === View.PCView ? "auto" : "none"
font="/assets/inter-bold.ttf" }
color="black" occlude="blending"
fontSize={3} className="w-[1452px] h-[810px] bg-[#0e1838]"
> scale={10}
{config.name[0]} position={[0, 170, 0.5]}
</Text> raycast={
<Text currentView === View.DesktopView
position={[5.185, 12.5, 1.592]} ? () => null
font="/assets/inter-bold.ttf" : undefined
rotation={[0, -Math.PI / 2, 0]} }
color="black" distanceFactor={10}
fontSize={3} >
> <div className="size-full">
{config.name[1]} <PCUI />
</Text> </div>
{config.status && ( </Html>
</mesh>
</group>
<group
position={[4.105, 4.2825, -2.085]}
rotation={[0, -Math.PI / 2, 0]}
>
<mesh
castShadow
receiveShadow
geometry={nodes.SecondaryMonitorMesh.geometry}
material={materials.SecondaryMonitorMaterial}
scale={0.01}
>
<Credits currentView={currentView} />
</mesh>
</group>
<group
position={[3.81024, 3.85444, 6.13972]}
rotation={[-Math.PI, -0.44331, -Math.PI]}
scale={0.035}
>
<mesh
castShadow
receiveShadow
geometry={nodes.Paper3.geometry}
material={materials.PaperMaterial}
>
<Html
transform
receiveShadow
castShadow
pointerEvents={
currentView === View.ResumeView ? "auto" : "none"
}
occlude="blending"
className="w-[800px] h-[1074px] bg-white"
scale={15}
position={[28.7765, 12.431875, 3.725]}
rotation={[-Math.PI / 2, 0, (1 * Math.PI) / 9]}
raycast={
currentView === View.ResumeView
? () => null
: undefined
}
distanceFactor={1}
>
<PDF url="/config/resume.pdf" />
</Html>
</mesh>
</group>
<group
position={[2.58559, 4.69855, 3.29056]}
rotation={[-Math.PI, -0.43633, -Math.PI]}
scale={0.02}
>
<mesh
castShadow
receiveShadow
geometry={nodes.CellphoneMesh.geometry}
material={materials.CellphoneMaterial}
position={[-102.64982, -21.45192, 247.01788]}
>
<Html
transform
receiveShadow
castShadow
pointerEvents={
currentView === View.CellphoneView ? "auto" : "none"
}
occlude="blending"
className="w-[1008px] h-[1614px] bg-blue-100"
position={[0, 2.85, 0]}
rotation={[-Math.PI / 2, 0, Math.PI / 2]}
raycast={
currentView === View.CellphoneView
? () => null
: undefined
}
style={{
backgroundImage: "url('/assets/cellphone-bg.webp')",
backgroundColor: "black",
}}
distanceFactor={10}
>
<CellphoneUI />
</Html>
</mesh>
</group>
<Text <Text
position={[5.185, 10, 1.592]} position={[-2.415, 12.5, -6]}
font="/assets/inter.ttf" font="/assets/inter-bold.ttf"
color="black"
fontSize={3}
>
{config.name[0]}
</Text>
<Text
position={[5.185, 12.5, 1.592]}
font="/assets/inter-bold.ttf"
rotation={[0, -Math.PI / 2, 0]} rotation={[0, -Math.PI / 2, 0]}
color="black" color="black"
fontSize={0.75} fontSize={3}
> >
{config.status} {config.name[1]}
</Text> </Text>
)} {config.status && (
{config.location && ( <Text
<Text position={[5.185, 10, 1.592]}
position={[5.185, 8.5, 1.592]} font="/assets/inter.ttf"
font="/assets/inter.ttf" rotation={[0, -Math.PI / 2, 0]}
rotation={[0, -Math.PI / 2, 0]} color="black"
color="black" fontSize={0.75}
fontSize={0.75} >
> {config.status}
📍&#8201;{config.location} </Text>
</Text> )}
)} {config.location && (
<StaticMeshes nodes={nodes} materials={materials} /> <Text
position={[5.185, 8.5, 1.592]}
font="/assets/inter.ttf"
rotation={[0, -Math.PI / 2, 0]}
color="black"
fontSize={0.75}
>
📍&#8201;{config.location}
</Text>
)}
<StaticMeshes nodes={nodes} materials={materials} />
</PerformanceMonitor>
</group> </group>
</Suspense> </Suspense>
</Canvas> </Canvas>
@@ -380,9 +370,9 @@ export function Scene(props: JSX.IntrinsicElements["group"]) {
config.fallbackUrl ? "pt-12" : "" config.fallbackUrl ? "pt-12" : ""
} flex flex-col space-y-6 w-screen h-screen text-center justify-center items-center text-white text-4xl`} } flex flex-col space-y-6 w-screen h-screen text-center justify-center items-center text-white text-4xl`}
> >
<p>Screen too small, please rotate</p> <p className="mx-8">Screen too small, please rotate</p>
{config.fallbackUrl && ( {config.fallbackUrl && (
<p className="text-base"> <p className="text-base mx-8">
or visit the{" "} or visit the{" "}
<a <a
href={config.fallbackUrl} href={config.fallbackUrl}

View File

@@ -15,7 +15,7 @@ export const Credits = ({ currentView }: CreditsProps) => {
occlude="blending" occlude="blending"
className="w-[1452px] h-[810px] bg-neutral-400" className="w-[1452px] h-[810px] bg-neutral-400"
scale={10} scale={10}
position={[0, 170, 0.25]} position={[0, 170, 0.5]}
raycast={currentView === View.CreditsView ? () => null : undefined} raycast={currentView === View.CreditsView ? () => null : undefined}
distanceFactor={10} distanceFactor={10}
> >

View File

@@ -1021,6 +1021,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/lodash@npm:^4":
version: 4.17.16
resolution: "@types/lodash@npm:4.17.16"
checksum: 10c0/cf017901b8ab1d7aabc86d5189d9288f4f99f19a75caf020c0e2c77b8d4cead4db0d0b842d009b029339f92399f49f34377dd7c2721053388f251778b4c23534
languageName: node
linkType: hard
"@types/node@npm:^20": "@types/node@npm:^20":
version: 20.17.30 version: 20.17.30
resolution: "@types/node@npm:20.17.30" resolution: "@types/node@npm:20.17.30"
@@ -3868,6 +3875,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"lodash@npm:^4.17.21":
version: 4.17.21
resolution: "lodash@npm:4.17.21"
checksum: 10c0/d8cbea072bb08655bb4c989da418994b073a608dffa608b09ac04b43a791b12aeae7cd7ad919aa4c925f33b48490b5cfe6c1f71d827956071dae2e7bb3a6b74c
languageName: node
linkType: hard
"loose-envify@npm:^1.0.0, loose-envify@npm:^1.4.0": "loose-envify@npm:^1.0.0, loose-envify@npm:^1.4.0":
version: 1.4.0 version: 1.4.0
resolution: "loose-envify@npm:1.4.0" resolution: "loose-envify@npm:1.4.0"
@@ -4535,6 +4549,7 @@ __metadata:
"@react-three/drei": "npm:^10.0.7" "@react-three/drei": "npm:^10.0.7"
"@react-three/fiber": "npm:^9.1.2" "@react-three/fiber": "npm:^9.1.2"
"@tailwindcss/postcss": "npm:^4" "@tailwindcss/postcss": "npm:^4"
"@types/lodash": "npm:^4"
"@types/node": "npm:^20" "@types/node": "npm:^20"
"@types/react": "npm:^19" "@types/react": "npm:^19"
"@types/react-dom": "npm:^19" "@types/react-dom": "npm:^19"
@@ -4544,6 +4559,7 @@ __metadata:
awesome-ajv-errors: "npm:^5.1.0" awesome-ajv-errors: "npm:^5.1.0"
eslint: "npm:^9" eslint: "npm:^9"
eslint-config-next: "npm:15.3.0" eslint-config-next: "npm:15.3.0"
lodash: "npm:^4.17.21"
next: "npm:15.3.0" next: "npm:15.3.0"
react: "npm:^19.1.0" react: "npm:^19.1.0"
react-dom: "npm:^19.1.0" react-dom: "npm:^19.1.0"