Merge remote-tracking branch 'origin/simulation-agv' into simulation

app/src/modules/builder/agv/agv.tsx

@@ -22,6 +22,7 @@ const Agv = ({
       modelSpeed: number;
       bufferTime: number;
       points: { x: number; y: number; z: number }[];
+      hitCount: number;
     }[]
   >([]);
   const { simulationPaths } = useSimulationPaths();
@@ -33,6 +34,7 @@ const Agv = ({
         (val: any) => val.modelName === "agv"
       );
 
+      
       let findMesh = agvModels.filter(
         (val: any) =>
           val.modeluuid === selectedActionSphere?.path?.modeluuid &&
@@ -49,29 +51,30 @@ const Agv = ({
           "x" in findMesh[0].points.actions.end &&
           "y" in findMesh[0].points.actions.end
           ? [
-            {
-              modelUuid: findMesh[0].modeluuid, // Ensure it's a number
-              modelSpeed: findMesh[0].points.speed,
-              bufferTime: findMesh[0].points.actions.buffer,
-              points: [
-                {
-                  x: findMesh[0].position[0],
-                  y: findMesh[0].position[1],
-                  z: findMesh[0].position[2],
-                },
-                {
-                  x: findMesh[0].points.actions.start.x,
-                  y: 0,
-                  z: findMesh[0].points.actions.start.y,
-                },
-                {
-                  x: findMesh[0].points.actions.end.x,
-                  y: 0,
-                  z: findMesh[0].points.actions.end.y,
-                },
-              ],
-            },
-          ]
+              {
+                modelUuid: findMesh[0].modeluuid, // Ensure it's a number
+                modelSpeed: findMesh[0].points.speed,
+                bufferTime: findMesh[0].points.actions.buffer,
+                hitCount: findMesh[0].points.actions.hitCount,
+                points: [
+                  {
+                    x: findMesh[0].position[0],
+                    y: findMesh[0].position[1],
+                    z: findMesh[0].position[2],
+                  },
+                  {
+                    x: findMesh[0].points.actions.start.x,
+                    y: 0,
+                    z: findMesh[0].points.actions.start.y,
+                  },
+                  {
+                    x: findMesh[0].points.actions.end.x,
+                    y: 0,
+                    z: findMesh[0].points.actions.end.y,
+                  },
+                ],
+              },
+            ]
           : [];
       if (result.length > 0) {
         // setPathPoints((prev) => [...prev, ...result]);
@@ -119,6 +122,7 @@ const Agv = ({
             key={i}
             speed={pair.modelSpeed}
             bufferTime={pair.bufferTime}
+            hitCount={pair.hitCount}
           />
           {/* {pair.points.length > 2 && (
             <>

app/src/modules/builder/agv/navMeshDetails.tsx

@@ -35,7 +35,6 @@ export default function NavMeshDetails({
         const cellSize = 0.35;
         const cellHeight = 0.7;
         const walkableRadius = 0.5;
-
         const { success, navMesh } = generateSoloNavMesh(positions, indices, {
           cs: cellSize,
           ch: cellHeight,

app/src/modules/builder/agv/pathNavigator.tsx

@@ -12,6 +12,7 @@ interface PathNavigatorProps {
   id: string;
   speed: number;
   bufferTime: number;
+  hitCount: number;
 }
 
 export default function PathNavigator({
@@ -20,6 +21,7 @@ export default function PathNavigator({
   id,
   speed,
   bufferTime,
+  hitCount,
 }: PathNavigatorProps) {
   const [path, setPath] = useState<[number, number, number][]>([]);
   const progressRef = useRef(0);
@@ -32,7 +34,7 @@ export default function PathNavigator({
   const [startPoint, setStartPoint] = useState(new THREE.Vector3());
   const isWaiting = useRef<boolean>(false); // Flag to track waiting state
   const delayTime = bufferTime;
-  
+
   const movingForward = useRef<boolean>(true); // Tracks whether the object is moving forward
   // Compute distances and total distance when the path changes
   useEffect(() => {
@@ -52,6 +54,7 @@ export default function PathNavigator({
     progressRef.current = 0;
   }, [path]);
 
+  // Compute the path using NavMeshQuery
   useEffect(() => {
     if (!navMesh || selectedPoints.length === 0) return;
 
@@ -119,17 +122,22 @@ export default function PathNavigator({
         if (!isWaiting.current) {
           isWaiting.current = true; // Set waiting flag
 
-          setTimeout(() => {
-            progressRef.current = 0; // Reset progress
-            movingForward.current = !movingForward.current; // Toggle direction
-
-            // Reverse the path and distances arrays
-            path.reverse();
-            distancesRef.current.reverse();
-
-            // Reset the waiting flag
-            isWaiting.current = false;
-          }, delayTime * 1000); // Convert seconds to milliseconds
+          if (movingForward.current) {
+            // Moving forward: reached the end, wait for `delay`
+            // console.log(
+            //   "Reached end position. Waiting for delay:",
+            //   delayTime,
+            //   "seconds"
+            // );
+            setTimeout(() => {
+              // After delay, reverse direction
+              movingForward.current = false;
+              progressRef.current = 0; // Reset progress
+              path.reverse(); // Reverse the path
+              distancesRef.current.reverse();
+              isWaiting.current = false; // Reset waiting flag
+            }, delayTime * 1000); // Wait for `delay` seconds
+          }
         }
         return;
       }
@@ -154,7 +162,7 @@ export default function PathNavigator({
       findObject.position.copy(startPoint);
     }
   });
- 
+
   return (
     <>
       {path.length > 0 && (

app/src/services/factoryBuilder/assest/assets/getCategoryAsset.ts

@@ -1,4 +1,4 @@
-let BackEnd_url = `http://${process.env.REACT_APP_SERVER_ASSET_LIBRARY_URL}`;
+let BackEnd_url = `http://${process.env.REACT_APP_SERVER_MARKETPLACE_URL}`;
 export const getCategoryAsset = async (categoryName: any) => {
   try {
     const response = await fetch(