Skip to content

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

TypeScript

images in threeJS scene don't update after initial mount, but w/e fn

jonmatthis241328ded7a6
diff --git a/freemocap-ui/src/components/PauseUnpauseButton.tsx b/freemocap-ui/src/components/PauseUnpauseButton.tsx
index 3166d8b0..51b1db43 100644
--- a/freemocap-ui/src/components/PauseUnpauseButton.tsx
+++ b/freemocap-ui/src/components/PauseUnpauseButton.tsx
@@ -67,7 +67,7 @@ export const PauseUnpauseButton: React.FC<PauseUnpauseButtonProps> = ({
};
const handlePause = () => {
- const pauseUrl = urlService.getCameraUrls().pauseCameras;
+ const pauseUrl = urlService.getSkellycamUrls().pauseCameras;
handleApiCall(pauseUrl, () => {
console.log('Paused successfully');
setIsPaused(true);
@@ -75,7 +75,7 @@ export const PauseUnpauseButton: React.FC<PauseUnpauseButtonProps> = ({
};
const handleUnpause = () => {
- const unpauseUrl = urlService.getCameraUrls().unpauseCameras;
+ const unpauseUrl = urlService.getSkellycamUrls().unpauseCameras;
handleApiCall(unpauseUrl, () => {
console.log('Unpaused successfully');
setIsPaused(false);
diff --git a/freemocap-ui/src/components/camera-views/og-canvas-strategy/CameraImage.tsx b/freemocap-ui/src/components/camera-views/og-canvas-strategy/CameraImage.tsx
index 8c42662b..92ed06bb 100644
--- a/freemocap-ui/src/components/camera-views/og-canvas-strategy/CameraImage.tsx
+++ b/freemocap-ui/src/components/camera-views/og-canvas-strategy/CameraImage.tsx
@@ -1,73 +1,70 @@
import { Box, Typography } from "@mui/material";
-import React, { useRef, useMemo } from "react";
+import React, { useRef, useEffect } from "react";
import { CameraImageData } from "@/context/websocket-context/useWebsocketBinaryMessageProcessor";
-import {useWebSocketContext} from "@/context/websocket-context/WebSocketContext";
+import { useWebSocketContext } from "@/context/websocket-context/WebSocketContext";
interface CameraImageProps {
- cameraImageData: CameraImageData;
+ cameraImageData: CameraImageData;
}
-export const CameraImage = ({ cameraImageData}: CameraImageProps) => {
- const { cameraId, imageBitmap, imageWidth, imageHeight, cameraIndex , frameNumber} = cameraImageData;
- const {acknowledgeFrameRendered} = useWebSocketContext()
- const canvasRef = useRef<HTMLCanvasElement>(null);
+export const CameraImage = ({ cameraImageData }: CameraImageProps) => {
+ const { cameraId, imageBitmap, imageWidth, imageHeight, cameraIndex, frameNumber } = cameraImageData;
+ const { acknowledgeFrameRendered } = useWebSocketContext();
+ const canvasRef = useRef<HTMLCanvasElement>(null);
- // Directly render the bitmap when the ref callback is called
- const setCanvasRef = (canvas: HTMLCanvasElement | null) => {
+ useEffect(() => {
+ const renderImage = async () => {
+ const canvas = canvasRef.current;
+ if (!canvas || !imageBitmap) return;
- if (canvas && imageBitmap) {
- const ctx = canvas.getContext('2d');
- if (ctx) {
- canvas.width = imageWidth;
- canvas.height = imageHeight;
- ctx.drawImage(imageBitmap, 0, 0);
- acknowledgeFrameRendered(cameraId, frameNumber);
- }
- }
- };
+ // Set canvas dimensions if needed
+ if (canvas.width !== imageWidth || canvas.height !== imageHeight) {
+ canvas.width = imageWidth;
+ canvas.height = imageHeight;
+ }
- // Also update the canvas whenever the component renders with a new imageBitmap
- if (canvasRef.current && imageBitmap) {
- const canvas = canvasRef.current;
+ try {
const ctx = canvas.getContext('2d');
if (ctx) {
- if (canvas.width !== imageWidth || canvas.height !== imageHeight) {
- canvas.width = imageWidth;
- canvas.height = imageHeight;
- }
- ctx.drawImage(imageBitmap, 0, 0);
+ ctx.drawImage(imageBitmap, 0, 0);
+ acknowledgeFrameRendered(cameraId, frameNumber);
}
- }
+ } catch (error) {
+ console.error("Error rendering camera image:", error);
+ }
+ };
- return (
- <Box
- key={cameraId}
- sx={{
- position: 'relative',
- }}
- >
- <canvas
- ref={setCanvasRef}
- style={{
- objectFit: 'cover',
- }}
- />
- <Typography
- variant="caption"
- sx={{
- position: "absolute",
- bottom: 8,
- left: 8,
- color: "white",
- backgroundColor: "rgba(0, 0, 0, 0.5)",
- padding: "2px 4px",
- borderRadius: "4px",
- zIndex: 1,
- }}
- >
- Camera {cameraIndex}
- </Typography>
+ renderImage();
+ }, [cameraId, imageBitmap, imageWidth, imageHeight, frameNumber, acknowledgeFrameRendered]);
- </Box>
- );
+ return (
+ <Box
+ key={cameraId}
+ sx={{
+ position: 'relative',
+ }}
+ >
+ <canvas
+ ref={canvasRef}
+ style={{
+ objectFit: 'cover',
+ }}
+ />
+ <Typography
+ variant="caption"
+ sx={{
+ position: "absolute",
+ bottom: 8,
+ left: 8,
+ color: "white",
+ backgroundColor: "rgba(0, 0, 0, 0.5)",
+ padding: "2px 4px",
+ borderRadius: "4px",
+ zIndex: 1,
+ }}
+ >
+ Camera {cameraIndex}
+ </Typography>
+ </Box>
+ );
};
diff --git a/freemocap-ui/src/components/camera-views/og-canvas-strategy/CameraImagesGrid.tsx b/freemocap-ui/src/components/camera-views/og-canvas-strategy/CameraImagesGrid.tsx
index c872feda..4752e9c6 100644
--- a/freemocap-ui/src/components/camera-views/og-canvas-strategy/CameraImagesGrid.tsx
+++ b/freemocap-ui/src/components/camera-views/og-canvas-strategy/CameraImagesGrid.tsx
@@ -15,7 +15,7 @@ const debounce = (fn: Function, ms = 50) => {
};
export const CameraImagesGrid = () => {
- const {latestImageData} = useWebSocketContext();
+ const {latestCameraData} = useWebSocketContext();
return (
<Box sx={{ height: '100%',
@@ -25,7 +25,7 @@ export const CameraImagesGrid = () => {
flexWrap: 'wrap',
}}>
- {Object.entries(latestImageData).map(([cameraId, cameraImageData]) =>
+ {Object.entries(latestCameraData).map(([cameraId, cameraImageData]) =>
cameraImageData ? (
<CameraImage
key={cameraId}
diff --git a/freemocap-ui/src/components/ui-components/LeftSidePanelContent.tsx b/freemocap-ui/src/components/ui-components/LeftSidePanelContent.tsx
index 82601f80..d8bba92f 100644
--- a/freemocap-ui/src/components/ui-components/LeftSidePanelContent.tsx
+++ b/freemocap-ui/src/components/ui-components/LeftSidePanelContent.tsx
@@ -10,6 +10,7 @@ import HomeIcon from '@mui/icons-material/Home';
import {useLocation, useNavigate} from "react-router-dom";
import VideocamIcon from '@mui/icons-material/Videocam';
import VideoLibraryIcon from '@mui/icons-material/VideoLibrary';
+import DirectionsRunIcon from '@mui/icons-material/DirectionsRun';
import {VideoFolderPanel} from "@/components/video-folder-panel/VideoFolderPanel";
// Extract reusable scrollbar styles
const scrollbarStyles = {
@@ -92,6 +93,12 @@ export const LeftSidePanelContent = () => {
>
<HomeIcon/>
</IconButton>
+ <IconButton
+ color="inherit"
+ onClick={() => navigate('/viewport3d')}
+ >
+ <DirectionsRunIcon/>
+ </IconButton>
<IconButton
color="inherit"
diff --git a/freemocap-ui/src/components/viewport3d/ImageMesh.tsx b/freemocap-ui/src/components/viewport3d/ImageMesh.tsx
new file mode 100644
index 00000000..21ff5ff9
--- /dev/null
+++ b/freemocap-ui/src/components/viewport3d/ImageMesh.tsx
@@ -0,0 +1,75 @@
+import React, { useEffect, useRef, useState } from 'react';
+import * as THREE from 'three';
+import {CameraImageData} from "@/context/websocket-context/useWebsocketBinaryMessageProcessor";
+
+interface ImageMeshProps {
+ cameraImageData: CameraImageData;
+ position: [number, number, number];
+}
+
+export const ImageMesh: React.FC<ImageMeshProps> = ({ cameraImageData, position }) => {
+ const meshRef = useRef<THREE.Mesh>(null);
+ const textureRef = useRef<THREE.Texture | null>(null);
+ const [aspectRatio, setAspectRatio] = useState(2);
+
+ // Create and update texture from ImageBitmap
+ useEffect(() => {
+ const { imageBitmap } = cameraImageData;
+ if (!imageBitmap || !meshRef.current) return;
+
+ let isMounted = true;
+
+ const updateTexture = async () => {
+ if (!imageBitmap) return;
+ try {
+
+ if (!isMounted) {
+ imageBitmap.close();
+ return;
+ }
+
+ // Update aspect ratio
+ const newAspectRatio = imageBitmap.width / imageBitmap.height;
+ setAspectRatio(newAspectRatio);
+
+ // Create texture from ImageBitmap
+ if (textureRef.current) {
+ textureRef.current.dispose(); // Clean up previous texture
+ }
+
+ const newTexture = new THREE.CanvasTexture(imageBitmap);
+ textureRef.current = newTexture;
+
+ // Update material
+ if (meshRef.current?.material instanceof THREE.MeshBasicMaterial) {
+ meshRef.current.material.map = newTexture;
+ meshRef.current.material.needsUpdate = true;
+ }
+ } catch (error) {
+ console.error('Error processing image:', error);
+ }
+ };
+
+ updateTexture();
+
+ return () => {
+ isMounted = false;
+ // Clean up texture on unmount
+ if (textureRef.current) {
+ textureRef.current.dispose();
+ textureRef.current = null;
+ }
+ };
+ }, [cameraImageData]);
+
+ // Calculate dimensions for the plane geometry
+ const width = 2;
+ const height = width / aspectRatio;
+
+ return (
+ <mesh ref={meshRef} position={position}>
+ <planeGeometry args={[width, height]} />
+ <meshBasicMaterial transparent={true} />
+ </mesh>
+ );
+};
diff --git a/freemocap-ui/src/components/viewport3d/ThreeJsCanvas.tsx b/freemocap-ui/src/components/viewport3d/ThreeJsCanvas.tsx
new file mode 100644
index 00000000..2e41345e
--- /dev/null
+++ b/freemocap-ui/src/components/viewport3d/ThreeJsCanvas.tsx
@@ -0,0 +1,20 @@
+import {Canvas} from "@react-three/fiber";
+import {ThreeJsScene} from "@/components/viewport3d/ThreeJsScene";
+
+
+export function ThreeJsCanvas() {
+
+ return (
+ <div className="h-screen w-screen" >
+ <Canvas
+ shadows
+ camera={{position: [5, 5, 5], fov: 75}}
+ >
+ <ThreeJsScene/>
+ </Canvas>
+ </div>
+ );
+}
+
+
+
diff --git a/freemocap-ui/src/components/viewport3d/ThreeJsScene.tsx b/freemocap-ui/src/components/viewport3d/ThreeJsScene.tsx
new file mode 100644
index 00000000..8530e26d
--- /dev/null
+++ b/freemocap-ui/src/components/viewport3d/ThreeJsScene.tsx
@@ -0,0 +1,87 @@
+import {useMemo, useRef} from "react";
+import {CameraHelper, InstancedMesh, Matrix4, MeshStandardMaterial, PerspectiveCamera, SphereGeometry} from "three";
+import {extend, useFrame} from "@react-three/fiber";
+import {CameraControls, Grid} from "@react-three/drei";
+import {ImageMesh} from "@/components/viewport3d/ImageMesh";
+import {useWebSocketContext} from "@/context/websocket-context/WebSocketContext";
+
+extend({CameraHelper});
+
+export function ThreeJsScene() {
+ const {latestCameraData} = useWebSocketContext();
+ const sphereRef = useRef<InstancedMesh>(null);
+ const cameraRefs = useRef<PerspectiveCamera[]>([]);
+ const latestPoints3d = {} // dummy for now
+ const numPoints = Object.keys(latestPoints3d).length;
+
+ const sphereGeometry = useMemo(() => new SphereGeometry(0.1, 16, 16), []);
+ const sphereMaterial = useMemo(() => new MeshStandardMaterial({color: 'red'}), []);
+
+ const cameraPositions = [
+ [3, 1, 3],
+ [-3, 1, 3],
+ [3, 1, -3],
+ [-3, 1, -3],
+ ]
+ useFrame(() => {
+
+ // Make the camera look at the origin (0, 0, 0)
+ cameraRefs.current.forEach(camera => {
+ if (camera) {
+ camera.lookAt(0, 0, 0);
+ }
+ })
+ });
+
+ 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}
+ />
+ ))}
+ {cameraRefs.current.map((camera, index) => camera && (
+ <cameraHelper key={index} args={[camera]} />
+ ))}
+ <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={100}
+ />
+ <axesHelper/>
+ {latestCameraData &&
+ Object.entries(latestCameraData).map(([cameraId, cameraImageData], index) =>
+ cameraImageData?.imageBitmap ? (
+ <ImageMesh
+ key={cameraId}
+ cameraImageData={cameraImageData}
+ position={[index * 2.5, 1, 0]}
+ />
+ ) : null
+ )}
+ {numPoints > 0 && (
+ <instancedMesh ref={sphereRef} args={[sphereGeometry, sphereMaterial, numPoints]}/>
+ )}
+ </>
+ );
+}
diff --git a/freemocap-ui/src/components/viewport3d/multi-camera-scene.tsx b/freemocap-ui/src/components/viewport3d/multi-camera-scene.tsx
new file mode 100644
index 00000000..d2b66165
--- /dev/null
+++ b/freemocap-ui/src/components/viewport3d/multi-camera-scene.tsx
@@ -0,0 +1,120 @@
+"use client"
+
+import { useRef, useState, useMemo } from "react"
+import { Canvas, useFrame, useThree } from "@react-three/fiber"
+import { PerspectiveCamera, OrbitControls } from "@react-three/drei"
+import * as THREE from "three"
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
+
+const CameraObject = ({ position, lookAt }) => {
+ const mesh = useRef()
+
+ useFrame(() => {
+ mesh.current.lookAt(lookAt)
+ })
+
+ return (
+ <mesh ref={mesh} position={position}>
+ <boxGeometry args={[0.2, 0.2, 0.3]} />
+ <meshStandardMaterial color="gray" />
+ </mesh>
+ )
+}
+
+const Scene = ({ selectedCamera, setSelectedCamera }) => {
+ const { scene, camera } = useThree()
+ const insetRef = useRef()
+
+ const cameras = useMemo(
+ () => [
+ new THREE.PerspectiveCamera(75, 1, 0.1, 1000),
+ new THREE.PerspectiveCamera(75, 1, 0.1, 1000),
+ new THREE.PerspectiveCamera(75, 1, 0.1, 1000),
+ new THREE.PerspectiveCamera(75, 1, 0.1, 1000),
+ ],
+ [],
+ )
+
+ const cameraPositions = [
+ [3, 1, 3],
+ [-3, 1, 3],
+ [3, 1, -3],
+ [-3, 1, -3],
+ ]
+
+ useFrame(({ gl }) => {
+ gl.autoClear = true
+ gl.setViewport(0, 0, gl.domElement.width, gl.domElement.height)
+ gl.render(scene, camera)
+
+ gl.autoClear = false
+ gl.clearDepth()
+ gl.setScissorTest(true)
+
+ const insetWidth = gl.domElement.width / 4
+ const insetHeight = gl.domElement.height / 4
+
+ gl.setScissor(10, gl.domElement.height - insetHeight - 10, insetWidth, insetHeight)
+ gl.setViewport(10, gl.domElement.height - insetHeight - 10, insetWidth, insetHeight)
+
+ gl.render(scene, cameras[selectedCamera])
+
+ gl.setScissorTest(false)
+ })
+
+ return (
+ <>
+ <ambientLight intensity={0.5} />
+ <pointLight position={[10, 10, 10]} />
+
+ <mesh position={[0, 0, 0]}>
+ <boxGeometry args={[1, 1, 1]} />
+ <meshStandardMaterial color="hotpink" />
+ </mesh>
+
+ {cameras.map((_, index) => (
+ <CameraObject key={index} position={cameraPositions[index]} lookAt={[0, 0, 0]} />
+ ))}
+
+ {cameras.map((cam, index) => (
+ <PerspectiveCamera
+ key={index}
+ makeDefault={index === selectedCamera}
+ position={cameraPositions[index]}
+ fov={75}
+ aspect={1}
+ near={0.1}
+ far={1000}
+ />
+ ))}
+
+ <OrbitControls />
+ </>
+ )
+}
+
+export default function Component() {
+ const [selectedCamera, setSelectedCamera] = useState(0)
+
+ return (
+ <div className="w-full h-screen relative">
+ <Canvas>
+ <Scene selectedCamera={selectedCamera} setSelectedCamera={setSelectedCamera} />
+ </Canvas>
+ <div className="absolute top-4 right-4">
+ <Select value={selectedCamera.toString()} onValueChange={(value) => setSelectedCamera(Number.parseInt(value))}>
+ <SelectTrigger className="w-[180px]">
+ <SelectValue placeholder="Select a camera" />
+ </SelectTrigger>
+ <SelectContent>
+ <SelectItem value="0">Camera 1</SelectItem>
+ <SelectItem value="1">Camera 2</SelectItem>
+ <SelectItem value="2">Camera 3</SelectItem>
+ <SelectItem value="3">Camera 4</SelectItem>
+ </SelectContent>
+ </Select>
+ </div>
+ </div>
+ )
+}
+
diff --git a/freemocap-ui/src/context/websocket-context/WebSocketContext.tsx b/freemocap-ui/src/context/websocket-context/WebSocketContext.tsx
index 8c03d8d0..ea8be8e3 100644
--- a/freemocap-ui/src/context/websocket-context/WebSocketContext.tsx
+++ b/freemocap-ui/src/context/websocket-context/WebSocketContext.tsx
@@ -8,7 +8,7 @@ interface WebSocketContextProps {
isConnected: boolean;
connect: () => void;
disconnect: () => void;
- latestImageData: Record<string, CameraImageData>;
+ latestCameraData: Record<string, CameraImageData>;
acknowledgeFrameRendered: (cameraId: string, frameNumber: number) => void;
}
@@ -21,10 +21,11 @@ interface WebSocketProviderProps {
const WebSocketContext = createContext<WebSocketContextProps | undefined>(undefined);
export const WebSocketContextProvider: React.FC<WebSocketProviderProps> = ({url, children}) => {
- const { isConnected, connect, disconnect, latestImageData,acknowledgeFrameRendered } = useWebSocket(url);
+ const { isConnected, connect, disconnect, latestCameraData,acknowledgeFrameRendered } = useWebSocket(url);
return (
- <WebSocketContext.Provider value={{isConnected, connect, disconnect,latestImageData,acknowledgeFrameRendered}}>
+ <WebSocketContext.Provider value={{isConnected, connect, disconnect,
+ latestCameraData,acknowledgeFrameRendered}}>
{children}
</WebSocketContext.Provider>
)
diff --git a/freemocap-ui/src/context/websocket-context/useWebSocket.ts b/freemocap-ui/src/context/websocket-context/useWebSocket.ts
index b79b7a55..4b452787 100644
--- a/freemocap-ui/src/context/websocket-context/useWebSocket.ts
+++ b/freemocap-ui/src/context/websocket-context/useWebSocket.ts
@@ -163,7 +163,7 @@ export const useWebSocket = (wsUrl: string) => {
isConnected,
connect,
disconnect,
- latestImageData,
+ latestCameraData: latestImageData,
acknowledgeFrameRendered,
};
};
diff --git a/freemocap-ui/src/layout/BaseContentRouter.tsx b/freemocap-ui/src/layout/BaseContentRouter.tsx
index 86332ff9..87dbd3ee 100644
--- a/freemocap-ui/src/layout/BaseContentRouter.tsx
+++ b/freemocap-ui/src/layout/BaseContentRouter.tsx
@@ -1,17 +1,22 @@
// skellycam-ui/src/layout/BaseContent.tsx
import React from 'react';
-import { Routes, Route, Navigate } from 'react-router-dom';
-import WelcomePage from "@/layout/pages/WelcomePage";
+import {Navigate, Route, Routes} from 'react-router-dom';
import {CamerasPage} from "@/layout/pages/CamerasPage";
-import VideosPage from "@/layout/pages/VideosPage";
+import {Viewport3dPage} from "@/layout/pages/Viewport3dPage";
+import VideosPage from "@/layout/pages/VideosPage"
+import ErrorBoundary from "@/components/ErrorBoundary";
+
export const BaseContentRouter: React.FC = () => {
return (
- <Routes>
- {/*<Route path="/" element={<WelcomePage />} />*/}
- <Route path="/" element={<CamerasPage />} />
- <Route path="/videos" element={<VideosPage />} />
- <Route path="*" element={<Navigate to="/" replace />} />
- </Routes>
+ <ErrorBoundary>
+ <Routes>
+ {/*<Route path="/" element={<WelcomePage />} />*/}
+ <Route path="/" element={<CamerasPage/>}/>
+ <Route path="/viewport3d" element={<Viewport3dPage/>}/>
+ <Route path="/videos" element={<VideosPage/>}/>
+ <Route path="*" element={<Navigate to="/" replace/>}/>
+ </Routes>
+ </ErrorBoundary>
);
};
diff --git a/freemocap-ui/src/layout/pages/Viewport3dPage.tsx b/freemocap-ui/src/layout/pages/Viewport3dPage.tsx
new file mode 100644
index 00000000..ae76fef8
--- /dev/null
+++ b/freemocap-ui/src/layout/pages/Viewport3dPage.tsx
@@ -0,0 +1,11 @@
+import {Box} from "@mui/material";
+import React from "react";
+import {ThreeJsCanvas} from "@/components/viewport3d/ThreeJsCanvas";
+
+export const Viewport3dPage = () => {
+ return (
+ <Box sx={{display: "flex", flexDirection: "column", height: "81vh"}}>
+ <ThreeJsCanvas/>
+ </Box>
+ );
+}
diff --git a/freemocap-ui/src/services/urlService.ts b/freemocap-ui/src/services/urlService.ts
index 1c990f6b..710b4b60 100644
--- a/freemocap-ui/src/services/urlService.ts
+++ b/freemocap-ui/src/services/urlService.ts
@@ -39,12 +39,12 @@ class UrlService {
}
// Camera API endpoints
- getCameraUrls() {
+ getSkellycamUrls() {
return {
detectCameras: this.getApiUrl('/skellycam/camera/detect'),
- createGroup: this.getApiUrl('/skellycam/camera/group/create'),
- closeAll: this.getApiUrl('/skellycam/camera/group/close/all'),
- updateConfig: this.getApiUrl('/skellycam/camera/update'),
+ createCameraGroup: this.getApiUrl('/skellycam/camera/group/create'),
+ closeAllCameras: this.getApiUrl('/skellycam/camera/group/close/all'),
+ updateCameraConfigs: this.getApiUrl('/skellycam/camera/update'),
startRecording: this.getApiUrl('/skellycam/camera/group/all/record/start'),
stopRecording: this.getApiUrl('/skellycam/camera/group/all/record/stop'),
pauseCameras: this.getApiUrl('/skellycam/camera/group/all/pause'),
diff --git a/freemocap-ui/src/store/thunks/close-cameras-thunks.ts b/freemocap-ui/src/store/thunks/close-cameras-thunks.ts
index 25ded9bb..bb6b62f4 100644
--- a/freemocap-ui/src/store/thunks/close-cameras-thunks.ts
+++ b/freemocap-ui/src/store/thunks/close-cameras-thunks.ts
@@ -1,4 +1,5 @@
import {createAsyncThunk} from '@reduxjs/toolkit';
+import {urlService} from "@/services/urlService";
@@ -7,7 +8,7 @@ export const closeCameras = createAsyncThunk(
async () => {
console.log(`Closing cameras...`);
try {
- const closeCamerasURL = 'http://localhost:8006/skellycam/camera/group/close/all';
+ const closeCamerasURL = urlService.getSkellycamUrls().closeAllCameras
console.log(`Sending close request to ${closeCamerasURL}`);
diff --git a/freemocap-ui/src/store/thunks/connect-to-cameras-thunk.ts b/freemocap-ui/src/store/thunks/connect-to-cameras-thunk.ts
index e7c8b8c0..4421be34 100644
--- a/freemocap-ui/src/store/thunks/connect-to-cameras-thunk.ts
+++ b/freemocap-ui/src/store/thunks/connect-to-cameras-thunk.ts
@@ -21,7 +21,7 @@ export const connectToCameras = createAsyncThunk(
}
dispatch(setLoading(true));
- const connectUrl = urlService.getCameraUrls().createGroup;
+ const connectUrl = urlService.getSkellycamUrls().createCameraGroup;
const payload = {
camera_configs: cameraConfigs
diff --git a/freemocap-ui/src/store/thunks/detect-cameras-thunks/detect-cameras-server-thunk.ts b/freemocap-ui/src/store/thunks/detect-cameras-thunks/detect-cameras-server-thunk.ts
index c1dcc506..fd766106 100644
--- a/freemocap-ui/src/store/thunks/detect-cameras-thunks/detect-cameras-server-thunk.ts
+++ b/freemocap-ui/src/store/thunks/detect-cameras-thunks/detect-cameras-server-thunk.ts
@@ -21,7 +21,7 @@ export const detectCameraDevices = createAsyncThunk<
dispatch(setLoading(true));
try {
- const connectUrl = urlService.getCameraUrls().detectCameras;
+ const connectUrl = urlService.getSkellycamUrls().detectCameras;
console.log(`Detecting cameras at ${connectUrl}`);
const response = await fetch(connectUrl, {
diff --git a/freemocap-ui/src/store/thunks/start-stop-recording-thunks.ts b/freemocap-ui/src/store/thunks/start-stop-recording-thunks.ts
index 46f25942..d470a9e4 100644
--- a/freemocap-ui/src/store/thunks/start-stop-recording-thunks.ts
+++ b/freemocap-ui/src/store/thunks/start-stop-recording-thunks.ts
@@ -21,7 +21,7 @@ export const startRecording = createAsyncThunk<void, StartRecordingParams>(
async ({recordingName, recordingDirectory}, {dispatch,}) => {
console.log(`Starting recording with name: ${recordingName} in directory: ${recordingDirectory}`);
try {
- const recStartUrl = urlService.getCameraUrls().startRecording;
+ const recStartUrl = urlService.getSkellycamUrls().startRecording;
const requestPayload = RecordStartRequestSchema.parse({
recording_name: recordingName,
@@ -59,7 +59,7 @@ export const stopRecording = createAsyncThunk<void, void>(
async (_, {dispatch}) => {
console.log('Stopping recording...');
try {
- const recStopUrl = urlService.getCameraUrls().stopRecording;
+ const recStopUrl = urlService.getSkellycamUrls().stopRecording;
const response = await fetch(recStopUrl, {
method: 'GET',
});
diff --git a/freemocap-ui/src/store/thunks/update-camera-configs-thunk.ts b/freemocap-ui/src/store/thunks/update-camera-configs-thunk.ts
index b85b79f4..b9413e85 100644
--- a/freemocap-ui/src/store/thunks/update-camera-configs-thunk.ts
+++ b/freemocap-ui/src/store/thunks/update-camera-configs-thunk.ts
@@ -6,13 +6,14 @@ import {
setLoading, updateCameraConfig, updateCameraConfigs
} from "@/store/slices/cameras-slices/camerasSlice";
import { CameraConfig } from "../slices/cameras-slices/camera-types";
+import {urlService} from "@/services/urlService";
export const updateCameraConfigsThunk = createAsyncThunk(
'camera/update',
async (_, { dispatch, getState }) => {
const state = getState() as any;
dispatch(setLoading(true));
- const connectUrl = `http://localhost:8006/skellycam/camera/update`;
+ const connectUrl = urlService.getSkellycamUrls().updateCameraConfigs
const payload = {
camera_configs: selectConfigsForSelectedCameras(state)