Free Motion Capture for Everyone πβ¨
TypeScript
can't figure out how to keep renderer context across page loads :(
jonmatthis266d829cb3f2
diff --git a/freemocap-ui/src/components/viewport3d/PersistentThreeJsCanvas.tsx b/freemocap-ui/src/components/viewport3d/PersistentThreeJsCanvas.tsxnew file mode 100644index 00000000..324bb0ad--- /dev/null+++ b/freemocap-ui/src/components/viewport3d/PersistentThreeJsCanvas.tsx@@ -0,0 +1,52 @@++import * as THREE from 'three';+import {useEffect} from "react";+import {Canvas} from "@react-three/fiber";+import {ThreeJsScene} from "@/components/viewport3d/ThreeJsScene";+import ReactDOM from "react-dom";++let renderer: THREE.WebGLRenderer | null = null;+function getRenderer() {+ if (!renderer) {+ renderer = new THREE.WebGLRenderer({ antialias: true });+ renderer.setSize(window.innerWidth, window.innerHeight);+ document.body.appendChild(renderer.domElement);+ }+ return renderer;+}++export const PersistentThreeJsCanvas: React.FC = () => {+ useEffect(() => {+ let portalRoot = document.getElementById('threejs-root');++ if (!portalRoot) {+ portalRoot = document.createElement('div');+ portalRoot.id = 'threejs-root';+ document.body.appendChild(portalRoot);+ }++ const renderer = getRenderer();++ //handle window resize+ const handleWindowResize = () => {+ renderer.setSize(window.innerWidth, window.innerHeight);+ };++ window.addEventListener('resize', handleWindowResize)++ return () => {+ window.removeEventListener('resize', handleWindowResize)+ };+ }, []);++ const portalRoot = document.getElementById('threejs-root');++ if (!portalRoot) return null;++ return ReactDOM.createPortal(+ <Canvas shadows camera={{position: [5,5,5], fov:75}}>+ <ThreeJsScene/>+ </Canvas>,+ portalRoot+ )+}diff --git a/freemocap-ui/src/components/viewport3d/ThreeJSCanvas3d.tsx b/freemocap-ui/src/components/viewport3d/ThreeJSCanvas3d.tsxdeleted file mode 100644index 90ee31b0..00000000--- a/freemocap-ui/src/components/viewport3d/ThreeJSCanvas3d.tsx+++ /dev/null@@ -1,76 +0,0 @@-import {Canvas} from "@react-three/fiber";-import {CameraControls, Grid} from "@react-three/drei";-import {Axes3dArrows} from "@/components/viewport3d/Axes3dArrows";-import {useWebSocketContext} from "@/context/WebSocketContext";-import {ImageMesh} from "@/components/viewport3d/ImageMesh";-import {useEffect, useRef} from "react";-import {InstancedMesh, Matrix4, MeshStandardMaterial, SphereGeometry} from "three";--export function ThreeJSCanvas3d() {- const {latestImages, latestPoints3d} = useWebSocketContext();- const sphereRef = useRef<InstancedMesh>(null);- const numPoints = Object.keys(latestPoints3d || {}).length-- useEffect(() => {- if (sphereRef.current && latestPoints3d) {- let index = 0;- Object.entries(latestPoints3d).forEach(([key, point]) => {- if (point && point.length === 3) {- const [x, y, z] = point;- if (x !== null && y !== null && z !== null) {- const matrix = new Matrix4();- matrix.setPosition(x, y, z);- sphereRef.current?.setMatrixAt(index, matrix);- index++;- }- }- });- sphereRef.current.instanceMatrix.needsUpdate = true;- }- }, [latestPoints3d]);-- return (- <div className="h-screen w-screen">- <Canvas shadows camera={{position: [5, 5, 5], fov: 75}}>- <CameraControls makeDefault/>- {/*<Environment preset="studio" />*/}- <ambientLight intensity={0.1}/>- <directionalLight- castShadow- position={[0, 0.01, 0]}- intensity={.1}- shadow-mapSize={1024}- />- <Grid- renderOrder={-1}- position={[0, -.01, 0]}- infiniteGrid- cellSize={1}- cellThickness={0.5}- sectionSize={3}- sectionThickness={1}- // @ts-ignore- sectionColor={[0.5, 0., 0.5]}- fadeDistance={20}- />- <Axes3dArrows/>-- {latestImages &&- Object.entries(latestImages).map(([cameraId, base64Image], index) =>- base64Image ? (- <ImageMesh- key={cameraId}- imageUrl={`data:/image?jpeg;base64,${base64Image}`}- position={[index * 2.5, 1, 0]}- />- ) : null- )}- {numPoints > 0 && (- <instancedMesh ref={sphereRef}- args={[new SphereGeometry(0.05, 16, 16),- new MeshStandardMaterial({color: 'red'}), numPoints]}/>- )}- </Canvas>- </div>- );-}diff --git a/freemocap-ui/src/components/viewport3d/ThreeJsCanvas.tsx b/freemocap-ui/src/components/viewport3d/ThreeJsCanvas.tsxnew file mode 100644index 00000000..988791d4--- /dev/null+++ b/freemocap-ui/src/components/viewport3d/ThreeJsCanvas.tsx@@ -0,0 +1,43 @@+import {Canvas} from "@react-three/fiber";+import {ThreeJsScene} from "@/components/viewport3d/ThreeJsScene";+import * as THREE from "three";+import {useEffect, useRef} from "react";+++let renderer: THREE.WebGLRenderer | null = null;++function getRenderer() {+ if (!renderer) {+ renderer = new THREE.WebGLRenderer({antialias: true});+ renderer.setSize(window.innerWidth, window.innerHeight);+ document.body.appendChild(renderer.domElement);+ }+ return renderer;+}++export function ThreeJsCanvas() {+ // const canvasRef = useRef(null);+ // useEffect(() => {+ // const currentRenderer = getRenderer();+ // return () => {+ // // Optionally, you can detach the renderer on unmount+ // // currentRenderer.dispose();+ // };+ // }, []);++ return (+ // <div className="h-screen w-screen" ref={canvasRef}>+ <div className="h-screen w-screen" >+ <Canvas+ shadows+ camera={{position: [5, 5, 5], fov: 75}}+ // gl={getRenderer()}+ >+ <ThreeJsScene/>+ </Canvas>+ </div>+ );+}+++diff --git a/freemocap-ui/src/components/viewport3d/ThreeJsScene.tsx b/freemocap-ui/src/components/viewport3d/ThreeJsScene.tsxnew file mode 100644index 00000000..9c4d6e09--- /dev/null+++ b/freemocap-ui/src/components/viewport3d/ThreeJsScene.tsx@@ -0,0 +1,73 @@+import {useWebSocketContext} from "@/context/WebSocketContext";+import {useMemo, useRef} from "react";+import {InstancedMesh, Matrix4, MeshStandardMaterial, SphereGeometry} from "three";+import {useFrame} from "@react-three/fiber";+import {CameraControls, Grid} from "@react-three/drei";+import {Axes3dArrows} from "@/components/viewport3d/Axes3dArrows";+import {ImageMesh} from "@/components/viewport3d/ImageMesh";++export function ThreeJsScene() {+ const {latestImages, latestPoints3d} = useWebSocketContext();+ const sphereRef = useRef<InstancedMesh>(null);+ const numPoints = Object.keys(latestPoints3d || {}).length;++ const sphereGeometry = useMemo(() => new SphereGeometry(0.1, 16, 16), []);+ const sphereMaterial = useMemo(() => new MeshStandardMaterial({color: 'red'}), []);++ useFrame(() => {+ if (sphereRef.current && latestPoints3d) {+ let index = 0;+ Object.entries(latestPoints3d).forEach(([key, point]) => {+ if (point && point.length === 3) {+ const [x, y, z] = point;+ if (x !== null && y !== null && z !== null) {+ const matrix = new Matrix4();+ matrix.setPosition(x, y, z);+ sphereRef.current?.setMatrixAt(index, matrix);+ index++;+ }+ }+ });+ sphereRef.current.instanceMatrix.needsUpdate = true;+ }+ });++ return (+ <>+ <CameraControls makeDefault/>+ <ambientLight intensity={0.1}/>+ <directionalLight+ castShadow+ position={[0, 0.01, 0]}+ intensity={0.1}+ shadow-mapSize={1024}+ />+ <Grid+ renderOrder={-1}+ position={[0, -0.01, 0]}+ infiniteGrid+ cellSize={1}+ cellThickness={0.5}+ sectionSize={3}+ sectionThickness={1}+ //@ts-ignore+ sectionColor={[0.5, 0, 0.5]}+ fadeDistance={20}+ />+ <Axes3dArrows/>+ {latestImages &&+ Object.entries(latestImages).map(([cameraId, base64Image], index) =>+ base64Image ? (+ <ImageMesh+ key={cameraId}+ imageUrl={`data:/image?jpeg;base64,${base64Image}`}+ position={[index * 2.5, 1, 0]}+ />+ ) : null+ )}+ {numPoints > 0 && (+ <instancedMesh ref={sphereRef} args={[sphereGeometry, sphereMaterial, numPoints]}/>+ )}+ </>+ );+}diff --git a/freemocap-ui/src/views/Viewport3d.tsx b/freemocap-ui/src/views/Viewport3d.tsxindex 9d2eb2a3..1a3fa188 100644--- a/freemocap-ui/src/views/Viewport3d.tsx+++ b/freemocap-ui/src/views/Viewport3d.tsx@@ -1,16 +1,12 @@-import {Box, Button} from "@mui/material";+import {Box} from "@mui/material";import React from "react";-import {ConnectToCamerasButton} from "@/components/ui-components/ConnectToCamerasButton";-import {useWebSocketContext} from "@/context/WebSocketContext";-import {ThreeJSCanvas3d} from "@/components/viewport3d/ThreeJSCanvas3d";-export const Viewport3d = () => {- const { latestFrontendPayload } = useWebSocketContext();+import {ThreeJsCanvas} from "@/components/viewport3d/ThreeJsCanvas";+export const Viewport3d = () => {return (- <Box sx={{ display: "flex", flexDirection: "column", height: "81vh" }}>-- <ThreeJSCanvas3d />-+ <Box sx={{display: "flex", flexDirection: "column", height: "81vh"}}>+ {/*<ThreeJSCanvas/>*/}+ <ThreeJsCanvas/></Box>);}