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

app/src/modules/simulation/ui/vehicle/vehicleUI.tsx

@@ -1,39 +1,68 @@
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useEffect, useRef, useState } from "react";
 import * as Types from "../../../../types/world/worldTypes";
 import startPoint from "../../../../assets/gltf-glb/arrow_green.glb";
-import * as THREE from "three";
 import startEnd from "../../../../assets/gltf-glb/arrow_red.glb";
-import { useGLTF } from '@react-three/drei';
+import { useGLTF } from "@react-three/drei";
-import { useFrame, useThree } from '@react-three/fiber';
+import { useFrame, useThree } from "@react-three/fiber";
-import { useSelectedEventSphere, useIsDragging, useIsRotating } from '../../../../store/simulation/useSimulationStore';
+import {
-import { useVehicleStore } from '../../../../store/simulation/useVehicleStore';
+   useSelectedEventSphere,
-import { useProductStore } from '../../../../store/simulation/useProductStore';
+   useIsDragging,
-import { useSelectedProduct } from '../../../../store/simulation/useSimulationStore';
+   useIsRotating,
-import { upsertProductOrEventApi } from '../../../../services/simulation/UpsertProductOrEventApi';
+} from "../../../../store/simulation/useSimulationStore";
+import { useVehicleStore } from "../../../../store/simulation/useVehicleStore";
+import { useProductStore } from "../../../../store/simulation/useProductStore";
+import { useSelectedProduct } from "../../../../store/simulation/useSimulationStore";
+import { upsertProductOrEventApi } from "../../../../services/simulation/UpsertProductOrEventApi";
+import { Box3, DoubleSide, Euler, Group, Mesh, Plane, Quaternion, Vector3 } from "three";
+import { position } from "html2canvas/dist/types/css/property-descriptors/position";
 
 const VehicleUI = () => {
    const { scene: startScene } = useGLTF(startPoint) as any;
    const { scene: endScene } = useGLTF(startEnd) as any;
-    const startMarker = useRef<THREE.Group>(null);
+   const startMarker = useRef<Group>(null);
-    const endMarker = useRef<THREE.Group>(null);
+   const endMarker = useRef<Group>(null);
    const prevMousePos = useRef({ x: 0, y: 0 });
    const { selectedEventSphere } = useSelectedEventSphere();
    const { selectedProduct } = useSelectedProduct();
    const { getVehicleById } = useVehicleStore();
    const { updateEvent } = useProductStore();
-    const [startPosition, setStartPosition] = useState<[number, number, number]>([0, 0, 0]);
+   const [startPosition, setStartPosition] = useState<[number, number, number]>([
-    const [endPosition, setEndPosition] = useState<[number, number, number]>([0, 0, 0]);
+      0, 1, 0,
-    const [startRotation, setStartRotation] = useState<[number, number, number]>([0, 0, 0]);
+   ]);
-    const [endRotation, setEndRotation] = useState<[number, number, number]>([0, 0, 0]);
+
+
+   const [endPosition, setEndPosition] = useState<[number, number, number]>([
+      0, 1, 0,
+   ]);
+   const [startRotation, setStartRotation] = useState<[number, number, number]>([
+      0, 0, 0,
+   ]);
+
+   const [endRotation, setEndRotation] = useState<[number, number, number]>([
+      0, 0, 0,
+   ]);
+   const [steeringRotation, setSteeringRotation] = useState<
+      [number, number, number]
+   >([0, 0, 0]);
+
    const { isDragging, setIsDragging } = useIsDragging();
    const { isRotating, setIsRotating } = useIsRotating();
    const { raycaster } = useThree();
-    const plane = useRef(new THREE.Plane(new THREE.Vector3(0, 1, 0), 0));
+   const [point, setPoint] = useState<
+      [number, number, number]
+   >([0, 0, 0]);
+   const plane = useRef(new Plane(new Vector3(0, 1, 0), 0));
+   const [tubeRotation, setTubeRotation] = useState<boolean>(false);
+   const tubeRef = useRef<Group>(null);
+   const outerGroup = useRef<Group>(null);
    const state: Types.ThreeState = useThree();
    const controls: any = state.controls;
-
+   const [selectedVehicleData, setSelectedVechicleData] = useState<
-    const email = localStorage.getItem('email')
+      { position: [number, number, number], rotation: [number, number, number], }
-    const organization = (email!.split("@")[1]).split(".")[0];
+   >({ position: [0, 0, 0], rotation: [0, 0, 0], });
+   const CIRCLE_RADIUS = 0.8;
+   const email = localStorage.getItem("email");
+   const organization = email!.split("@")[1].split(".")[0];
 
    const updateBackend = (
       productName: string,
@@ -45,78 +74,66 @@ const VehicleUI = () => {
          productName: productName,
          productId: productId,
          organization: organization,
-            eventDatas: eventData
+         eventDatas: eventData,
-        })
+      });
-    }
+   };
 
    useEffect(() => {
       if (!selectedEventSphere) return;
-        const selectedVehicle = getVehicleById(selectedEventSphere.userData.modelUuid);
+      const selectedVehicle = getVehicleById(
+         selectedEventSphere.userData.modelUuid
+      );
 
+      if (selectedVehicle) {
+         setSelectedVechicleData({ position: selectedVehicle.position, rotation: selectedVehicle.rotation });
+         setPoint(selectedVehicle.point.position)
+      }
+
+
+      setTimeout(() => {
          if (selectedVehicle?.point?.action) {
-            const { pickUpPoint, unLoadPoint } = selectedVehicle.point.action;
+            const { pickUpPoint, unLoadPoint, steeringAngle } = selectedVehicle.point.action;
 
-            if (pickUpPoint) {
+            if (pickUpPoint && outerGroup.current) {
-                setStartPosition([pickUpPoint.position.x, 0, pickUpPoint.position.z]);
+               const worldPos = new Vector3(
-                setStartRotation([pickUpPoint.rotation.x, pickUpPoint.rotation.y, pickUpPoint.rotation.z]);
+                  pickUpPoint.position.x,
+                  pickUpPoint.position.y,
+                  pickUpPoint.position.z
+               );
+               const localPosition = outerGroup.current.worldToLocal(worldPos.clone());
+
+
+               setStartPosition([localPosition.x, selectedVehicle.point.position[1], localPosition.z,
+               ]);
+               setStartRotation([pickUpPoint.rotation.x, pickUpPoint.rotation.y, pickUpPoint.rotation.z,])
             } else {
-                const defaultLocal = new THREE.Vector3(0, 0, 1.5);
+               setStartPosition([0, selectedVehicle.point.position[1] + 0.1, 1.5]);
-                const defaultWorld = selectedEventSphere.localToWorld(defaultLocal);
-                setStartPosition([defaultWorld.x, 0, defaultWorld.z]);
                setStartRotation([0, 0, 0]);
             }
+            // end point
+            if (unLoadPoint && outerGroup.current) {
+               const worldPos = new Vector3(unLoadPoint.position.x, unLoadPoint.position.y, unLoadPoint.position.z);
+               const localPosition = outerGroup.current.worldToLocal(worldPos);
 
-            if (unLoadPoint) {
+               setEndPosition([localPosition.x, selectedVehicle.point.position[1], localPosition.z]);
-                setEndPosition([unLoadPoint.position.x, 0, unLoadPoint.position.z]);
+               setEndRotation([unLoadPoint.rotation.x, unLoadPoint.rotation.y, unLoadPoint.rotation.z,
-                setEndRotation([unLoadPoint.rotation.x, unLoadPoint.rotation.y, unLoadPoint.rotation.z]);
+               ]);
             } else {
-                const defaultLocal = new THREE.Vector3(0, 0, -1.5);
+               setEndPosition([0, selectedVehicle.point.position[1] + 0.1, -1.5]);
-                const defaultWorld = selectedEventSphere.localToWorld(defaultLocal);
-                setEndPosition([defaultWorld.x, 0, defaultWorld.z]);
                setEndRotation([0, 0, 0]);
             }
+            setSteeringRotation([0, steeringAngle, 0])
          }
-    }, [selectedEventSphere]);
+      }, 10);
-
-    useFrame(() => {
-        if (!isDragging) return;
-        const intersectPoint = new THREE.Vector3();
-        const intersects = raycaster.ray.intersectPlane(plane.current, intersectPoint);
-
-        if (intersects) {
-            if (isDragging === "start") {
-                setStartPosition([intersectPoint.x, 0, intersectPoint.z]);
-            }
-            if (isDragging === "end") {
-                setEndPosition([intersectPoint.x, 0, intersectPoint.z]);
-            }
-        }
-    });
-
-    useFrame((state) => {
-        if (!isRotating) return;
-
-        const currentPointerX = state.pointer.x;
-        const deltaX = currentPointerX - prevMousePos.current.x;
-        prevMousePos.current.x = currentPointerX;
-
-        const marker = isRotating === "start" ? startMarker.current : endMarker.current;
-
-        if (marker) {
-            const rotationSpeed = 10;
-            if (isRotating === 'start') {
-                const y = startRotation[1] + deltaX * rotationSpeed;
-                setStartRotation([0, y, 0]);
-            } else {
-                const y = endRotation[1] + deltaX * rotationSpeed;
-                setEndRotation([0, y, 0]);
-            }
-        }
-    });
 
 
-    const handlePointerDown = (e: any, state: "start" | "end", rotation: "start" | "end") => {
+   }, [selectedEventSphere, outerGroup.current]);
 
+   const handlePointerDown = (
+      e: any,
+      state: "start" | "end",
+      rotation: "start" | "end"
+   ) => {
       if (e.object.name === "handle") {
          const normalizedX = (e.clientX / window.innerWidth) * 2 - 1;
          const normalizedY = -(e.clientY / window.innerHeight) * 2 + 1;
@@ -124,7 +141,6 @@ const VehicleUI = () => {
          setIsRotating(rotation);
          if (controls) controls.enabled = false;
          setIsDragging(null);
-
       } else {
          setIsDragging(state);
          setIsRotating(null);
@@ -138,25 +154,49 @@ const VehicleUI = () => {
       setIsRotating(null);
 
       if (selectedEventSphere?.userData.modelUuid) {
-            const updatedVehicle = getVehicleById(selectedEventSphere.userData.modelUuid);
+         const updatedVehicle = getVehicleById(
+            selectedEventSphere.userData.modelUuid
+         );
 
-            if (updatedVehicle) {
+         let globalStartPosition = null;
-                const event = updateEvent(selectedProduct.productId, selectedEventSphere.userData.modelUuid, {
+         let globalEndPosition = null;
+
+         if (outerGroup.current && startMarker.current && endMarker.current) {
+            const worldPosStart = new Vector3(...startPosition);
+            globalStartPosition = outerGroup.current.localToWorld(worldPosStart.clone());
+            const worldPosEnd = new Vector3(...endPosition);
+            globalEndPosition = outerGroup.current.localToWorld(worldPosEnd.clone());
+         }
+         if (updatedVehicle && globalEndPosition && globalStartPosition) {
+            const event = updateEvent(
+               selectedProduct.productId,
+               selectedEventSphere.userData.modelUuid,
+               {
                   point: {
                      ...updatedVehicle.point,
                      action: {
                         ...updatedVehicle.point?.action,
                         pickUpPoint: {
-                                position: { x: startPosition[0], y: startPosition[1], z: startPosition[2], },
+                           position: {
-                                rotation: { x: 0, y: startRotation[1], z: 0, },
+                              x: globalStartPosition.x,
+                              y: 0,
+                              z: globalStartPosition.z,
+                           },
+                           rotation: { x: 0, y: startRotation[1], z: 0 },
                         },
                         unLoadPoint: {
-                                position: { x: endPosition[0], y: endPosition[1], z: endPosition[2], },
+                           position: {
-                                rotation: { x: 0, y: endRotation[1], z: 0, },
+                              x: globalEndPosition.x,
+                              y: 0,
+                              z: globalEndPosition.z,
+                           },
+                           rotation: { x: 0, y: endRotation[1], z: 0 },
+                        },
+                        steeringAngle: steeringRotation[1]
                      },
                   },
-                    },
+               }
-                })
+            );
 
             if (event) {
                updateBackend(
@@ -170,28 +210,128 @@ const VehicleUI = () => {
       }
    };
 
+   useFrame(() => {
+      if (!isDragging || !plane.current || !raycaster || !outerGroup.current) return;
+      const intersectPoint = new Vector3();
+      const intersects = raycaster.ray.intersectPlane(plane.current, intersectPoint);
+      if (!intersects) return;
+      const localPoint = outerGroup?.current.worldToLocal(intersectPoint.clone());
+      if (isDragging === "start") {
+         if (startMarker.current) {
+
+         }
+         setStartPosition([localPoint.x, point[1], localPoint.z]);
+      } else if (isDragging === "end") {
+         setEndPosition([localPoint.x, point[1], localPoint.z]);
+      }
+   });
+
    useEffect(() => {
       const handleGlobalPointerUp = () => {
          setIsDragging(null);
          setIsRotating(null);
+         setTubeRotation(false);
          if (controls) controls.enabled = true;
          handlePointerUp();
+
       };
 
-        if (isDragging || isRotating) {
+      if (isDragging || isRotating || tubeRotation) {
          window.addEventListener("pointerup", handleGlobalPointerUp);
       }
 
       return () => {
          window.removeEventListener("pointerup", handleGlobalPointerUp);
       };
-    }, [isDragging, isRotating, startPosition, startRotation, endPosition, endRotation]);
+   }, [
+      isDragging, isRotating, startPosition, startRotation, endPosition, endRotation, tubeRotation, steeringRotation, outerGroup.current, tubeRef.current
+   ]);
 
-    return (
+
-        startPosition.length > 0 && endPosition.length > 0 ? (
+   const prevSteeringY = useRef(0);
-            <mesh>
+   useFrame((state) => {
+      if (tubeRotation) {
+         const currentPointerX = state.pointer.x;
+         const deltaX = currentPointerX - prevMousePos.current.x;
+         prevMousePos.current.x = currentPointerX;
+
+         const marker = tubeRef.current;
+         if (marker) {
+            const rotationSpeed = 2;
+            marker.rotation.y += deltaX * rotationSpeed;
+            setSteeringRotation([marker.rotation.x, marker.rotation.y, marker.rotation.z]);
+         }
+      } else {
+         prevSteeringY.current = 0;
+      }
+   });
+   useFrame((state) => {
+      if (!isRotating) return;
+      const currentPointerX = state.pointer.x;
+      const deltaX = currentPointerX - prevMousePos.current.x;
+      prevMousePos.current.x = currentPointerX;
+      const marker =
+         isRotating === "start" ? startMarker.current : endMarker.current;
+      if (marker) {
+         const rotationSpeed = 10;
+         marker.rotation.y += deltaX * rotationSpeed;
+         if (isRotating === "start") {
+            setStartRotation([
+               marker.rotation.x,
+               marker.rotation.y,
+               marker.rotation.z,
+            ]);
+         } else {
+            setEndRotation([
+               marker.rotation.x,
+               marker.rotation.y,
+               marker.rotation.z,
+            ]);
+         }
+      }
+   });
+
+   return selectedVehicleData ? (
+      <group position={selectedVehicleData.position} rotation={selectedVehicleData.rotation} ref={outerGroup}>
+         <group
+            position={[0, 0, 0]}
+            ref={tubeRef}
+            rotation={steeringRotation}
+            onPointerDown={(e) => {
+               e.stopPropagation();
+               setTubeRotation(true);
+               prevMousePos.current.x = e.pointer.x;
+               controls.enabled = false;
+            }}
+            onPointerMissed={() => {
+               controls.enabled = true;
+               setTubeRotation(false);
+            }}
+            onPointerUp={() => {
+               controls.enabled = true;
+               setTubeRotation(false);
+            }}
+         >
+            (
+            <mesh
+               position={[0, point[1], 0]}
+               rotation={[-Math.PI / 2, 0, 0]}
+               name="steering"
+            >
+               <ringGeometry args={[CIRCLE_RADIUS, CIRCLE_RADIUS + 0.2, 36]} />
+               <meshBasicMaterial color="yellow" side={DoubleSide} />
+
+            </mesh>
+            <mesh position={[0, point[1], CIRCLE_RADIUS + 0.24]} rotation={[Math.PI / 2, 0, 0]}>
+               <coneGeometry args={[0.1, 0.3, 12]} />
+               <meshBasicMaterial color="yellow" side={DoubleSide} />
+            </mesh>
+            )
+         </group>
+
+         {/* Start Marker */}
          <primitive
-                    name="start"
+            name="startMarker"
             object={startScene}
             ref={startMarker}
             position={startPosition}
@@ -207,8 +347,9 @@ const VehicleUI = () => {
             }}
          />
 
+         {/* End Marker */}
          <primitive
-                    name="end"
+            name="endMarker"
             object={endScene}
             ref={endMarker}
             position={endPosition}
@@ -223,10 +364,9 @@ const VehicleUI = () => {
                setIsRotating(null);
             }}
          />
-            </mesh>
+      </group>
-        ) : null
+   ) : null;
-    );
+};
-}
 export default VehicleUI;
 
 

app/src/modules/simulation/vehicle/instances/animator/vehicleAnimator.tsx

@@ -25,6 +25,7 @@ function VehicleAnimator({ path, handleCallBack, currentPhase, agvUuid, agvDetai
     const completedRef = useRef<boolean>(false);
     const isPausedRef = useRef<boolean>(false);
     const pauseTimeRef = useRef<number | null>(null);
+    const [objectRotation, setObjectRotation] = useState<{ x: number; y: number; z: number } | undefined>(agvDetail.point?.action?.pickUpPoint?.rotation || { x: 0, y: 0, z: 0 })
     const [progress, setProgress] = useState<number>(0);
     const [restRotation, setRestingRotation] = useState<boolean>(true);
     const [currentPath, setCurrentPath] = useState<[number, number, number][]>([]);
@@ -32,20 +33,19 @@ function VehicleAnimator({ path, handleCallBack, currentPhase, agvUuid, agvDetai
     let startTime: number;
     let fixedInterval: number;
     let coveredDistance = progressRef.current;
-    let objectRotation = (agvDetail.point?.action?.pickUpPoint?.rotation || { x: 0, y: 0, z: 0 }) as { x: number; y: number; z: number } | undefined;
 
     useEffect(() => {
         if (currentPhase === 'stationed-pickup' && path.length > 0) {
             setCurrentPath(path);
-            objectRotation = agvDetail.point.action?.pickUpPoint?.rotation
+            setObjectRotation(agvDetail.point.action?.pickUpPoint?.rotation)
         } else if (currentPhase === 'pickup-drop' && path.length > 0) {
-            objectRotation = agvDetail.point.action?.unLoadPoint?.rotation
+            setObjectRotation(agvDetail.point.action?.unLoadPoint?.rotation)
             setCurrentPath(path);
         } else if (currentPhase === 'drop-pickup' && path.length > 0) {
-            objectRotation = agvDetail.point.action?.pickUpPoint?.rotation
+            setObjectRotation(agvDetail.point.action?.pickUpPoint?.rotation)
             setCurrentPath(path);
         }
-    }, [currentPhase, path]);
+    }, [currentPhase, path, objectRotation]);
 
     useEffect(() => {
         setProgress(0);
@@ -64,7 +64,6 @@ function VehicleAnimator({ path, handleCallBack, currentPhase, agvUuid, agvDetai
             coveredDistance = 0;
             setReset(false);
             setRestingRotation(true);
-            decrementVehicleLoad(agvDetail.modelUuid, 0);
             isPausedRef.current = false;
             pauseTimeRef.current = 0;
             const object = scene.getObjectByProperty('uuid', agvUuid);
@@ -125,26 +124,30 @@ function VehicleAnimator({ path, handleCallBack, currentPhase, agvUuid, agvDetai
             if (isAligned) {
                 progressRef.current += delta * (speed * agvDetail.speed);
                 coveredDistance = progressRef.current;
-
                 const t = (coveredDistance - accumulatedDistance) / segmentDistance;
                 const position = start.clone().lerp(end, t);
                 object.position.copy(position);
             }
         }
 
+
         if (progressRef.current >= totalDistance) {
             if (restRotation && objectRotation) {
-                const targetQuaternion = new THREE.Quaternion().setFromEuler(new THREE.Euler(objectRotation.x, objectRotation.y, objectRotation.z));
+                const targetEuler = new THREE.Euler(
+                    objectRotation.x,
+                    objectRotation.y - (agvDetail.point.action.steeringAngle),
+                    objectRotation.z
+                );
+                const targetQuaternion = new THREE.Quaternion().setFromEuler(targetEuler);
                 object.quaternion.slerp(targetQuaternion, delta * 2);
-                const angleDiff = object.quaternion.angleTo(targetQuaternion);
+                if (object.quaternion.angleTo(targetQuaternion) < 0.01) {
-                if (angleDiff < 0.01) {
+                    object.quaternion.copy(targetQuaternion);
-                    object.rotation.set(objectRotation.x, objectRotation.y, objectRotation.z);
+                    object.rotation.copy(targetEuler);
                     setRestingRotation(false);
                 }
                 return;
             }
         }
-
         if (progressRef.current >= totalDistance) {
             setRestingRotation(true);
             progressRef.current = 0;
@@ -199,7 +202,7 @@ function VehicleAnimator({ path, handleCallBack, currentPhase, agvUuid, agvDetai
     return (
         <>
             {currentPath.length > 0 && (
-                <group visible={false}>
+                <group >
                     <Line points={currentPath} color="blue" lineWidth={3} />
                     {currentPath.map((point, index) => (
                         <mesh key={index} position={point}>

app/src/modules/simulation/vehicle/instances/instance/vehicleInstance.tsx

@@ -11,7 +11,7 @@ function VehicleInstance({ agvDetail }: { agvDetail: VehicleStatus }) {
     const { navMesh } = useNavMesh();
     const vehicleRef: any = useRef();
     const { isPlaying } = usePlayButtonStore();
-    const { vehicles, setVehicleActive, setVehicleState, incrementVehicleLoad, setVehicleLoad, setMaterialType } = useVehicleStore();
+    const { vehicles, setVehicleActive, setVehicleState, incrementVehicleLoad, setMaterialType, setVehicleLoad } = useVehicleStore();
     const [currentPhase, setCurrentPhase] = useState<string>('stationed');
     const [path, setPath] = useState<[number, number, number][]>([]);
     let isIncrememtable = useRef<boolean>(true);

app/src/modules/simulation/vehicle/vehicles.tsx

@@ -28,13 +28,10 @@ function Vehicles() {
 
     return (
         <>
-
             <VehicleInstances />
-
+            {isVehicleSelected && selectedEventSphere && !isPlaying &&
-            {isVehicleSelected && !isPlaying &&
                 <VehicleUI />
             }
-
         </>
     );
 }

app/src/store/simulation/useVehicleStore.ts

@@ -1,6 +1,5 @@
-
+import { create } from "zustand";
-import { create } from 'zustand';
+import { immer } from "zustand/middleware/immer";
-import { immer } from 'zustand/middleware/immer';
 
 interface VehiclesStore {
     vehicles: VehicleStatus[];
@@ -9,7 +8,7 @@ interface VehiclesStore {
     removeVehicle: (modelUuid: string) => void;
     updateVehicle: (
         modelUuid: string,
-        updates: Partial<Omit<VehicleStatus, 'modelUuid' | 'productId'>>
+        updates: Partial<Omit<VehicleStatus, "modelUuid" | "productId">>
     ) => void;
     clearvehicles: () => void;
 
@@ -18,7 +17,10 @@ interface VehiclesStore {
     incrementVehicleLoad: (modelUuid: string, incrementBy: number) => void;
     decrementVehicleLoad: (modelUuid: string, decrementBy: number) => void;
     setVehicleLoad: (modelUuid: string, load: number) => void;
-    setVehicleState: (modelUuid: string, newState: VehicleStatus['state']) => void;
+    setVehicleState: (
+        modelUuid: string,
+        newState: VehicleStatus["state"]
+    ) => void;
     setMaterialType: (modelUuid: string, materialType: string | null) => void;
     incrementActiveTime: (modelUuid: string, incrementBy: number) => void;
     incrementIdleTime: (modelUuid: string, incrementBy: number) => void;
@@ -35,7 +37,9 @@ export const useVehicleStore = create<VehiclesStore>()(
 
         addVehicle: (productId, event) => {
             set((state) => {
-                const exists = state.vehicles.some(v => v.modelUuid === event.modelUuid);
+                const exists = state.vehicles.some(
+                    (v) => v.modelUuid === event.modelUuid
+                );
                 if (!exists) {
                     state.vehicles.push({
                         ...event,
@@ -53,13 +57,15 @@ export const useVehicleStore = create<VehiclesStore>()(
 
         removeVehicle: (modelUuid) => {
             set((state) => {
-                state.vehicles = state.vehicles.filter(v => v.modelUuid !== modelUuid);
+                state.vehicles = state.vehicles.filter(
+                    (v) => v.modelUuid !== modelUuid
+                );
             });
         },
 
         updateVehicle: (modelUuid, updates) => {
             set((state) => {
-                const vehicle = state.vehicles.find(v => v.modelUuid === modelUuid);
+                const vehicle = state.vehicles.find((v) => v.modelUuid === modelUuid);
                 if (vehicle) {
                     Object.assign(vehicle, updates);
                 }
@@ -74,7 +80,7 @@ export const useVehicleStore = create<VehiclesStore>()(
 
         setVehicleActive: (modelUuid, isActive) => {
             set((state) => {
-                const vehicle = state.vehicles.find(v => v.modelUuid === modelUuid);
+                const vehicle = state.vehicles.find((v) => v.modelUuid === modelUuid);
                 if (vehicle) {
                     vehicle.isActive = isActive;
                 }
@@ -83,7 +89,7 @@ export const useVehicleStore = create<VehiclesStore>()(
 
         updateSteeringAngle: (modelUuid, steeringAngle) => {
             set((state) => {
-                const vehicle = state.vehicles.find(v => v.modelUuid === modelUuid);
+                const vehicle = state.vehicles.find((v) => v.modelUuid === modelUuid);
                 if (vehicle) {
                     vehicle.point.action.steeringAngle = steeringAngle;
                 }
@@ -92,7 +98,7 @@ export const useVehicleStore = create<VehiclesStore>()(
 
         incrementVehicleLoad: (modelUuid, incrementBy) => {
             set((state) => {
-                const vehicle = state.vehicles.find(v => v.modelUuid === modelUuid);
+                const vehicle = state.vehicles.find((v) => v.modelUuid === modelUuid);
                 if (vehicle) {
                     vehicle.currentLoad += incrementBy;
                 }
@@ -101,7 +107,7 @@ export const useVehicleStore = create<VehiclesStore>()(
 
         decrementVehicleLoad: (modelUuid, decrementBy) => {
             set((state) => {
-                const vehicle = state.vehicles.find(v => v.modelUuid === modelUuid);
+                const vehicle = state.vehicles.find((v) => v.modelUuid === modelUuid);
                 if (vehicle) {
                     vehicle.currentLoad -= decrementBy;
                 }
@@ -110,7 +116,7 @@ export const useVehicleStore = create<VehiclesStore>()(
 
         setVehicleLoad: (modelUuid, load) => {
             set((state) => {
-                const vehicle = state.vehicles.find(v => v.modelUuid === modelUuid);
+                const vehicle = state.vehicles.find((v) => v.modelUuid === modelUuid);
                 if (vehicle) {
                     vehicle.currentLoad = load;
                 }
@@ -119,7 +125,7 @@ export const useVehicleStore = create<VehiclesStore>()(
 
         setVehicleState: (modelUuid, newState) => {
             set((state) => {
-                const vehicle = state.vehicles.find(v => v.modelUuid === modelUuid);
+                const vehicle = state.vehicles.find((v) => v.modelUuid === modelUuid);
                 if (vehicle) {
                     vehicle.state = newState;
                 }
@@ -128,7 +134,7 @@ export const useVehicleStore = create<VehiclesStore>()(
 
         setMaterialType: (modelUuid, materialType) => {
             set((state) => {
-                const vehicle = state.vehicles.find(v => v.modelUuid === modelUuid);
+                const vehicle = state.vehicles.find((v) => v.modelUuid === modelUuid);
                 if (vehicle) {
                     vehicle.materialType = materialType;
                 }
@@ -137,7 +143,7 @@ export const useVehicleStore = create<VehiclesStore>()(
 
         incrementActiveTime: (modelUuid, incrementBy) => {
             set((state) => {
-                const vehicle = state.vehicles.find(v => v.modelUuid === modelUuid);
+                const vehicle = state.vehicles.find((v) => v.modelUuid === modelUuid);
                 if (vehicle) {
                     vehicle.activeTime += incrementBy;
                 }
@@ -146,7 +152,7 @@ export const useVehicleStore = create<VehiclesStore>()(
 
         incrementIdleTime: (modelUuid, incrementBy) => {
             set((state) => {
-                const vehicle = state.vehicles.find(v => v.modelUuid === modelUuid);
+                const vehicle = state.vehicles.find((v) => v.modelUuid === modelUuid);
                 if (vehicle) {
                     vehicle.idleTime += incrementBy;
                 }
@@ -154,19 +160,19 @@ export const useVehicleStore = create<VehiclesStore>()(
         },
 
         getVehicleById: (modelUuid) => {
-            return get().vehicles.find(v => v.modelUuid === modelUuid);
+            return get().vehicles.find((v) => v.modelUuid === modelUuid);
         },
 
         getVehiclesByProduct: (productId) => {
-            return get().vehicles.filter(v => v.productId === productId);
+            return get().vehicles.filter((v) => v.productId === productId);
         },
 
         getVehiclesByState: (state) => {
-            return get().vehicles.filter(v => v.state === state);
+            return get().vehicles.filter((v) => v.state === state);
         },
 
         getActiveVehicles: () => {
-            return get().vehicles.filter(v => v.isActive);
+            return get().vehicles.filter((v) => v.isActive);
-        }
+        },
     }))
 );