Skip to content

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

TypeScript

shufflabit

jonmatthisa2f06aa8e2d7
diff --git a/freemocap-ui/src/components/viewport3d/ImageMesh.tsx b/freemocap-ui/src/components/viewport3d/ImageMesh.tsx
index 290f01f1..9fb2a619 100644
--- a/freemocap-ui/src/components/viewport3d/ImageMesh.tsx
+++ b/freemocap-ui/src/components/viewport3d/ImageMesh.tsx
@@ -76,13 +76,19 @@ export const ImageMesh: React.FC<ImageMeshProps> = ({ cameraImageData, position
}, [cameraId, imageBitmap, imageWidth, imageHeight, frameNumber, aspectRatio, acknowledgeFrameRendered]);
// Calculate dimensions for the plane geometry
- const width = 2;
- const height = width / aspectRatio;
+ let meshWidth, meshHeight;
+ if (imageWidth >= imageHeight) {
+ const meshWidth = 2;
+ const meshHeight = meshWidth / aspectRatio;
+ } else {
+ const meshHeight = 2;
+ const meshWidth = meshHeight * aspectRatio;
+ }
return (
<mesh ref={meshRef} position={position}>
- <planeGeometry args={[width, height]} />
- <meshBasicMaterial transparent={true} />
+ <planeGeometry args={[imageWidth/300, imageHeight/300]} />
+ <meshBasicMaterial transparent={false} />
</mesh>
);
};
diff --git a/freemocap-ui/src/components/viewport3d/ThreeJsScene.tsx b/freemocap-ui/src/components/viewport3d/ThreeJsScene.tsx
index f8ff148f..92b1846d 100644
--- a/freemocap-ui/src/components/viewport3d/ThreeJsScene.tsx
+++ b/freemocap-ui/src/components/viewport3d/ThreeJsScene.tsx
@@ -16,21 +16,24 @@ export function ThreeJsScene() {
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 maxRowsColumns = Math.ceil(Math.sqrt(numberOfCameras))+1;
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 cameraIndex = cameraImageData?.cameraIndex ;
const columnIndex = cameraImageData?.cameraIndex % maxRowsColumns;
const rowIndex = Math.floor(cameraImageData?.cameraIndex / maxRowsColumns);
// Set spacing between cameras
- const verticalSpacing = 1.5;
+ const verticalSpacing = 2.5;
const horizontalSpacing = 2.2;
const verticalOffset = 1;
const xPosition = columnIndex * horizontalSpacing - horizontalSpacing; // Center the grid
const yPosition = rowIndex * verticalSpacing + verticalOffset;
+ // const xPosition = cameraIndex * horizontalSpacing - numberOfCameras/2; // Center the grid
+ // const yPosition = 2;//rowIndex * verticalSpacing + verticalOffset;
const zPosition = 0;
return [cameraId, [xPosition, yPosition, zPosition]];