Skip to content

Free Motion Capture for Everyone πŸ’€βœ¨

TypeScript

flipped and whatnot

jonmatthis50a47f88cba2
diff --git a/freemocap-ui/src/components/viewport3d/ImageMesh.tsx b/freemocap-ui/src/components/viewport3d/ImageMesh.tsx
index fb946922..290f01f1 100644
--- a/freemocap-ui/src/components/viewport3d/ImageMesh.tsx
+++ b/freemocap-ui/src/components/viewport3d/ImageMesh.tsx
@@ -2,10 +2,11 @@ import React, { useEffect, useRef, useState } from 'react';
import * as THREE from 'three';
import { CameraImageData } from "@/context/websocket-context/useWebsocketBinaryMessageProcessor";
import { useWebSocketContext } from "@/context/websocket-context/WebSocketContext";
+import {Vector3} from "three";
interface ImageMeshProps {
cameraImageData: CameraImageData;
- position: [number, number, number];
+ position: [number, number, number];
}
export const ImageMesh: React.FC<ImageMeshProps> = ({ cameraImageData, position }) => {
@@ -20,8 +21,16 @@ export const ImageMesh: React.FC<ImageMeshProps> = ({ cameraImageData, position
// Create texture only once and reuse it
if (!textureRef.current) {
const newTexture = new THREE.Texture();
+ // Set Color Management
newTexture.minFilter = THREE.LinearFilter;
newTexture.magFilter = THREE.LinearFilter;
+
+ // Do a buncha weird nonsense to get the image to show up correctly in the scene
+ newTexture.wrapS = THREE.RepeatWrapping;
+ newTexture.repeat.x = -1; // Flip texture horizontally
+ newTexture.center = new THREE.Vector2(0.5, 0.5);
+ newTexture.rotation = Math.PI;
+ newTexture.flipY = false;
textureRef.current = newTexture;
}
@@ -47,6 +56,8 @@ export const ImageMesh: React.FC<ImageMeshProps> = ({ cameraImageData, position
// Update texture with new image data without creating a new texture
textureRef.current.image = imageBitmap;
+ textureRef.current.flipY = true;
+
textureRef.current.needsUpdate = true;
// Apply texture to material if not already applied
@@ -74,4 +85,4 @@ export const ImageMesh: React.FC<ImageMeshProps> = ({ cameraImageData, position
<meshBasicMaterial transparent={true} />
</mesh>
);
-};
\ No newline at end of file
+};
diff --git a/freemocap-ui/src/components/viewport3d/ThreeJsScene.tsx b/freemocap-ui/src/components/viewport3d/ThreeJsScene.tsx
index 8530e26d..f8ff148f 100644
--- a/freemocap-ui/src/components/viewport3d/ThreeJsScene.tsx
+++ b/freemocap-ui/src/components/viewport3d/ThreeJsScene.tsx
@@ -13,16 +13,29 @@ export function ThreeJsScene() {
const cameraRefs = useRef<PerspectiveCamera[]>([]);
const latestPoints3d = {} // dummy for now
const numPoints = Object.keys(latestPoints3d).length;
-
+ const numberOfCameras = Object.keys(latestCameraData).length;
const sphereGeometry = useMemo(() => new SphereGeometry(0.1, 16, 16), []);
const sphereMaterial = useMemo(() => new MeshStandardMaterial({color: 'red'}), []);
+ const maxRowsColumns = Math.ceil(Math.sqrt(numberOfCameras));
+
+ const cameraPositionsMap = Object.fromEntries(
+ Object.entries(latestCameraData).map(([cameraId, cameraImageData]) => {
+ // Calculate position in a grid with max columns based on sqrt of camera count
+ const columnIndex = cameraImageData?.cameraIndex % maxRowsColumns;
+ const rowIndex = Math.floor(cameraImageData?.cameraIndex / maxRowsColumns);
+
+ // Set spacing between cameras
+ const verticalSpacing = 1.5;
+ const horizontalSpacing = 2.2;
+ const verticalOffset = 1;
+
+ const xPosition = columnIndex * horizontalSpacing - horizontalSpacing; // Center the grid
+ const yPosition = rowIndex * verticalSpacing + verticalOffset;
+ const zPosition = 0;
- const cameraPositions = [
- [3, 1, 3],
- [-3, 1, 3],
- [3, 1, -3],
- [-3, 1, -3],
- ]
+ return [cameraId, [xPosition, yPosition, zPosition]];
+ })
+ );
useFrame(() => {
// Make the camera look at the origin (0, 0, 0)
@@ -36,16 +49,16 @@ export function ThreeJsScene() {
return (
<>
<CameraControls makeDefault/>
- {cameraPositions.map((position, index) => (
- <perspectiveCamera
- key={index}
- ref={el => cameraRefs.current[index] = el!}
- // @ts-ignore
- position={position}
- near={0.1}
- far={1}
- />
- ))}
+ {/*{cameraPositions.map((position, index) => (*/}
+ {/* <perspectiveCamera*/}
+ {/* key={index}*/}
+ {/* ref={el => cameraRefs.current[index] = el!}*/}
+ {/* // @ts-ignore*/}
+ {/* position={position}*/}
+ {/* near={0.1}*/}
+ {/* far={1}*/}
+ {/* />*/}
+ {/*))}*/}
{cameraRefs.current.map((camera, index) => camera && (
<cameraHelper key={index} args={[camera]} />
))}
@@ -75,7 +88,7 @@ export function ThreeJsScene() {
<ImageMesh
key={cameraId}
cameraImageData={cameraImageData}
- position={[index * 2.5, 1, 0]}
+ position={cameraPositionsMap[cameraId] as [number, number, number] }
/>
) : null
)}