Update compose.yaml

app/src/modules/builder/asset/models/model/model.tsx

@@ -410,7 +410,7 @@ function Model({ asset }: { readonly asset: Asset }) {
                 mixerRef.current.removeEventListener('finished', handleAnimationComplete);
             }
         };
-    }, [asset.animationState?.current, asset.animationState?.isCompleted, asset.animationState?.isPlaying, isPaused, activeModule]);
+    }, [asset.animationState?.current, asset.animationState?.isPlaying, isPaused, activeModule]);
 
     useEffect(() => {
         const canvasElement = gl.domElement;

app/src/modules/builder/line/line.tsx

@@ -9,7 +9,6 @@ import * as Constants from '../../../types/world/worldConstants';
 import { useVersionContext } from '../version/versionContext';
 import { useParams } from 'react-router-dom';
 import { getUserData } from '../../../functions/getUserData';
-import { useSelectedPoints } from '../../../store/simulation/useSimulationStore';
 
 // import { upsertWallApi } from '../../../services/factoryBuilder/wall/upsertWallApi';
 // import { deleteWallApi } from '../../../services/factoryBuilder/wall/deleteWallApi';
@@ -39,7 +38,6 @@ function Line({ points }: Readonly<LineProps>) {
     const { projectId } = useParams();
     const [dragOffset, setDragOffset] = useState<THREE.Vector3 | null>(null);
     const { hoveredLine, setHoveredLine, hoveredPoint } = useBuilderStore();
-    const { selectedPoints } = useSelectedPoints();
 
     const path = useMemo(() => {
         const [start, end] = points.map(p => new THREE.Vector3(...p.position));
@@ -374,8 +372,8 @@ function Line({ points }: Readonly<LineProps>) {
                 onClick={() => {
                     handlePointClick(points);
                 }}
-                onPointerOver={(e) => {
+                onPointerOver={() => {
-                    if (!hoveredLine && selectedPoints.length === 0 && e.buttons === 0 && !e.ctrlKey) {
+                    if (!hoveredLine) {
                         setHoveredLine(points);
                         setIsHovered(true)
                         if (toolMode === 'move' && !hoveredPoint) {

app/src/modules/builder/point/point.tsx

@@ -5,7 +5,6 @@ import { useSocketStore, useToolMode } from '../../../store/builder/store';
 import { DragControls } from '@react-three/drei';
 import { useThree } from '@react-three/fiber';
 import { useBuilderStore } from '../../../store/builder/useBuilderStore';
-import { useSelectedPoints } from '../../../store/simulation/useSimulationStore';
 import { usePointSnapping } from './helpers/usePointSnapping';
 import { useParams } from 'react-router-dom';
 import { useVersionContext } from '../version/versionContext';
@@ -27,7 +26,6 @@ function Point({ point }: { readonly point: Point }) {
     const { raycaster, camera, pointer, gl } = useThree();
     const plane = useMemo(() => new THREE.Plane(new THREE.Vector3(0, 1, 0), 0), []);
     const [isHovered, setIsHovered] = useState(false);
-    const [isSelected, setIsSelected] = useState(false);
     const [dragOffset, setDragOffset] = useState<THREE.Vector3 | null>(null);
     const { socket } = useSocketStore();
     const { toolMode } = useToolMode();
@@ -38,7 +36,6 @@ function Point({ point }: { readonly point: Point }) {
     const { setPosition: setZonePosition, removePoint: removeZonePoint, getZonesByPointId } = zoneStore();
     const { snapAislePoint, snapAisleAngle, snapWallPoint, snapWallAngle, snapFloorPoint, snapFloorAngle, snapZonePoint, snapZoneAngle } = usePointSnapping({ uuid: point.pointUuid, pointType: point.pointType, position: point.position });
     const { hoveredPoint, setHoveredPoint } = useBuilderStore();
-    const { selectedPoints } = useSelectedPoints();
     const { userId, organization } = getUserData();
     const { selectedVersionStore } = useVersionContext();
     const { selectedVersion } = selectedVersionStore();
@@ -409,61 +406,50 @@ function Point({ point }: { readonly point: Point }) {
         }
     }, [hoveredPoint])
 
-    useEffect(() => {
-        if (selectedPoints.length > 0 && selectedPoints.some((selectedPoint) => (selectedPoint.userData.pointUuid && selectedPoint.userData.pointUuid === point.pointUuid))) {
-            setIsSelected(true);
-        } else {
-            setIsSelected(false);
-        }
-    }, [selectedPoints])
-
     if (!point) {
         return null;
     }
 
-
     return (
-        <>
+        <DragControls
-            {!isSelected ?
+            axisLock='y'
-                <DragControls
+            autoTransform={false}
-                    axisLock='y'
+            onDragStart={() => handleDragStart(point)}
-                    autoTransform={false}
+            onDrag={() => handleDrag(point)}
-                    onDragStart={() => handleDragStart(point)}
+            onDragEnd={() => handleDragEnd(point)}
-                    onDrag={() => handleDrag(point)}
+        >
-                    onDragEnd={() => handleDragEnd(point)}
+            <mesh
-                >
+                key={point.pointUuid}
-                    <mesh
+                uuid={point.pointUuid}
-                        key={point.pointUuid}
+                name={`${point.pointType}-Point`}
-                        uuid={point.pointUuid}
+                position={new THREE.Vector3(...point.position)}
-                        name={`${point.pointType}-Point`}
+                onClick={() => {
-                        position={[...point.position]}
+                    handlePointClick(point);
-                        onClick={() => {
+                }}
-                            handlePointClick(point);
+                onPointerOver={() => {
-                        }}
+                    if (!hoveredPoint) {
-                        onPointerOver={(e) => {
+                        setHoveredPoint(point);
-                            if (!hoveredPoint && selectedPoints.length === 0 && e.buttons === 0 && !e.ctrlKey) {
+                        setIsHovered(true);
-                                setHoveredPoint(point);
+                        if (toolMode === 'move') {
-                                setIsHovered(true);
+                            gl.domElement.style.cursor = 'pointer';
-                                if (toolMode === 'move') {
+                        }
-                                    gl.domElement.style.cursor = 'pointer';
+                    }
-                                }
+                }}
-                            }
+                onPointerOut={() => {
-                        }}
+                    if (hoveredPoint) {
-                        onPointerOut={() => {
+                        setHoveredPoint(null);
-                            if (hoveredPoint) {
+                        gl.domElement.style.cursor = 'default';
-                                setHoveredPoint(null);
+                    }
-                                gl.domElement.style.cursor = 'default';
+                    setIsHovered(false)
-                            }
+                }}
-                            setIsHovered(false)
+                userData={point}
-                        }}
+            >
-                        userData={point}
+                <boxGeometry args={boxScale} />
-                    >
+                <shaderMaterial
-                        <boxGeometry args={boxScale} />
+                    ref={materialRef}
-                        <shaderMaterial
+                    uniforms={uniforms}
-                            ref={materialRef}
+                    vertexShader={
-                            uniforms={uniforms}
+                        `
-                            vertexShader={
-                                `
                             varying vec2 vUv;
 
                             void main() {
@@ -471,9 +457,9 @@ function Point({ point }: { readonly point: Point }) {
                                 gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
                             }
                         `
-                            }
+                    }
-                            fragmentShader={
+                    fragmentShader={
-                                `
+                        `
                             varying vec2 vUv;
                             uniform vec3 uOuterColor;
                             uniform vec3 uInnerColor;
@@ -488,32 +474,10 @@ function Point({ point }: { readonly point: Point }) {
                                     }
                                 }
                         `
-                            }
+                    }
-                        />
+                />
-                    </mesh>
+            </mesh>
-                </DragControls>
+        </DragControls>
-                :
-                <group
-                    key={point.pointUuid}
-                    uuid={point.pointUuid}
-                    name={`${point.pointType}-Point`}
-                    position={[point.position[0], 0.3, point.position[2]]}
-                    userData={point}
-                    rotation={[Math.PI / 2, 0, 0]}
-                >
-                    <mesh>
-                        <torusGeometry args={[0.4, 0.1, 2, 16]} />
-                        <meshBasicMaterial color="#6F42C1" />
-                    </mesh>
-
-                    <mesh position={[0, 0, 0]}>
-                        <sphereGeometry args={[0.3, 8, 16]} />
-                        <meshBasicMaterial color="white" />
-                    </mesh>
-                </group>
-
-            }
-        </>
     );
 }
 

app/src/modules/builder/wall/Instances/instance/helpers/useWallClassification.ts

@@ -85,45 +85,13 @@ export function useWallClassification(walls: Walls) {
             }));
         }
 
-        const validLineStrings = mergedLineStrings.map(ls => {
+        const allCoords = mergedLineStrings.flatMap(ls => ls.geometry.coordinates);
-            const coords = ls.geometry.coordinates.map(coord => coord.join(','));
+        const uniqueCoords = Array.from(new Set(allCoords.map(coord => coord.join(','))));
+        if (uniqueCoords.length < 4) return [];
 
-            if (coords.length < 2) return null;
+        const lineStrings = turf.featureCollection(mergedLineStrings);
 
-            const start = coords[0];
+        const polygons = turf.polygonize(lineStrings);
-            const end = coords[coords.length - 1];
-            const middle = coords.slice(1, -1);
-
-            const seen = new Set<string>([start, end]);
-            const filteredMiddle: string[] = [];
-
-            for (const point of middle) {
-                if (!seen.has(point)) {
-                    seen.add(point);
-                    filteredMiddle.push(point);
-                }
-            }
-
-            const newCoords = [start, ...filteredMiddle, end];
-
-            if (newCoords.length >= 4) {
-                const resultCoords = newCoords.map(str => str.split(',').map(Number));
-                return {
-                    ...ls,
-                    geometry: {
-                        ...ls.geometry,
-                        coordinates: resultCoords,
-                    },
-                };
-            }
-
-            return null;
-        }).filter(Boolean);
-
-        if (validLineStrings.length === 0) return [];
-
-        const lineStrings = turf.featureCollection(validLineStrings as any);
-        const polygons = turf.polygonize(lineStrings as any);
 
         const rooms: Point[][] = [];
 

app/src/modules/scene/controls/controls.tsx

@@ -9,11 +9,10 @@ import { getCamera } from "../../../services/factoryBuilder/camera/getCameraApi"
 import updateCamPosition from "../camera/updateCameraPosition";
 import CamMode from "../camera/camMode";
 import SwitchView from "../camera/switchView";
-import SelectionControls3D from "./selectionControls/selection3D/selectionControls3D";
+import SelectionControls from "./selectionControls/selectionControls";
 import TransformControl from "./transformControls/transformControls";
 import { useParams } from "react-router-dom";
 import { getUserData } from "../../../functions/getUserData";
-import SelectionControls2D from "./selectionControls/selection2D/selectionControls2D";
 
 export default function Controls() {
     const controlsRef = useRef<CameraControls>(null);
@@ -138,9 +137,7 @@ export default function Controls() {
 
             </CameraControls>
 
-            <SelectionControls3D />
+            <SelectionControls />
-
-            <SelectionControls2D />
 
             <TransformControl />
 

app/src/modules/scene/controls/selectionControls/boundingBoxHelper.tsx

@@ -1,7 +1,7 @@
 import { Line } from "@react-three/drei";
 import { useMemo } from "react";
 import * as THREE from "three";
-import { useSelectedAssets } from "../../../../../store/builder/store";
+import { useSelectedAssets } from "../../../../store/builder/store";
 
 interface BoundingBoxProps {
     boundingBoxRef?: any;

app/src/modules/scene/controls/selectionControls/copyPasteControls.tsx

@@ -2,17 +2,17 @@ import * as THREE from "three";
 import { useEffect, useMemo } from "react";
 import { useFrame, useThree } from "@react-three/fiber";
 import { SkeletonUtils } from "three-stdlib";
-import { useSelectedAssets, useSocketStore, useToggleView } from "../../../../../store/builder/store";
+import { useSelectedAssets, useSocketStore, useToggleView } from "../../../../store/builder/store";
-import * as Types from "../../../../../types/world/worldTypes";
+import * as Types from "../../../../types/world/worldTypes";
-import { detectModifierKeys } from "../../../../../utils/shortcutkeys/detectModifierKeys";
+import { detectModifierKeys } from "../../../../utils/shortcutkeys/detectModifierKeys";
 import { useParams } from "react-router-dom";
-import { getUserData } from "../../../../../functions/getUserData";
+import { getUserData } from "../../../../functions/getUserData";
-import { useSceneContext } from "../../../sceneContext";
+import { useSceneContext } from "../../sceneContext";
-import { useVersionContext } from "../../../../builder/version/versionContext";
+import { useVersionContext } from "../../../builder/version/versionContext";
 
-// import { setAssetsApi } from '../../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi';
+// import { setAssetsApi } from '../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi';
 
-const CopyPasteControls3D = ({
+const CopyPasteControls = ({
     copiedObjects,
     setCopiedObjects,
     pastedObjects,
@@ -490,4 +490,4 @@ const CopyPasteControls3D = ({
     return null;
 };
 
-export default CopyPasteControls3D;
+export default CopyPasteControls;

app/src/modules/scene/controls/selectionControls/duplicationControls.tsx

@@ -2,17 +2,17 @@ import * as THREE from "three";
 import { useEffect, useMemo } from "react";
 import { useFrame, useThree } from "@react-three/fiber";
 import { SkeletonUtils } from "three-stdlib";
-import { useSelectedAssets, useSocketStore, useToggleView } from "../../../../../store/builder/store";
+import { useSelectedAssets, useSocketStore, useToggleView } from "../../../../store/builder/store";
-import * as Types from "../../../../../types/world/worldTypes";
+import * as Types from "../../../../types/world/worldTypes";
-import { detectModifierKeys } from "../../../../../utils/shortcutkeys/detectModifierKeys";
+import { detectModifierKeys } from "../../../../utils/shortcutkeys/detectModifierKeys";
 import { useParams } from "react-router-dom";
-import { getUserData } from "../../../../../functions/getUserData";
+import { getUserData } from "../../../../functions/getUserData";
-import { useSceneContext } from "../../../sceneContext";
+import { useSceneContext } from "../../sceneContext";
-import { useVersionContext } from "../../../../builder/version/versionContext";
+import { useVersionContext } from "../../../builder/version/versionContext";
 
-// import { setAssetsApi } from '../../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi';
+// import { setAssetsApi } from '../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi';
 
-const DuplicationControls3D = ({
+const DuplicationControls = ({
     duplicatedObjects,
     setDuplicatedObjects,
     setpastedObjects,
@@ -459,4 +459,4 @@ const DuplicationControls3D = ({
     return null;
 };
 
-export default DuplicationControls3D;
+export default DuplicationControls;

app/src/modules/scene/controls/selectionControls/moveControls.tsx

@@ -1,21 +1,20 @@
 import * as THREE from "three";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { useFrame, useThree } from "@react-three/fiber";
-import { useSelectedAssets, useSocketStore, useToggleView, } from "../../../../../store/builder/store";
+import { useSelectedAssets, useSocketStore, useToggleView, } from "../../../../store/builder/store";
-import * as Types from "../../../../../types/world/worldTypes";
+// import { setAssetsApi } from '../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi';
-import { detectModifierKeys } from "../../../../../utils/shortcutkeys/detectModifierKeys";
+import * as Types from "../../../../types/world/worldTypes";
-import { upsertProductOrEventApi } from "../../../../../services/simulation/products/UpsertProductOrEventApi";
+import { detectModifierKeys } from "../../../../utils/shortcutkeys/detectModifierKeys";
-import { snapControls } from "../../../../../utils/handleSnap";
+import { upsertProductOrEventApi } from "../../../../services/simulation/products/UpsertProductOrEventApi";
+import { snapControls } from "../../../../utils/handleSnap";
 import DistanceFindingControls from "./distanceFindingControls";
 import { useParams } from "react-router-dom";
-import { useProductContext } from "../../../../simulation/products/productContext";
+import { useProductContext } from "../../../simulation/products/productContext";
-import { getUserData } from "../../../../../functions/getUserData";
+import { getUserData } from "../../../../functions/getUserData";
-import { useSceneContext } from "../../../sceneContext";
+import { useSceneContext } from "../../sceneContext";
-import { useVersionContext } from "../../../../builder/version/versionContext";
+import { useVersionContext } from "../../../builder/version/versionContext";
 
-// import { setAssetsApi } from '../../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi';
+function MoveControls({
-
-function MoveControls3D({
     movedObjects,
     setMovedObjects,
     pastedObjects,
@@ -365,4 +364,4 @@ function MoveControls3D({
     );
 }
 
-export default MoveControls3D;
+export default MoveControls;

app/src/modules/scene/controls/selectionControls/rotateControls.tsx

@@ -1,18 +1,17 @@
 import * as THREE from "three";
 import { useEffect, useMemo, useRef } from "react";
 import { useFrame, useThree } from "@react-three/fiber";
-import { useSelectedAssets, useSocketStore, useToggleView } from "../../../../../store/builder/store";
+import { useSelectedAssets, useSocketStore, useToggleView } from "../../../../store/builder/store";
-import * as Types from "../../../../../types/world/worldTypes";
+// import { setAssetsApi } from '../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi';
-import { upsertProductOrEventApi } from "../../../../../services/simulation/products/UpsertProductOrEventApi";
+import * as Types from "../../../../types/world/worldTypes";
+import { upsertProductOrEventApi } from "../../../../services/simulation/products/UpsertProductOrEventApi";
 import { useParams } from "react-router-dom";
-import { useProductContext } from "../../../../simulation/products/productContext";
+import { useProductContext } from "../../../simulation/products/productContext";
-import { getUserData } from "../../../../../functions/getUserData";
+import { getUserData } from "../../../../functions/getUserData";
-import { useSceneContext } from "../../../sceneContext";
+import { useSceneContext } from "../../sceneContext";
-import { useVersionContext } from "../../../../builder/version/versionContext";
+import { useVersionContext } from "../../../builder/version/versionContext";
 
-// import { setAssetsApi } from '../../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi';
+function RotateControls({
-
-function RotateControls3D({
     rotatedObjects,
     setRotatedObjects,
     movedObjects,
@@ -301,4 +300,4 @@ function RotateControls3D({
     return null;
 }
 
-export default RotateControls3D
+export default RotateControls

app/src/modules/scene/controls/selectionControls/selection2D/moveControls2D.tsx

@@ -1,341 +0,0 @@
-import * as THREE from "three";
-import { useCallback, useEffect, useMemo, useState } from "react";
-import { useFrame, useThree } from "@react-three/fiber";
-import { useSocketStore, useToggleView, useToolMode, } from "../../../../../store/builder/store";
-import { detectModifierKeys } from "../../../../../utils/shortcutkeys/detectModifierKeys";
-import { useParams } from "react-router-dom";
-import { getUserData } from "../../../../../functions/getUserData";
-import { useSceneContext } from "../../../sceneContext";
-import { useVersionContext } from "../../../../builder/version/versionContext";
-import { useSelectedPoints } from "../../../../../store/simulation/useSimulationStore";
-import useModuleStore from "../../../../../store/useModuleStore";
-
-// import { upsertAisleApi } from "../../../../../services/factoryBuilder/aisle/upsertAisleApi";
-// import { upsertWallApi } from "../../../../../services/factoryBuilder/wall/upsertWallApi";
-// import { upsertFloorApi } from "../../../../../services/factoryBuilder/floor/upsertFloorApi";
-// import { upsertZoneApi } from "../../../../../services/factoryBuilder/zone/upsertZoneApi";
-
-function MoveControls2D({
-    movedObjects,
-    setMovedObjects,
-    pastedObjects,
-    setpastedObjects,
-    duplicatedObjects,
-    setDuplicatedObjects,
-    rotatedObjects,
-    setRotatedObjects,
-}: any) {
-    const { camera, controls, gl, scene, pointer, raycaster } = useThree();
-    const plane = useMemo(() => new THREE.Plane(new THREE.Vector3(0, 1, 0), 0), []);
-    const { toolMode } = useToolMode();
-    const { toggleView } = useToggleView();
-    const { activeModule } = useModuleStore();
-    const { selectedPoints, clearSelectedPoints } = useSelectedPoints();
-    const { socket } = useSocketStore();
-    const { userId, organization } = getUserData();
-    const { projectId } = useParams();
-    const { selectedVersionStore } = useVersionContext();
-    const { selectedVersion } = selectedVersionStore();
-    const { aisleStore, wallStore, floorStore, zoneStore } = useSceneContext();
-    const { setPosition: setAislePosition, getAislesByPointId } = aisleStore();
-    const { setPosition: setWallPosition, getWallsByPointId } = wallStore();
-    const { setPosition: setFloorPosition, getFloorsByPointId } = floorStore();
-    const { setPosition: setZonePosition, getZonesByPointId } = zoneStore();
-    const [dragOffset, setDragOffset] = useState<THREE.Vector3 | null>(null);
-    const [initialPositions, setInitialPositions] = useState<Record<string, THREE.Vector3>>({});
-    const [initialStates, setInitialStates] = useState<Record<string, { position: THREE.Vector3; rotation?: THREE.Euler; }>>({});
-    const [isMoving, setIsMoving] = useState(false);
-
-    useEffect(() => {
-        if (!camera || !scene || !toggleView) return;
-
-        const canvasElement = gl.domElement;
-        canvasElement.tabIndex = 0;
-
-        let isMoving = false;
-
-        const onPointerDown = () => {
-            isMoving = false;
-        };
-
-        const onPointerMove = () => {
-            isMoving = true;
-        };
-
-        const onPointerUp = (event: PointerEvent) => {
-            if (!isMoving && movedObjects.length > 0 && event.button === 0) {
-                event.preventDefault();
-                placeMovedAssets();
-            }
-            if (!isMoving && movedObjects.length > 0 && event.button === 2) {
-                event.preventDefault();
-
-                clearSelection();
-                setMovedObjects([]);
-                resetToInitialPositions();
-            }
-        };
-
-        const onKeyDown = (event: KeyboardEvent) => {
-            const keyCombination = detectModifierKeys(event);
-
-            if (pastedObjects.length > 0 || duplicatedObjects.length > 0 || rotatedObjects.length > 0) return;
-
-            if (keyCombination === "G") {
-                if (selectedPoints.length > 0) {
-                    moveAssets();
-                }
-            }
-
-            if (keyCombination === "ESCAPE") {
-                event.preventDefault();
-
-                clearSelection();
-                setMovedObjects([]);
-                resetToInitialPositions();
-            }
-        };
-
-        if (toggleView && selectedPoints.length > 0) {
-            canvasElement.addEventListener("pointerdown", onPointerDown);
-            canvasElement.addEventListener("pointermove", onPointerMove);
-            canvasElement.addEventListener("pointerup", onPointerUp);
-            canvasElement.addEventListener("keydown", onKeyDown);
-        }
-
-        return () => {
-            canvasElement.removeEventListener("pointerdown", onPointerDown);
-            canvasElement.removeEventListener("pointermove", onPointerMove);
-            canvasElement.removeEventListener("pointerup", onPointerUp);
-            canvasElement.removeEventListener("keydown", onKeyDown);
-        };
-    }, [camera, controls, scene, toggleView, selectedPoints, socket, pastedObjects, duplicatedObjects, movedObjects, rotatedObjects]);
-
-    useEffect(() => {
-        if (toolMode !== 'move' || !toggleView) {
-            if (movedObjects.length > 0) {
-                resetToInitialPositions();
-            }
-            clearSelection();
-        }
-    }, [activeModule, toolMode, toggleView, movedObjects]);
-
-    useFrame(() => {
-        if (!isMoving || movedObjects.length === 0 || !dragOffset) return;
-
-        raycaster.setFromCamera(pointer, camera);
-        const intersectionPoint = new THREE.Vector3();
-        const hit = raycaster.ray.intersectPlane(plane, intersectionPoint);
-
-        if (hit) {
-            const baseNewPosition = new THREE.Vector3().addVectors(hit, dragOffset);
-
-            movedObjects.forEach((movedPoint: THREE.Object3D) => {
-                if (movedPoint.userData.pointUuid) {
-                    const point: Point = movedPoint.userData as Point;
-                    const initialPosition = initialPositions[movedPoint.uuid];
-
-                    if (initialPosition) {
-                        const relativeOffset = new THREE.Vector3().subVectors(
-                            initialPosition,
-                            initialPositions[movedObjects[0].uuid]
-                        );
-
-                        const newPosition = new THREE.Vector3().addVectors(baseNewPosition, relativeOffset);
-                        const positionArray: [number, number, number] = [newPosition.x, newPosition.y, newPosition.z];
-
-                        if (point.pointType === 'Aisle') {
-                            setAislePosition(point.pointUuid, positionArray);
-                        } else if (point.pointType === 'Wall') {
-                            setWallPosition(point.pointUuid, positionArray);
-                        } else if (point.pointType === 'Floor') {
-                            setFloorPosition(point.pointUuid, positionArray);
-                        } else if (point.pointType === 'Zone') {
-                            setZonePosition(point.pointUuid, positionArray);
-                        }
-                    }
-                }
-            });
-        }
-    });
-
-    const calculateDragOffset = useCallback((point: THREE.Object3D, hitPoint: THREE.Vector3) => {
-        const pointPosition = new THREE.Vector3().copy(point.position);
-        return new THREE.Vector3().subVectors(pointPosition, hitPoint);
-    }, []);
-
-    const moveAssets = useCallback(() => {
-        if (selectedPoints.length === 0) return;
-
-        const states: Record<string, { position: THREE.Vector3; rotation?: THREE.Euler; }> = {};
-
-        selectedPoints.forEach((point: THREE.Object3D) => {
-            states[point.uuid] = {
-                position: new THREE.Vector3().copy(point.position),
-                rotation: point.rotation ? new THREE.Euler().copy(point.rotation) : undefined
-            };
-        });
-        setInitialStates(states);
-
-        const positions: Record<string, THREE.Vector3> = {};
-        selectedPoints.forEach((point: THREE.Object3D) => { positions[point.uuid] = new THREE.Vector3().copy(point.position); });
-        setInitialPositions(positions);
-
-        raycaster.setFromCamera(pointer, camera);
-        const intersectionPoint = new THREE.Vector3();
-        const hit = raycaster.ray.intersectPlane(plane, intersectionPoint);
-
-        if (hit && selectedPoints[0]) {
-            const offset = calculateDragOffset(selectedPoints[0], hit);
-            setDragOffset(offset);
-        }
-
-        setMovedObjects(selectedPoints);
-        setIsMoving(true);
-    }, [selectedPoints, camera, pointer, plane, raycaster, calculateDragOffset]);
-
-    const resetToInitialPositions = useCallback(() => {
-        setTimeout(() => {
-            movedObjects.forEach((movedPoint: THREE.Object3D) => {
-                if (movedPoint.userData.pointUuid && initialStates[movedPoint.uuid]) {
-                    const point: Point = movedPoint.userData as Point;
-                    const initialState = initialStates[movedPoint.uuid];
-                    const positionArray: [number, number, number] = [
-                        initialState.position.x,
-                        initialState.position.y,
-                        initialState.position.z
-                    ];
-
-                    if (point.pointType === 'Aisle') {
-                        setAislePosition(point.pointUuid, positionArray);
-                    } else if (point.pointType === 'Wall') {
-                        setWallPosition(point.pointUuid, positionArray);
-                    } else if (point.pointType === 'Floor') {
-                        setFloorPosition(point.pointUuid, positionArray);
-                    } else if (point.pointType === 'Zone') {
-                        setZonePosition(point.pointUuid, positionArray);
-                    }
-                }
-            });
-        }, 0)
-    }, [movedObjects, initialStates, setAislePosition, setWallPosition, setFloorPosition, setZonePosition]);
-
-    const placeMovedAssets = () => {
-        if (movedObjects.length === 0) return;
-
-        movedObjects.forEach((movedObject: THREE.Object3D) => {
-            if (movedObject.userData.pointUuid) {
-                const point: Point = movedObject.userData as Point;
-
-                if (point.pointType === 'Aisle') {
-                    const updatedAisles = getAislesByPointId(point.pointUuid);
-                    if (updatedAisles.length > 0 && projectId) {
-                        updatedAisles.forEach((updatedAisle) => {
-
-                            // API
-
-                            // upsertAisleApi(updatedAisle.aisleUuid, updatedAisle.points, updatedAisle.type, projectId, selectedVersion?.versionId || '');
-
-                            // SOCKET 
-
-                            socket.emit('v1:model-aisle:add', {
-                                projectId: projectId,
-                                versionId: selectedVersion?.versionId || '',
-                                userId: userId,
-                                organization: organization,
-                                aisleUuid: updatedAisle.aisleUuid,
-                                points: updatedAisle.points,
-                                type: updatedAisle.type
-                            })
-                        })
-                    }
-                } else if (point.pointType === 'Wall') {
-                    const updatedWalls = getWallsByPointId(point.pointUuid);
-                    if (updatedWalls && updatedWalls.length > 0 && projectId) {
-                        updatedWalls.forEach((updatedWall) => {
-
-                            // API
-
-                            // upsertWallApi(projectId, selectedVersion?.versionId || '', updatedWall);
-
-                            // SOCKET 
-
-                            const data = {
-                                wallData: updatedWall,
-                                projectId: projectId,
-                                versionId: selectedVersion?.versionId || '',
-                                userId: userId,
-                                organization: organization
-                            }
-
-                            socket.emit('v1:model-Wall:add', data);
-                        });
-                    }
-                } else if (point.pointType === 'Floor') {
-                    const updatedFloors = getFloorsByPointId(point.pointUuid);
-                    if (updatedFloors && updatedFloors.length > 0 && projectId) {
-                        updatedFloors.forEach((updatedFloor) => {
-
-                            // API
-
-                            // upsertFloorApi(projectId, selectedVersion?.versionId || '', updatedFloor);
-
-                            // SOCKET
-
-                            const data = {
-                                floorData: updatedFloor,
-                                projectId: projectId,
-                                versionId: selectedVersion?.versionId || '',
-                                userId: userId,
-                                organization: organization
-                            }
-
-                            socket.emit('v1:model-Floor:add', data);
-                        });
-                    }
-                } else if (point.pointType === 'Zone') {
-                    const updatedZones = getZonesByPointId(point.pointUuid);
-                    if (updatedZones && updatedZones.length > 0 && projectId) {
-                        updatedZones.forEach((updatedZone) => {
-
-                            // API
-
-                            // upsertZoneApi(projectId, selectedVersion?.versionId || '', updatedZone);
-
-                            // SOCKET
-
-                            const data = {
-                                zoneData: updatedZone,
-                                projectId: projectId,
-                                versionId: selectedVersion?.versionId || '',
-                                userId: userId,
-                                organization: organization
-                            }
-
-                            socket.emit('v1:zone:add', data);
-                        });
-                    }
-                }
-            }
-        })
-
-        echo.success("Object moved!");
-
-        clearSelection();
-    };
-
-    const clearSelection = () => {
-        setpastedObjects([]);
-        setDuplicatedObjects([]);
-        setMovedObjects([]);
-        setRotatedObjects([]);
-        clearSelectedPoints();
-    };
-
-    return (
-        <>
-        </>
-    );
-}
-
-export default MoveControls2D;

app/src/modules/scene/controls/selectionControls/selection2D/selectionControls2D.tsx

@@ -1,389 +0,0 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import * as THREE from "three";
-import { useThree } from "@react-three/fiber";
-import { SelectionHelper } from "../selectionHelper";
-import { SelectionBox } from "three/examples/jsm/interactive/SelectionBox";
-
-import useModuleStore from "../../../../../store/useModuleStore";
-import { useParams } from "react-router-dom";
-import { getUserData } from "../../../../../functions/getUserData";
-import { useSceneContext } from "../../../sceneContext";
-import { useVersionContext } from "../../../../builder/version/versionContext";
-import { useSocketStore, useToggleView, useToolMode, } from "../../../../../store/builder/store";
-import { useSelectedPoints } from "../../../../../store/simulation/useSimulationStore";
-import { useBuilderStore } from "../../../../../store/builder/useBuilderStore";
-import MoveControls2D from "./moveControls2D";
-
-// import { deleteAisleApi } from "../../../../../services/factoryBuilder/aisle/deleteAisleApi";
-// import { deleteWallApi } from "../../../../../services/factoryBuilder/wall/deleteWallApi";
-// import { deleteFloorApi } from "../../../../../services/factoryBuilder/floor/deleteFloorApi";
-// import { upsertFloorApi } from "../../../../../services/factoryBuilder/floor/upsertFloorApi";
-// import { deleteZoneApi } from "../../../../../services/factoryBuilder/zone/deleteZoneApi";
-// import { upsertZoneApi } from "../../../../../services/factoryBuilder/zone/upsertZoneApi";
-
-const SelectionControls2D: React.FC = () => {
-    const { camera, controls, gl, scene, raycaster, pointer } = useThree();
-    const { toggleView } = useToggleView();
-    const { selectedPoints, setSelectedPoints, clearSelectedPoints } = useSelectedPoints();
-    const [movedObjects, setMovedObjects] = useState<THREE.Object3D[]>([]);
-    const [rotatedObjects, setRotatedObjects] = useState<THREE.Object3D[]>([]);
-    const [copiedObjects, setCopiedObjects] = useState<THREE.Object3D[]>([]);
-    const [pastedObjects, setpastedObjects] = useState<THREE.Object3D[]>([]);
-    const [duplicatedObjects, setDuplicatedObjects] = useState<THREE.Object3D[]>([]);
-    const { activeModule } = useModuleStore();
-    const { socket } = useSocketStore();
-    const selectionBox = useMemo(() => new SelectionBox(camera, scene), [camera, scene]);
-    const { toolMode } = useToolMode();
-    const { selectedVersionStore } = useVersionContext();
-    const { selectedVersion } = selectedVersionStore();
-    const { projectId } = useParams();
-    const { hoveredLine, hoveredPoint } = useBuilderStore();
-    const { aisleStore, wallStore, floorStore, zoneStore } = useSceneContext();
-    const { removePoint: removeAislePoint } = aisleStore();
-    const { removePoint: removeWallPoint } = wallStore();
-    const { removePoint: removeFloorPoint } = floorStore();
-    const { removePoint: removeZonePoint } = zoneStore();
-
-    const isDragging = useRef(false);
-    const isLeftMouseDown = useRef(false);
-    const isSelecting = useRef(false);
-    const isRightClick = useRef(false);
-    const rightClickMoved = useRef(false);
-    const isCtrlSelecting = useRef(false);
-    const isShiftSelecting = useRef(false);
-    const { userId, organization } = getUserData();
-
-    useEffect(() => {
-        if (!camera || !scene || !toggleView) return;
-
-        const canvasElement = gl.domElement;
-        canvasElement.tabIndex = 0;
-
-        const helper = new SelectionHelper(gl);
-
-        const onPointerDown = (event: PointerEvent) => {
-            if (event.button === 2) {
-                isRightClick.current = true;
-                rightClickMoved.current = false;
-            } else if (event.button === 0) {
-                isSelecting.current = false;
-                isCtrlSelecting.current = event.ctrlKey;
-                isShiftSelecting.current = event.shiftKey;
-                isLeftMouseDown.current = true;
-                isDragging.current = false;
-                if (event.ctrlKey && duplicatedObjects.length === 0) {
-                    if (controls) (controls as any).enabled = false;
-                    selectionBox.startPoint.set(pointer.x, pointer.y, 0);
-                }
-            }
-        };
-
-        const onPointerMove = (event: PointerEvent) => {
-            if (isRightClick.current) {
-                rightClickMoved.current = true;
-            }
-            if (isLeftMouseDown.current) {
-                isDragging.current = true;
-            }
-            isSelecting.current = true;
-            if (helper.isDown && event.ctrlKey && duplicatedObjects.length === 0 && isCtrlSelecting.current) {
-                selectionBox.endPoint.set(pointer.x, pointer.y, 0);
-            }
-        };
-
-        const onPointerUp = (event: PointerEvent) => {
-            if (event.button === 2 && !event.ctrlKey && !event.shiftKey) {
-                isRightClick.current = false;
-                if (!rightClickMoved.current) {
-                    clearSelection();
-                }
-                return;
-            }
-
-            if (isSelecting.current && isCtrlSelecting.current) {
-                isCtrlSelecting.current = false;
-                isSelecting.current = false;
-                if (event.ctrlKey && duplicatedObjects.length === 0) {
-                    selectAssets();
-                }
-            } else if (!isSelecting.current && selectedPoints.length > 0 && ((!event.ctrlKey && !event.shiftKey && pastedObjects.length === 0 && duplicatedObjects.length === 0 && movedObjects.length === 0 && rotatedObjects.length === 0) || event.button !== 0)) {
-                clearSelection();
-                helper.enabled = true;
-                isCtrlSelecting.current = false;
-            } else if (controls) {
-                (controls as any).enabled = true;
-            }
-
-            if (!isDragging.current && isLeftMouseDown.current && isShiftSelecting.current && event.shiftKey) {
-                isShiftSelecting.current = false;
-                isLeftMouseDown.current = false;
-                isDragging.current = false;
-
-            } else if (controls) {
-                (controls as any).enabled = true;
-            }
-        };
-
-        const onKeyDown = (event: KeyboardEvent) => {
-            if (movedObjects.length > 0 || rotatedObjects.length > 0) return;
-            if (event.key.toLowerCase() === "escape") {
-                event.preventDefault();
-                clearSelection();
-            }
-            if (event.key.toLowerCase() === "delete") {
-                event.preventDefault();
-                deleteSelection();
-            }
-        };
-
-        const onContextMenu = (event: MouseEvent) => {
-            event.preventDefault();
-            if (!rightClickMoved.current) {
-                clearSelection();
-            }
-            rightClickMoved.current = false;
-        };
-
-        if (toggleView && toolMode === 'move') {
-            helper.enabled = true;
-            canvasElement.addEventListener("pointermove", onPointerMove);
-            canvasElement.addEventListener("pointerup", onPointerUp);
-            canvasElement.addEventListener("pointerdown", onPointerDown);
-            canvasElement.addEventListener("contextmenu", onContextMenu);
-            canvasElement.addEventListener("keydown", onKeyDown);
-        } else {
-            helper.enabled = false;
-            helper.dispose();
-        }
-
-        return () => {
-            canvasElement.removeEventListener("pointerdown", onPointerDown);
-            canvasElement.removeEventListener("pointermove", onPointerMove);
-            canvasElement.removeEventListener("contextmenu", onContextMenu);
-            canvasElement.removeEventListener("pointerup", onPointerUp);
-            canvasElement.removeEventListener("keydown", onKeyDown);
-            helper.enabled = false;
-            helper.dispose();
-        };
-    }, [camera, controls, scene, toggleView, selectedPoints, copiedObjects, pastedObjects, duplicatedObjects, movedObjects, socket, rotatedObjects, toolMode, hoveredLine, hoveredPoint]);
-
-    useEffect(() => {
-        if (toolMode !== 'move' || !toggleView) {
-            clearSelection();
-        }
-    }, [activeModule, toolMode, toggleView]);
-
-    const selectAssets = useCallback(() => {
-        selectionBox.endPoint.set(pointer.x, pointer.y, 0);
-        if (controls) (controls as any).enabled = true;
-
-        let selectedObjects = selectionBox.select();
-        let Objects = new Set<THREE.Object3D>();
-
-        selectedObjects.forEach((object) => {
-            let currentObject: THREE.Object3D | null = object;
-            while (currentObject) {
-                if (currentObject.userData.pointUuid) {
-                    Objects.add(currentObject);
-                    break;
-                }
-                currentObject = currentObject.parent || null;
-            }
-        });
-
-        if (Objects.size === 0) {
-            clearSelection();
-            return;
-        }
-
-        const updatedSelections = new Set<THREE.Object3D>(selectedPoints);
-
-        Objects.forEach((obj) => {
-            const existing = Array.from(updatedSelections).find((o) => o.userData?.pointUuid === obj.userData?.pointUuid);
-
-            if (existing) {
-                updatedSelections.delete(existing);
-            } else {
-                updatedSelections.add(obj);
-            }
-        });
-
-        const selected = Array.from(updatedSelections);
-
-        setSelectedPoints(selected);
-
-    }, [selectionBox, pointer, controls, selectedPoints, setSelectedPoints]);
-
-    const clearSelection = () => {
-        setpastedObjects([]);
-        setDuplicatedObjects([]);
-        clearSelectedPoints();
-    };
-
-    const deleteSelection = () => {
-        if (selectedPoints.length > 0 && duplicatedObjects.length === 0) {
-
-            selectedPoints.forEach((selectedPoint) => {
-                if (selectedPoint.userData.pointUuid) {
-                    const point: Point = selectedPoint.userData as Point;
-                    if (point.pointType === 'Aisle') {
-                        const removedAisles = removeAislePoint(point.pointUuid);
-                        if (removedAisles.length > 0) {
-                            removedAisles.forEach(aisle => {
-                                if (projectId) {
-
-                                    // API
-
-                                    // deleteAisleApi(aisle.aisleUuid, projectId, selectedVersion?.versionId || '');
-
-                                    // SOCKET
-
-                                    const data = {
-                                        projectId: projectId,
-                                        versionId: selectedVersion?.versionId || '',
-                                        userId: userId,
-                                        organization: organization,
-                                        aisleUuid: aisle.aisleUuid
-                                    }
-
-                                    socket.emit('v1:model-aisle:delete', data);
-                                }
-                            });
-                        }
-                    }
-                    if (point.pointType === 'Wall') {
-                        const removedWalls = removeWallPoint(point.pointUuid);
-                        if (removedWalls.length > 0) {
-                            removedWalls.forEach(wall => {
-                                if (projectId) {
-
-                                    // API
-
-                                    // deleteWallApi(projectId, selectedVersion?.versionId || '', wall.wallUuid);
-
-                                    // SOCKET
-
-                                    const data = {
-                                        wallUuid: wall.wallUuid,
-                                        projectId: projectId,
-                                        versionId: selectedVersion?.versionId || '',
-                                        userId: userId,
-                                        organization: organization
-                                    }
-
-                                    socket.emit('v1:model-Wall:delete', data);
-                                }
-                            });
-                        }
-                    }
-                    if (point.pointType === 'Floor') {
-                        const { removedFloors, updatedFloors } = removeFloorPoint(point.pointUuid);
-                        if (removedFloors.length > 0) {
-                            removedFloors.forEach(floor => {
-                                if (projectId) {
-
-                                    // API
-
-                                    // deleteFloorApi(projectId, selectedVersion?.versionId || '', floor.floorUuid);
-
-                                    // SOCKET
-
-                                    const data = {
-                                        floorUuid: floor.floorUuid,
-                                        projectId: projectId,
-                                        versionId: selectedVersion?.versionId || '',
-                                        userId: userId,
-                                        organization: organization
-                                    }
-
-                                    socket.emit('v1:model-Floor:delete', data);
-                                }
-                            });
-                        }
-                        if (updatedFloors.length > 0) {
-                            updatedFloors.forEach(floor => {
-                                if (projectId) {
-
-                                    // API
-
-                                    // upsertFloorApi(projectId, selectedVersion?.versionId || '', floor);
-
-                                    // SOCKET
-
-                                    const data = {
-                                        floorData: floor,
-                                        projectId: projectId,
-                                        versionId: selectedVersion?.versionId || '',
-                                        userId: userId,
-                                        organization: organization
-                                    }
-
-                                    socket.emit('v1:model-Floor:add', data);
-                                }
-                            });
-                        }
-                    }
-                    if (point.pointType === 'Zone') {
-                        const { removedZones, updatedZones } = removeZonePoint(point.pointUuid);
-                        if (removedZones.length > 0) {
-                            removedZones.forEach(zone => {
-                                if (projectId) {
-
-                                    // API
-
-                                    // deleteZoneApi(projectId, selectedVersion?.versionId || '', zone.zoneUuid);
-
-                                    // SOCKET
-
-                                    const data = {
-                                        zoneUuid: zone.zoneUuid,
-                                        projectId: projectId,
-                                        versionId: selectedVersion?.versionId || '',
-                                        userId: userId,
-                                        organization: organization
-                                    }
-
-                                    socket.emit('v1:zone:delete', data);
-                                }
-                            });
-                        }
-                        if (updatedZones.length > 0) {
-                            updatedZones.forEach(zone => {
-                                if (projectId) {
-
-                                    // API
-
-                                    // upsertZoneApi(projectId, selectedVersion?.versionId || '', zone);
-
-                                    // SOCKET
-
-                                    const data = {
-                                        zoneData: zone,
-                                        projectId: projectId,
-                                        versionId: selectedVersion?.versionId || '',
-                                        userId: userId,
-                                        organization: organization
-                                    }
-
-                                    socket.emit('v1:zone:add', data);
-                                }
-                            });
-                        }
-                    }
-                }
-            })
-
-        }
-        echo.success("Selected points removed!");
-        clearSelection();
-    };
-
-    return (
-        <>
-            <MoveControls2D movedObjects={movedObjects} setMovedObjects={setMovedObjects} pastedObjects={pastedObjects} setpastedObjects={setpastedObjects} duplicatedObjects={duplicatedObjects} setDuplicatedObjects={setDuplicatedObjects} rotatedObjects={rotatedObjects} setRotatedObjects={setRotatedObjects} />
-
-        </>
-    );
-};
-
-export default SelectionControls2D;

app/src/modules/scene/controls/selectionControls/selectionControls.tsx

@@ -1,27 +1,26 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import * as THREE from "three";
-import { useFrame, useThree } from "@react-three/fiber";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { SelectionHelper } from "../selectionHelper";
 import { SelectionBox } from "three/examples/jsm/interactive/SelectionBox";
-import * as Types from "../../../../../types/world/worldTypes";
+import { SelectionHelper } from "./selectionHelper";
+import { useFrame, useThree } from "@react-three/fiber";
+import { useSelectedAssets, useSocketStore, useToggleView, useToolMode, } from "../../../../store/builder/store";
+import BoundingBox from "./boundingBoxHelper";
+// import { deleteFloorItem } from '../../../../services/factoryBuilder/asset/floorAsset/deleteFloorItemApi';
+import * as Types from "../../../../types/world/worldTypes";
 
-import useModuleStore from "../../../../../store/useModuleStore";
+import DuplicationControls from "./duplicationControls";
+import CopyPasteControls from "./copyPasteControls";
+import MoveControls from "./moveControls";
+import RotateControls from "./rotateControls";
+import useModuleStore from "../../../../store/useModuleStore";
 import { useParams } from "react-router-dom";
-import { getUserData } from "../../../../../functions/getUserData";
+import { getUserData } from "../../../../functions/getUserData";
-import { useSceneContext } from "../../../sceneContext";
+import { useSceneContext } from "../../sceneContext";
-import { useVersionContext } from "../../../../builder/version/versionContext";
+import { useVersionContext } from "../../../builder/version/versionContext";
-import { useProductContext } from "../../../../simulation/products/productContext";
+import { useProductContext } from "../../../simulation/products/productContext";
-import { useSelectedAssets, useSocketStore, useToggleView, useToolMode, } from "../../../../../store/builder/store";
+import { upsertProductOrEventApi } from "../../../../services/simulation/products/UpsertProductOrEventApi";
-import { upsertProductOrEventApi } from "../../../../../services/simulation/products/UpsertProductOrEventApi";
-import BoundingBox from "./boundingBoxHelper3D";
-import DuplicationControls3D from "./duplicationControls3D";
-import CopyPasteControls3D from "./copyPasteControls3D";
-import MoveControls3D from "./moveControls3D";
-import RotateControls3D from "./rotateControls3D";
 
-// import { deleteFloorItem } from '../../../../../services/factoryBuilder/asset/floorAsset/deleteFloorItemApi';
+const SelectionControls: React.FC = () => {
-
-const SelectionControls3D: React.FC = () => {
     const { camera, controls, gl, scene, raycaster, pointer } = useThree();
     const selectionGroup = useRef() as Types.RefGroup;
     const { toggleView } = useToggleView();
@@ -254,7 +253,7 @@ const SelectionControls3D: React.FC = () => {
         });
 
         if (Objects.size === 0) {
-            // clearSelection();
+            clearSelection();
             return;
         }
 
@@ -351,15 +350,15 @@ const SelectionControls3D: React.FC = () => {
                 </group>
             </group>
 
-            <MoveControls3D movedObjects={movedObjects} setMovedObjects={setMovedObjects} pastedObjects={pastedObjects} setpastedObjects={setpastedObjects} duplicatedObjects={duplicatedObjects} setDuplicatedObjects={setDuplicatedObjects} rotatedObjects={rotatedObjects} setRotatedObjects={setRotatedObjects} selectionGroup={selectionGroup} boundingBoxRef={boundingBoxRef} />
+            <MoveControls movedObjects={movedObjects} setMovedObjects={setMovedObjects} pastedObjects={pastedObjects} setpastedObjects={setpastedObjects} duplicatedObjects={duplicatedObjects} setDuplicatedObjects={setDuplicatedObjects} rotatedObjects={rotatedObjects} setRotatedObjects={setRotatedObjects} selectionGroup={selectionGroup} boundingBoxRef={boundingBoxRef} />
 
-            <RotateControls3D rotatedObjects={rotatedObjects} setRotatedObjects={setRotatedObjects} movedObjects={movedObjects} setMovedObjects={setMovedObjects} pastedObjects={pastedObjects} setpastedObjects={setpastedObjects} duplicatedObjects={duplicatedObjects} setDuplicatedObjects={setDuplicatedObjects} selectionGroup={selectionGroup} />
+            <RotateControls rotatedObjects={rotatedObjects} setRotatedObjects={setRotatedObjects} movedObjects={movedObjects} setMovedObjects={setMovedObjects} pastedObjects={pastedObjects} setpastedObjects={setpastedObjects} duplicatedObjects={duplicatedObjects} setDuplicatedObjects={setDuplicatedObjects} selectionGroup={selectionGroup} />
 
-            <DuplicationControls3D duplicatedObjects={duplicatedObjects} setDuplicatedObjects={setDuplicatedObjects} setpastedObjects={setpastedObjects} selectionGroup={selectionGroup} movedObjects={movedObjects} setMovedObjects={setMovedObjects} rotatedObjects={rotatedObjects} setRotatedObjects={setRotatedObjects} boundingBoxRef={boundingBoxRef} />
+            <DuplicationControls duplicatedObjects={duplicatedObjects} setDuplicatedObjects={setDuplicatedObjects} setpastedObjects={setpastedObjects} selectionGroup={selectionGroup} movedObjects={movedObjects} setMovedObjects={setMovedObjects} rotatedObjects={rotatedObjects} setRotatedObjects={setRotatedObjects} boundingBoxRef={boundingBoxRef} />
 
-            <CopyPasteControls3D copiedObjects={copiedObjects} setCopiedObjects={setCopiedObjects} pastedObjects={pastedObjects} setpastedObjects={setpastedObjects} selectionGroup={selectionGroup} setDuplicatedObjects={setDuplicatedObjects} movedObjects={movedObjects} setMovedObjects={setMovedObjects} rotatedObjects={rotatedObjects} setRotatedObjects={setRotatedObjects} boundingBoxRef={boundingBoxRef} />
+            <CopyPasteControls copiedObjects={copiedObjects} setCopiedObjects={setCopiedObjects} pastedObjects={pastedObjects} setpastedObjects={setpastedObjects} selectionGroup={selectionGroup} setDuplicatedObjects={setDuplicatedObjects} movedObjects={movedObjects} setMovedObjects={setMovedObjects} rotatedObjects={rotatedObjects} setRotatedObjects={setRotatedObjects} boundingBoxRef={boundingBoxRef} />
         </>
     );
 };
 
-export default SelectionControls3D;
+export default SelectionControls;

app/src/modules/scene/postProcessing/postProcessing.tsx

@@ -6,12 +6,11 @@ import {
     useSelectedFloorItem,
 } from "../../../store/builder/store";
 import * as CONSTANTS from "../../../types/world/worldConstants";
-import { useDeletableEventSphere, useSelectedEventSphere, useSelectedPoints } from "../../../store/simulation/useSimulationStore";
+import { useDeletableEventSphere, useSelectedEventSphere } from "../../../store/simulation/useSimulationStore";
 import { useEffect } from "react";
 import { useBuilderStore } from "../../../store/builder/useBuilderStore";
 
 export default function PostProcessing() {
-    const { selectedPoints } = useSelectedPoints();
     const { deletableFloorItem } = useDeletableFloorItem();
     const { selectedWallItem } = useSelectedWallItem();
     const { selectedFloorItem } = useSelectedFloorItem();
@@ -62,10 +61,6 @@ export default function PostProcessing() {
         // console.log('deletableEventSphere: ', deletableEventSphere);
     }, [deletableEventSphere])
 
-    useEffect(() => {
-        // console.log('selectedPoints: ', selectedPoints);
-    }, [selectedPoints])
-
     return (
         <EffectComposer autoClear={false}>
             <N8AO

app/src/modules/simulation/actions/storageUnit/actionHandler/useRetrieveHandler.ts

@@ -5,14 +5,12 @@ import { useSceneContext } from "../../../../scene/sceneContext";
 import { useProductContext } from "../../../products/productContext";
 
 export function useRetrieveHandler() {
-    const { materialStore, armBotStore, vehicleStore, storageUnitStore, productStore, humanStore, assetStore } = useSceneContext();
+    const { materialStore, armBotStore, vehicleStore, storageUnitStore, productStore } = useSceneContext();
     const { selectedProductStore } = useProductContext();
     const { addMaterial } = materialStore();
     const { getModelUuidByActionUuid, getPointUuidByActionUuid, getEventByModelUuid, getActionByUuid } = productStore();
     const { getStorageUnitById, getLastMaterial, updateCurrentLoad, removeLastMaterial } = storageUnitStore();
     const { getVehicleById, incrementVehicleLoad, addCurrentMaterial } = vehicleStore();
-    const { getHumanById, incrementHumanLoad, addCurrentMaterial: addCurrentMaterialToHuman } = humanStore();
-    const { getAssetById, setCurrentAnimation } = assetStore();
     const { selectedProduct } = selectedProductStore();
     const { getArmBotById, addCurrentAction } = armBotStore();
     const { isPlaying } = usePlayButtonStore();
@@ -271,7 +269,7 @@ export function useRetrieveHandler() {
 
                             if (material) {
                                 removeLastMaterial(storageUnit.modelUuid);
-                                updateCurrentLoad(storageUnit.modelUuid, -1);
+                                updateCurrentLoad(storageUnit.modelUuid, -1)
                                 incrementVehicleLoad(vehicle.modelUuid, 1);
                                 addCurrentMaterial(vehicle.modelUuid, material.materialType, material.materialId);
                                 retrieveLogStatus(material.materialName, `is picked by ${vehicle.modelName}`);
@@ -295,35 +293,6 @@ export function useRetrieveHandler() {
                     retrievalTimeRef.current.delete(actionUuid);
                     retrievalTimeRef.current.delete(`${actionUuid}_last`);
                 }
-            } else if (triggeredModel.type === 'human') {
-                const human = getHumanById(triggeredModel.modelUuid);
-                const humanAsset = getAssetById(triggeredModel.modelUuid);
-
-                if (human && !human.isScheduled && human.state === 'idle' && human.currentLoad < human.point.action.loadCapacity) {
-                    if (humanAsset && humanAsset.animationState?.current === 'idle') {
-                        setCurrentAnimation(human.modelUuid, 'pickup', true, false, false);
-                    } else if (humanAsset && humanAsset.animationState?.current === 'pickup' && humanAsset.animationState.isCompleted) {
-                        const lastMaterial = getLastMaterial(storageUnit.modelUuid);
-                        if (lastMaterial) {
-                            if (human.currentLoad < human.point.action.loadCapacity) {
-                                const material = createNewMaterial(
-                                    lastMaterial.materialId,
-                                    lastMaterial.materialType,
-                                    storageUnit.point.action
-                                );
-                                if (material) {
-                                    removeLastMaterial(storageUnit.modelUuid);
-                                    updateCurrentLoad(storageUnit.modelUuid, -1);
-                                    incrementHumanLoad(human.modelUuid, 1);
-                                    addCurrentMaterialToHuman(human.modelUuid, material.materialType, material.materialId);
-                                    retrieveLogStatus(material.materialName, `is picked by ${human.modelName}`);
-                                }
-                                if (human.currentLoad + 1 < human.point.action.loadCapacity) {
-                                }
-                            }
-                        }
-                    }
-                }
             }
         });
 

app/src/modules/simulation/events/arrows/arrows.tsx

@@ -103,21 +103,9 @@ export function Arrows({ connections }: { readonly connections: ConnectionLine[]
         return (
             <group
                 key={key}
-                onPointerOver={() => {
+                onPointerOver={() => setHoveredArrowTrigger(trigger.triggerUuid)}
-                    if (toolMode === '3D-Delete') {
+                onPointerOut={() => setHoveredArrowTrigger(null)}
-                        setHoveredArrowTrigger(trigger.triggerUuid)
+                onClick={() => { removeConnection(trigger) }}
-                    }
-                }}
-                onPointerOut={() => {
-                    if (toolMode === '3D-Delete') {
-                        setHoveredArrowTrigger(null)
-                    }
-                }}
-                onClick={() => {
-                    if (toolMode === '3D-Delete') {
-                        removeConnection(trigger)
-                    }
-                }}
             >
                 <mesh
                     geometry={shaftGeometry}

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

@@ -183,45 +183,45 @@ function VehicleAnimator({ path, handleCallBack, currentPhase, agvUuid, agvDetai
 
     return (
         <>
-            {selectedPath === "auto" &&
+            {selectedPath === "auto" && <group>
-                <group>
+                {currentPath.map((pos, i) => {
-                    {currentPath.map((pos, i) => {
+                    if (i < currentPath.length - 1) {
-                        if (i < currentPath.length - 1) {
+                        return (
-                            return (
+                            <DraggableLineSegment
-                                <DraggableLineSegment
+                                key={i}
-                                    key={i}
+                                index={i}
-                                    index={i}
+                                start={new THREE.Vector3(...currentPath[i])}
-                                    start={new THREE.Vector3(...currentPath[i])}
+                                end={new THREE.Vector3(...currentPath[i + 1])}
-                                    end={new THREE.Vector3(...currentPath[i + 1])}
+                                updatePoints={(i0, p0, i1, p1) => {
-                                    updatePoints={(i0, p0, i1, p1) => {
+                                    const updated = [...currentPath];
-                                        const updated = [...currentPath];
+                                    updated[i0] = p0.toArray() as [number, number, number];
-                                        updated[i0] = p0.toArray() as [number, number, number];
+                                    updated[i1] = p1.toArray() as [number, number, number];
-                                        updated[i1] = p1.toArray() as [number, number, number];
+                                    setCurrentPath(updated);
-                                        setCurrentPath(updated);
+                                }}
-                                    }}
+                                isAnyDragging={isAnyDragging}
-                                    isAnyDragging={isAnyDragging}
+                                setIsAnyDragging={setIsAnyDragging}
-                                    setIsAnyDragging={setIsAnyDragging}
+                            />
-                                />
+                        );
-                            );
+                    }
-                        }
+                    return null;
-                        return null;
+                })}
-                    })}
+                {currentPath.length > 0 && (
-                    {currentPath.length > 0 && (
+                    <group onPointerMissed={() => { if (controls) (controls as any).enabled = true; }}>
-                        <group onPointerMissed={() => { if (controls) (controls as any).enabled = true; }}>
+                        {currentPath.map((pos, i) =>
-                            {currentPath.map((pos, i) =>
+                        (
-                            (
+                            <DraggableSphere
-                                <DraggableSphere
+                                key={i}
-                                    key={i}
+                                index={i}
-                                    index={i}
+                                position={new THREE.Vector3(...pos)}
-                                    position={new THREE.Vector3(...pos)}
+                                onMove={updatePoint}
-                                    onMove={updatePoint}
+                                isAnyDragging={isAnyDragging}
-                                    isAnyDragging={isAnyDragging}
+                                setIsAnyDragging={setIsAnyDragging}
-                                    setIsAnyDragging={setIsAnyDragging}
+                            />)
-                                />)
+                        )}
-                            )}
+                    </group >
-                        </group >
+                )
-                    )}
+                }
-                </group >
+            </group >
             }
         </>
     );

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

@@ -58,8 +58,10 @@ function VehicleInstance({ agvDetail }: Readonly<{ agvDetail: VehicleStatus }>)
                     Math.round(segmentPath[segmentPath.length - 1].x) == Math.round(end.x) &&
                     Math.round(segmentPath[segmentPath.length - 1].z) == Math.round(end.z)
                 ) {
+                    console.log('segmentPath: ', segmentPath);
                     return segmentPath?.map(({ x, y, z }) => [x, 0, z] as [number, number, number]) || [];
                 } else {
+                    console.log("There is no path here...Choose valid path")
                     const { path: segmentPaths } = navMeshQuery.computePath(start, start);
                     return segmentPaths.map(({ x, y, z }) => [x, 0, z] as [number, number, number]) || [];
                 }
@@ -68,7 +70,9 @@ function VehicleInstance({ agvDetail }: Readonly<{ agvDetail: VehicleStatus }>)
                 console.error("Failed to compute path");
                 return [];
             }
-        }, [navMesh]);
+        },
+        [navMesh]
+    );
 
     function vehicleStatus(modelId: string, status: string) {
         // console.log(`${modelId} , ${status}`);

app/src/modules/simulation/vehicle/navMesh/polygonGenerator.tsx

@@ -76,42 +76,12 @@ export default function PolygonGenerator({
             turf.lineString(line.map((p: any) => p?.position))
         );
 
-        const validLineFeatures = lineFeatures.map(ls => {
+        const validLineFeatures = lineFeatures.filter((line) => {
-            const coords = ls.geometry.coordinates.map(coord => coord.join(','));
+            const coords = line.geometry.coordinates;
+            return coords.length >= 2;
+        });
 
-            if (coords.length < 2) return null;
+        const polygons = turf.polygonize(turf.featureCollection(validLineFeatures));
-
-            const start = coords[0];
-            const end = coords[coords.length - 1];
-            const middle = coords.slice(1, -1);
-
-            const seen = new Set<string>([start, end]);
-            const filteredMiddle: string[] = [];
-
-            for (const point of middle) {
-                if (!seen.has(point)) {
-                    seen.add(point);
-                    filteredMiddle.push(point);
-                }
-            }
-
-            const newCoords = [start, ...filteredMiddle, end];
-
-            if (newCoords.length >= 4) {
-                const resultCoords = newCoords.map(str => str.split(',').map(Number));
-                return {
-                    ...ls,
-                    geometry: {
-                        ...ls.geometry,
-                        coordinates: resultCoords,
-                    },
-                };
-            }
-
-            return null;
-        }).filter(Boolean);
-
-        const polygons = turf.polygonize(turf.featureCollection(validLineFeatures as any) as any);
 
         renderWallGeometry(wallPoints);
 

app/src/pages/Project.tsx

@@ -134,6 +134,7 @@ const Project: React.FC = () => {
 
   useEffect(() => {
     handleCanvasCursors(activeTool);
+	console.log('activeTool: ', activeTool);
   }, [activeTool]);
 
   return (

app/src/store/builder/store.ts

@@ -730,6 +730,6 @@ export const useSelectedComment = create<any>((set: any) => ({
   setCommentPositionState: (x: any) => set({ commentPositionState: x }),
 }));
 export const useSelectedPath = create<any>((set: any) => ({
-  selectedPath: "auto",
+  selectedPath: "",
   setSelectedPath: (x: any) => set({ selectedPath: x }),
 }));

app/src/store/simulation/useSimulationStore.ts

@@ -277,39 +277,3 @@ export const useComparisonProduct = create<ComparisonProductState>()(
         },
     }))
 );
-
-interface SelectedPointsState {
-    selectedPoints: THREE.Object3D[];
-    setSelectedPoints: (points: THREE.Object3D[]) => void;
-    addSelectedPoint: (point: THREE.Object3D) => void;
-    removeSelectedPoint: (uuid: string) => void;
-    clearSelectedPoints: () => void;
-}
-
-export const useSelectedPoints = create<SelectedPointsState>()(
-    immer((set) => ({
-        selectedPoints: [],
-        setSelectedPoints: (points) => {
-            set((state) => {
-                state.selectedPoints = points;
-            });
-        },
-        addSelectedPoint: (point) => {
-            set((state) => {
-                if (!state.selectedPoints.find(p => p.uuid === point.uuid)) {
-                    state.selectedPoints.push(point);
-                }
-            });
-        },
-        removeSelectedPoint: (uuid) => {
-            set((state) => {
-                state.selectedPoints = state.selectedPoints.filter(p => p.uuid !== uuid);
-            });
-        },
-        clearSelectedPoints: () => {
-            set((state) => {
-                state.selectedPoints = [];
-            });
-        },
-    }))
-);

compose.yaml

@@ -4,13 +4,13 @@ services:
       context: ./app
       dockerfile: Dockerfile
       args:
-        - REACT_APP_SERVER_SOCKET_API_BASE_URL=185.100.212.76:9902
+        - REACT_APP_SERVER_SOCKET_API_BASE_URL=185.100.212.76:5666
-        - REACT_APP_SERVER_REST_API_BASE_URL=185.100.212.76:9901
+        - REACT_APP_SERVER_REST_API_BASE_URL=185.100.212.76:6555
         - REACT_APP_SERVER_MARKETPLACE_URL=185.100.212.76:50011
-    container_name: aalaiDemoTwo
+    container_name: aalaiMongoDemoTwo
     stdin_open: true
     tty: true
     ports:
-      - "8400:80"
+      - "8500:80"
     volumes:
       - ./app:/app