diff --git a/app/.env b/app/.env index c50d174..1efb7c2 100644 --- a/app/.env +++ b/app/.env @@ -9,6 +9,7 @@ REACT_APP_SERVER_REST_API_BASE_URL=185.100.212.76:5000 # Base URL for the server marketplace, used for market place model blob. REACT_APP_SERVER_MARKETPLACE_URL=185.100.212.76:50011 +# REACT_APP_SERVER_MARKETPLACE_URL=192.168.0.110:3501 # Base URL for the asset library server, used for asset library images and model blob id. REACT_APP_SERVER_ASSET_LIBRARY_URL=185.100.212.76:50011 diff --git a/app/src/modules/market/AssetPreview.tsx b/app/src/modules/market/AssetPreview.tsx index a53a60d..e0e30df 100644 --- a/app/src/modules/market/AssetPreview.tsx +++ b/app/src/modules/market/AssetPreview.tsx @@ -14,11 +14,14 @@ interface SelectedCard { rating: number; views: number; description: string; + AssetID: string + } // Define the props type for AssetPreview interface AssetPreviewProps { selectedCard: SelectedCard; + modelUrl: string; setSelectedCard: React.Dispatch>; // Type for setter function } @@ -33,8 +36,10 @@ function Ui() { const AssetPreview: React.FC = ({ selectedCard, setSelectedCard, + modelUrl }) => { // Ensure rating is a valid number between 0 and 5 + console.log('modelUrl: ', modelUrl); const rating = Math.max( 0, Math.min(5, isNaN(selectedCard.rating) ? 0 : selectedCard.rating) @@ -63,8 +68,8 @@ const AssetPreview: React.FC = ({ }} > }> - {selectedCard.assetName && ( - + {selectedCard.assetName && modelUrl && ( + )} void; } @@ -37,10 +41,18 @@ const Card: React.FC = ({ views, image, description, + AssetID, + modelUrl, onSelectCard, + }) => { const handleCardSelect = () => { - onSelectCard({ assetName, uploadedOn, price, rating, views, description }); + console.log('assetName: ', assetName); + console.log('AssetID: ', AssetID); + + onSelectCard({ + assetName, uploadedOn, price, rating, views, description, AssetID + }); }; return ( diff --git a/app/src/modules/market/CardsContainer.tsx b/app/src/modules/market/CardsContainer.tsx index eabcbe4..a540387 100644 --- a/app/src/modules/market/CardsContainer.tsx +++ b/app/src/modules/market/CardsContainer.tsx @@ -1,6 +1,8 @@ import React, { useEffect, useState } from "react"; import Card from "./Card"; import AssetPreview from "./AssetPreview"; +import { getAssetDetails } from "../../services/marketplace/fetchAssetDetails"; +import { fetchGltfUrl } from "../../services/marketplace/fetchGltfUrl"; interface ModelData { CreatedBy: string; @@ -15,6 +17,7 @@ interface ModelData { uploadDate: number; _id: string; price: number; + AssetID: string } interface ModelsProps { models: ModelData[]; @@ -28,19 +31,26 @@ const CardsContainer: React.FC = ({ models }) => { rating: number; views: number; description: string; + AssetID: string; } | null>(null); + const [modelUrl, setModelUrl] = useState("") - const handleCardSelect = (cardData: { + const handleCardSelect = async (cardData: { assetName: string; uploadedOn: number; price: number; rating: number; views: number; description: string; + AssetID: string }) => { setSelectedCard(cardData); + const res = await fetchGltfUrl(cardData.assetName, cardData.AssetID); + console.log('res: ', res); + setModelUrl(res.url) }; + return (
@@ -57,7 +67,9 @@ const CardsContainer: React.FC = ({ models }) => { views={800} onSelectCard={handleCardSelect} image={assetDetail.thumbnail} + AssetID={assetDetail?.AssetID} description={assetDetail.description} + modelUrl={modelUrl} /> ))} {/* */} @@ -65,6 +77,7 @@ const CardsContainer: React.FC = ({ models }) => { )} {/* */} diff --git a/app/src/modules/market/FilterSearch.tsx b/app/src/modules/market/FilterSearch.tsx index 20882c9..52f1b2e 100644 --- a/app/src/modules/market/FilterSearch.tsx +++ b/app/src/modules/market/FilterSearch.tsx @@ -16,6 +16,7 @@ interface ModelData { uploadDate: number; _id: string; price: number; + AssetID: string } interface ModelsProps { diff --git a/app/src/modules/market/GltfLoader.tsx b/app/src/modules/market/GltfLoader.tsx index 2431af2..a472430 100644 --- a/app/src/modules/market/GltfLoader.tsx +++ b/app/src/modules/market/GltfLoader.tsx @@ -11,6 +11,7 @@ interface GltfLoaderProps { setAnimations?: (animations?: string[]) => void; selectedAnimation?: string; setSelectedAnimation?: (animation: string) => void; + assetId: string } // const getGLTFUrl = (url: string) => url; // Placeholder for your actual function @@ -20,9 +21,10 @@ const GltfLoader: React.FC = ({ fromServer, setAnimations, selectedAnimation, + assetId }) => { - const modelUrl: any = fromServer ? fetchGltfUrl(fromServer) : glbdata; - const { scene, animations } = useGLTF(modelUrl ?? "") as { + // const modelUrl: any = fromServer ? fetchGltfUrl(fromServer, assetId) : glbdata; + const { scene, animations } = useGLTF(fromServer ?? "") as { scene: Object3D; animations: THREE.AnimationClip[]; }; diff --git a/app/src/modules/market/MarketPlace.tsx b/app/src/modules/market/MarketPlace.tsx index 3b4b87c..eb5238b 100644 --- a/app/src/modules/market/MarketPlace.tsx +++ b/app/src/modules/market/MarketPlace.tsx @@ -17,6 +17,7 @@ interface ModelData { uploadDate: number; _id: string; price: number; + AssetID: string } const MarketPlace = () => { const [models, setModels] = useState([]); @@ -33,6 +34,7 @@ const MarketPlace = () => { try { const filt = await getAssetImages("67d934ad0f42a1fdadb19aa6"); setModels(filt.items); + console.log('filt.items: ', filt.items); setFilteredModels(filt.items); setisLoading(false); } catch { diff --git a/app/src/modules/scene/controls/selectionControls/distanceFindingControls.tsx b/app/src/modules/scene/controls/selectionControls/distanceFindingControls.tsx index 1cfe244..4f2eb02 100644 --- a/app/src/modules/scene/controls/selectionControls/distanceFindingControls.tsx +++ b/app/src/modules/scene/controls/selectionControls/distanceFindingControls.tsx @@ -1,270 +1,339 @@ -import React, { useRef } from "react"; +import React, { useRef, useState } from "react"; import { - Vector3, - Raycaster, - BufferGeometry, - LineBasicMaterial, - Line, - Mesh, - Group, + Vector3, + Raycaster, + BufferGeometry, + LineBasicMaterial, + Line, + Mesh, + Group, } from "three"; import { useThree, useFrame } from "@react-three/fiber"; import { Html } from "@react-three/drei"; interface DistanceFindingControlsProps { - boundingBoxRef: React.RefObject; - object: number; + boundingBoxRef: React.RefObject; + object: number; } const DistanceFindingControls = ({ - boundingBoxRef, - object, + boundingBoxRef, + object, }: DistanceFindingControlsProps) => { - const { camera, scene } = useThree(); + const { camera, scene } = useThree(); + const [labelValues, setLabelValues] = useState<{ + textPosX: any; + textNegX: any; + textPosZ: any; + textNegZ: any; + }>({ + textPosX: "", + textNegX: "", + textPosZ: "", + textNegZ: "", + }); - // Refs for measurement lines - const line1 = useRef(null); - const line2 = useRef(null); - const line3 = useRef(null); - const line4 = useRef(null); - const line5 = useRef(null); + // Refs for measurement lines + const line1 = useRef(null); + const line2 = useRef(null); + const line3 = useRef(null); + const line4 = useRef(null); + const line5 = useRef(null); - // Refs for measurement text labels - const textPosX = useRef(null); - const textNegX = useRef(null); - const textPosZ = useRef(null); - const textNegZ = useRef(null); - const textPosY = useRef(null); + // Refs for measurement text labels + const textPosX = useRef(null); + const textNegX = useRef(null); + const textPosZ = useRef(null); + const textNegZ = useRef(null); + const textPosY = useRef(null); - // Store line geometries to avoid recreation - const lineGeometries = useRef({ - posX: new BufferGeometry(), - negX: new BufferGeometry(), - posZ: new BufferGeometry(), - negZ: new BufferGeometry(), - posY: new BufferGeometry(), - }); + // Store line geometries to avoid recreation + const lineGeometries = useRef({ + posX: new BufferGeometry(), + negX: new BufferGeometry(), + posZ: new BufferGeometry(), + negZ: new BufferGeometry(), + posY: new BufferGeometry(), + }); - useFrame(() => { - if (!boundingBoxRef?.current) return; + useFrame(() => { + if (!boundingBoxRef?.current) return; - boundingBoxRef.current.geometry.computeBoundingBox(); - const bbox = boundingBoxRef.current.geometry.boundingBox; + boundingBoxRef.current.geometry.computeBoundingBox(); + const bbox = boundingBoxRef.current.geometry.boundingBox; - if (!bbox) return; + if (!bbox) return; - const size = { - x: bbox.max.x - bbox.min.x, - y: bbox.max.y - bbox.min.y, - z: bbox.max.z - bbox.min.z, - }; - - const vec = boundingBoxRef.current?.getWorldPosition(new Vector3()).clone(); - - if (!vec) return; - updateLine({ - line: line1.current, - geometry: lineGeometries.current.posX, - direction: new Vector3(1, 0, 0), // Positive X - angle: "pos", - mesh: textPosX, - vec, - size, - }); - updateLine({ - line: line2.current, - geometry: lineGeometries.current.negX, - direction: new Vector3(-1, 0, 0), // Negative X - angle: "neg", - mesh: textNegX, - vec, - size, - }); - updateLine({ - line: line3.current, - geometry: lineGeometries.current.posZ, - direction: new Vector3(0, 0, 1), // Positive Z - angle: "pos", - mesh: textPosZ, - vec, - size, - }); - updateLine({ - line: line4.current, - geometry: lineGeometries.current.negZ, - direction: new Vector3(0, 0, -1), // Negative Z - angle: "neg", - mesh: textNegZ, - vec, - size, - }); - updateLine({ - line: line5.current, - geometry: lineGeometries.current.posY, - direction: new Vector3(0, -1, 0), // Down (Y) - angle: "posY", - mesh: textPosY, - vec, - size, - }); - }); - - const updateLine = ({ - line, - geometry, - direction, - angle, - mesh, - vec, - size, - }: { - line: Line | null; - geometry: BufferGeometry; - direction: Vector3; - angle: string; - mesh: React.RefObject; - vec: Vector3; - size: { x: number; y: number; z: number }; - }) => { - if (!line) return; - - const points = []; - - if (angle === "pos") { - points[0] = new Vector3(vec.x, vec.y, vec.z).add( - new Vector3((direction.x * size.x) / 2, 0, (direction.z * size.z) / 2) - ); - } else if (angle === "neg") { - points[0] = new Vector3(vec.x, vec.y, vec.z).sub( - new Vector3((-direction.x * size.x) / 2, 0, (-direction.z * size.z) / 2) - ); - } else if (angle === "posY") { - points[0] = new Vector3(vec.x, vec.y, vec.z).sub( - new Vector3(0, size.y / 2, 0) - ); - } - - const ray = new Raycaster(); - if (camera) ray.camera = camera; - ray.set(new Vector3(vec.x, vec.y, vec.z), direction); - ray.params.Line.threshold = 0.1; - - // Find intersection points - const wallsGroup = scene.children.find((val) => - val?.name.includes("Walls") - ); - const intersects = wallsGroup - ? ray.intersectObjects([wallsGroup], true) - : []; - - // Find intersection point - if (intersects[0]) { - for (const intersect of intersects) { - if (intersect.object.name.includes("Wall")) { - points[1] = - angle !== "posY" ? intersect.point : new Vector3(vec.x, 0, vec.z); // Floor - break; - } - } - } - - // Update line geometry - if (points[1]) { - geometry.dispose(); - geometry.setFromPoints([points[0], points[1]]); - line.geometry = geometry; - - // Update measurement text - if (mesh?.current) { - geometry.computeBoundingSphere(); - const center = geometry.boundingSphere?.center; - if (center) { - mesh.current.position.copy(center); - } - const label = document.getElementById(mesh.current.name); - if (label) { - label.innerText = `${points[0].distanceTo(points[1]).toFixed(2)}m`; - } - } - } else { - // No intersection found - clear the line - geometry.dispose(); - geometry.setFromPoints([new Vector3(), new Vector3()]); - line.geometry = geometry; - const label = document.getElementById(mesh?.current?.name ?? ""); - if (label) label.innerText = ""; - } + const size = { + x: bbox.max.x - bbox.min.x, + y: bbox.max.y - bbox.min.y, + z: bbox.max.z - bbox.min.z, }; - const Material = new LineBasicMaterial({ color: "#d2baff" }); + const vec = boundingBoxRef.current?.getWorldPosition(new Vector3()).clone(); - return ( - <> - {/* Measurement text labels */} - {boundingBoxRef.current && object > 0 && ( - <> - - -
- - - - -
- - - - -
- - - - -
- - + if (!vec) return; + updateLine({ + line: line1.current, + geometry: lineGeometries.current.posX, + direction: new Vector3(1, 0, 0), // Positive X + angle: "pos", + mesh: textPosX, + vec, + size, + }); + updateLine({ + line: line2.current, + geometry: lineGeometries.current.negX, + direction: new Vector3(-1, 0, 0), // Negative X + angle: "neg", + mesh: textNegX, + vec, + size, + }); + updateLine({ + line: line3.current, + geometry: lineGeometries.current.posZ, + direction: new Vector3(0, 0, 1), // Positive Z + angle: "pos", + mesh: textPosZ, + vec, + size, + }); + updateLine({ + line: line4.current, + geometry: lineGeometries.current.negZ, + direction: new Vector3(0, 0, -1), // Negative Z + angle: "neg", + mesh: textNegZ, + vec, + size, + }); + updateLine({ + line: line5.current, + geometry: lineGeometries.current.posY, + direction: new Vector3(0, -1, 0), // Down (Y) + angle: "posY", + mesh: textPosY, + vec, + size, + }); + }); - {/* Measurement lines */} - - - - - - )} - + const updateLine = ({ + line, + geometry, + direction, + angle, + mesh, + vec, + size, + }: { + line: Line | null; + geometry: BufferGeometry; + direction: Vector3; + angle: string; + mesh: React.RefObject; + vec: Vector3; + size: { x: number; y: number; z: number }; + }) => { + if (!line) return; + + const points = []; + + if (angle === "pos") { + points[0] = new Vector3(vec.x, vec.y, vec.z).add( + new Vector3((direction.x * size.x) / 2, 0, (direction.z * size.z) / 2) + ); + } else if (angle === "neg") { + points[0] = new Vector3(vec.x, vec.y, vec.z).sub( + new Vector3((-direction.x * size.x) / 2, 0, (-direction.z * size.z) / 2) + ); + } else if (angle === "posY") { + points[0] = new Vector3(vec.x, vec.y, vec.z).sub( + new Vector3(0, size.y / 2, 0) + ); + } + + const ray = new Raycaster(); + if (camera) ray.camera = camera; + ray.set(new Vector3(vec.x, vec.y, vec.z), direction); + ray.params.Line.threshold = 0.1; + + // Find intersection points + const wallsGroup = scene.children.find((val) => + val?.name.includes("Walls") ); + const intersects = wallsGroup + ? ray.intersectObjects([wallsGroup], true) + : []; + + // Find intersection point + if (intersects[0]) { + for (const intersect of intersects) { + if (intersect.object.name.includes("Wall")) { + points[1] = + angle !== "posY" ? intersect.point : new Vector3(vec.x, 0, vec.z); // Floor + break; + } + } + } + if (points[1]) { + geometry.dispose(); + geometry.setFromPoints([points[0], points[1]]); + line.geometry = geometry; + + // Calculate the distance only once + const distance = points[0].distanceTo(points[1]).toFixed(2); + + // Update measurement text + if (mesh?.current) { + geometry.computeBoundingSphere(); + const center = geometry.boundingSphere?.center; + if (center) { + mesh.current.position.copy(center); + } + + const label = document.getElementById(mesh.current.name); + if (label) { + label.innerText = `${distance}m`; + + // Update specific label state based on the label ID + switch (label.id) { + case "textPosX": + setLabelValues((prevState) => ({ ...prevState, textPosX: distance })); + break; + case "textNegX": + setLabelValues((prevState) => ({ ...prevState, textNegX: distance })); + break; + case "textPosZ": + setLabelValues((prevState) => ({ ...prevState, textPosZ: distance })); + break; + case "textNegZ": + setLabelValues((prevState) => ({ ...prevState, textNegZ: distance })); + break; + default: + break; + } + } + } + } else { + // No intersection found - clear the line + geometry.dispose(); + geometry.setFromPoints([new Vector3(), new Vector3()]); + line.geometry = geometry; + + const label = document.getElementById(mesh?.current?.name ?? ""); + if (label) { + label.innerText = ""; + + // Clear the corresponding label value in the state + switch (label.id) { + case "textPosX": + setLabelValues((prevState) => ({ ...prevState, textPosX: "" })); + break; + case "textNegX": + setLabelValues((prevState) => ({ ...prevState, textNegX: "" })); + break; + case "textPosZ": + setLabelValues((prevState) => ({ ...prevState, textPosZ: "" })); + break; + case "textNegZ": + setLabelValues((prevState) => ({ ...prevState, textNegZ: "" })); + break; + default: + break; + } + } + } + + }; + + const Material = new LineBasicMaterial({ color: "#d2baff" }); + + return ( + <> + {/* Measurement text labels */} + {boundingBoxRef.current && object > 0 && ( + <> + + +
{labelValues.textPosX}
+ + + + + +
{labelValues.textNegX}
+ + + + + +
{labelValues.textPosZ}
+ + + + + +
{labelValues.textNegZ}
+ + + + {/* Measurement lines */} + + + + + + ) + } + + ); }; export default DistanceFindingControls; diff --git a/app/src/modules/simulation/vehicle/instances/instance/vehicleInstance.tsx b/app/src/modules/simulation/vehicle/instances/instance/vehicleInstance.tsx index 3b6568d..d054a10 100644 --- a/app/src/modules/simulation/vehicle/instances/instance/vehicleInstance.tsx +++ b/app/src/modules/simulation/vehicle/instances/instance/vehicleInstance.tsx @@ -11,7 +11,10 @@ import { useProductStore } from '../../../../../store/simulation/useProductStore import { useSelectedProduct } from '../../../../../store/simulation/useSimulationStore'; import { useTriggerHandler } from '../../../triggers/triggerHandler/useTriggerHandler'; import MaterialAnimator from '../animator/materialAnimator'; - +type Timer = { + start: number | null; + active: boolean; +}; function VehicleInstance({ agvDetail }: Readonly<{ agvDetail: VehicleStatus }>) { const { navMesh } = useNavMesh(); const { isPlaying } = usePlayButtonStore(); @@ -20,20 +23,16 @@ function VehicleInstance({ agvDetail }: Readonly<{ agvDetail: VehicleStatus }>) const { triggerPointActions } = useTriggerHandler(); const { getActionByUuid, getEventByModelUuid, getTriggerByUuid } = useProductStore(); const { selectedProduct } = useSelectedProduct(); - const { vehicles, setVehicleActive, setVehicleState, setVehiclePicking, clearCurrentMaterials, setVehicleLoad, decrementVehicleLoad, removeLastMaterial, incrementIdleTime, incrementActiveTime } = useVehicleStore(); - + const { vehicles, setVehicleActive, setVehicleState, setVehiclePicking, clearCurrentMaterials, setVehicleLoad, decrementVehicleLoad, removeLastMaterial } = useVehicleStore(); const [currentPhase, setCurrentPhase] = useState('stationed'); const [path, setPath] = useState<[number, number, number][]>([]); const pauseTimeRef = useRef(null); - const idleTimeRef = useRef(0); - const activeTimeRef = useRef(0); const isPausedRef = useRef(false); let startTime: number; let fixedInterval: number; const { speed } = useAnimationPlaySpeed(); const { isPaused } = usePauseButtonStore(); - useEffect(() => { isPausedRef.current = isPaused; }, [isPaused]); @@ -55,7 +54,7 @@ function VehicleInstance({ agvDetail }: Readonly<{ agvDetail: VehicleStatus }>) ); function vehicleStatus(modelId: string, status: string) { - // console.log(`${modelId} , ${status}`); + // } // Function to reset everything @@ -121,157 +120,6 @@ function VehicleInstance({ agvDetail }: Readonly<{ agvDetail: VehicleStatus }>) } // eslint-disable-next-line react-hooks/exhaustive-deps }, [vehicles, currentPhase, path, isPlaying]); - const previousTimeRef = useRef(null); // Tracks the last frame time - const isActiveRef = useRef(agvDetail.isActive); // Tracks the previous isActive state - const animationFrameIdRef = useRef(null); // Tracks the animation frame ID - - // // Animate function (moved outside useEffect) - // function animate(currentTime: number) { - // if (previousTimeRef.current === null) { - // // Initialize previousTime on the first frame - // previousTimeRef.current = currentTime; - // } - - // const deltaTime = (currentTime - previousTimeRef.current) / 1000; // Time difference in seconds - // previousTimeRef.current = currentTime; - - // if (idleTimeRef.current == 0) { - // activeTimeRef.current += deltaTime * speed; // Scale active time by speed - // const roundedActiveTime = Math.round(activeTimeRef.current); // Round to nearest integer - // console.log('Active Time:', roundedActiveTime, 'seconds'); - // incrementActiveTime(agvDetail.modelUuid, roundedActiveTime); - // incrementIdleTime(agvDetail.modelUuid, 0); - // } else if (activeTimeRef.current = 0) { - // idleTimeRef.current += deltaTime * speed; // Scale idle time by speed - // const roundedIdleTime = Math.round(idleTimeRef.current); // Round to nearest integer - // console.log('Idle Time:', roundedIdleTime, 'seconds'); - // incrementIdleTime(agvDetail.modelUuid, roundedIdleTime); - // incrementActiveTime(agvDetail.modelUuid, 0); - // } - - // // Request the next animation frame - // animationFrameIdRef.current = requestAnimationFrame(animate); - // } - - // useEffect(() => { - - // // Reset timers when transitioning between states - // if (!agvDetail.isActive) { - // activeTimeRef.current = 0; - // } else { - // idleTimeRef.current = 0; - // } - - // if (animationFrameIdRef.current === null) { - // animationFrameIdRef.current = requestAnimationFrame(animate); - // } - // console.log("veh", vehicles); - // // Cleanup function to stop the animation loop - // return () => { - // if (animationFrameIdRef.current !== null) { - // cancelAnimationFrame(animationFrameIdRef.current); - // animationFrameIdRef.current = null; // Reset the animation frame ID - // } - // }; - // }, [agvDetail.isActive]); - // Animate function (moved outside useEffect) - function animate(currentTime: number) { - if (previousTimeRef.current === null) { - // Initialize previousTime on the first frame - previousTimeRef.current = currentTime; - } - - const deltaTime = (currentTime - previousTimeRef.current) / 1000; // Time difference in seconds - previousTimeRef.current = currentTime; - - if (agvDetail.isActive) { - // AGV is active: Increment active time - activeTimeRef.current += deltaTime * speed; // Scale active time by speed - const roundedActiveTime = Math.round(activeTimeRef.current); // Round to nearest integer - - } else { - - idleTimeRef.current += deltaTime * speed; // Scale idle time by speed - const roundedIdleTime = Math.round(idleTimeRef.current); // Round to nearest integer - - } - - // Request the next animation frame - animationFrameIdRef.current = requestAnimationFrame(animate); - } - - useEffect(() => { - // Start or stop the animation based on the isActive state - - if (!agvDetail.isActive) { - // Transitioning to idle: Reset idle time - const roundedIdleTime = Math.round(idleTimeRef.current); // Get the final rounded idle time - console.log('Final Idle Time:', roundedIdleTime, 'seconds'); - incrementIdleTime(agvDetail.modelUuid, roundedIdleTime); - activeTimeRef.current = 0; - } else { - // Transitioning to active: Finalize idle time and pass it to incrementIdleTime - const roundedActiveTime = Math.round(activeTimeRef.current); // Round to nearest integer - console.log('Active Time:', roundedActiveTime, 'seconds'); - incrementActiveTime(agvDetail.modelUuid, roundedActiveTime); - idleTimeRef.current = 0; // Reset idle time - } - - - - // Start the animation loop if not already running - if (animationFrameIdRef.current === null) { - animationFrameIdRef.current = requestAnimationFrame(animate); - } - - // Cleanup function to stop the animation loop - return () => { - if (animationFrameIdRef.current !== null) { - cancelAnimationFrame(animationFrameIdRef.current); - animationFrameIdRef.current = null; // Reset the animation frame ID - } - }; - }, [agvDetail.isActive]); - // let position = 0; - // let previousTime: number; - - // function animate(currentTime: number) { - // previousTime = performance.now(); - - // const deltaTime = (currentTime - previousTime) / 1000; - // previousTime = currentTime; - - // position += speed * deltaTime; - // console.log('deltaTime: ', deltaTime); - // console.log('position: ', position); - // if (idleTimeRef.current === 0) { - // activeTimeRef.current = position; - // console.log('position: active', position); - // console.log(' activeTimeRef.current: ', activeTimeRef.current); - // incrementActiveTime(agvDetail.modelUuid, position) - // incrementIdleTime(agvDetail.modelUuid, idleTimeRef.current) - // } - // else if (activeTimeRef.current === 0) { - // idleTimeRef.current = position; - // console.log('position:idle ', position); - // console.log(' idleTimeRef.current: ', idleTimeRef.current); - // incrementActiveTime(agvDetail.modelUuid, activeTimeRef.current) - // incrementIdleTime(agvDetail.modelUuid, position) - // } - // } - - // useEffect(() => { - // if (agvDetail.isActive) { - // idleTimeRef.current = 0; - // activeTimeRef.current = performance.now(); - // requestAnimationFrame(animate); - // } else { - // activeTimeRef.current = 0; - // idleTimeRef.current = performance.now(); - // requestAnimationFrame(animate); - // } - // console.log('vehicles: ', vehicles); - // }, [agvDetail.isActive]); function handleCallBack() { if (currentPhase === 'stationed-pickup') { @@ -299,6 +147,9 @@ function VehicleInstance({ agvDetail }: Readonly<{ agvDetail: VehicleStatus }>) } } + + + function startUnloadingProcess() { if (agvDetail.point.action.triggers.length > 0) { const trigger = getTriggerByUuid(selectedProduct.productId, agvDetail.point.action.triggers[0].triggerUuid); diff --git a/app/src/services/marketplace/fetchAssetDetails.ts b/app/src/services/marketplace/fetchAssetDetails.ts index 9c21b5d..cebefc2 100644 --- a/app/src/services/marketplace/fetchAssetDetails.ts +++ b/app/src/services/marketplace/fetchAssetDetails.ts @@ -1,5 +1,6 @@ let BackEnd_url = `http://${process.env.REACT_APP_SERVER_MARKETPLACE_URL}`; export const getAssetDetails = async (filename: string) => { + console.log('filename: ', filename); try { const response = await fetch(`${BackEnd_url}/api/v1/assetDetails`, { method: "POST", diff --git a/app/src/services/marketplace/fetchGltfUrl.ts b/app/src/services/marketplace/fetchGltfUrl.ts index 3916c9e..e68cde9 100644 --- a/app/src/services/marketplace/fetchGltfUrl.ts +++ b/app/src/services/marketplace/fetchGltfUrl.ts @@ -1,7 +1,28 @@ let BackEnd_url = `http://${process.env.REACT_APP_SERVER_MARKETPLACE_URL}`; -export const fetchGltfUrl = (filename: string) => { - if (filename) { - return `${BackEnd_url}/api/v1/getAssetFile/${filename}`; + +export const fetchGltfUrl = async (filename: string, AssetID: string) => { + try { + const response = await fetch( + `${BackEnd_url}/api/v2/assetDetails/${filename}/${AssetID}`, + { + method: "GET", + headers: { + "Content-Type": "application/json", + }, + // body: JSON.stringify(assetData), + } + ); + + if (!response.ok) { + throw new Error("Failed to fetch asset details"); + } + + const result = await response.json(); + // console.log("result: preview", result); + + return result; + } catch (error: any) { + // + throw new Error(error.message); } - return null; // or handle the case when filename is not provided };