Implement code changes to enhance functionality and improve performance

This commit is contained in:
2025-04-16 10:03:01 +05:30
parent 693f58ff36
commit a26e0dacd0
2 changed files with 1646 additions and 2116 deletions

View File

@@ -3,13 +3,7 @@ import { useEffect, useMemo, useRef, useState } from "react";
import { SelectionBox } from "three/examples/jsm/interactive/SelectionBox"; import { SelectionBox } from "three/examples/jsm/interactive/SelectionBox";
import { SelectionHelper } from "./selectionHelper"; import { SelectionHelper } from "./selectionHelper";
import { useFrame, useThree } from "@react-three/fiber"; import { useFrame, useThree } from "@react-three/fiber";
import { import { useFloorItems, useSelectedAssets, useSimulationStates, useSocketStore, useToggleView, } from "../../../../store/store";
useFloorItems,
useSelectedAssets,
useSimulationStates,
useSocketStore,
useToggleView,
} from "../../../../store/store";
import BoundingBox from "./boundingBoxHelper"; import BoundingBox from "./boundingBoxHelper";
import { toast } from "react-toastify"; import { toast } from "react-toastify";
// import { deleteFloorItem } from '../../../../services/factoryBuilder/assest/floorAsset/deleteFloorItemApi'; // import { deleteFloorItem } from '../../../../services/factoryBuilder/assest/floorAsset/deleteFloorItemApi';
@@ -33,17 +27,12 @@ const SelectionControls: React.FC = () => {
const [rotatedObjects, setRotatedObjects] = useState<THREE.Object3D[]>([]); const [rotatedObjects, setRotatedObjects] = useState<THREE.Object3D[]>([]);
const [copiedObjects, setCopiedObjects] = useState<THREE.Object3D[]>([]); const [copiedObjects, setCopiedObjects] = useState<THREE.Object3D[]>([]);
const [pastedObjects, setpastedObjects] = useState<THREE.Object3D[]>([]); const [pastedObjects, setpastedObjects] = useState<THREE.Object3D[]>([]);
const [duplicatedObjects, setDuplicatedObjects] = useState<THREE.Object3D[]>( const [duplicatedObjects, setDuplicatedObjects] = useState<THREE.Object3D[]>([]);
[]
);
const boundingBoxRef = useRef<THREE.Mesh>(); const boundingBoxRef = useRef<THREE.Mesh>();
const { floorItems, setFloorItems } = useFloorItems(); const { floorItems, setFloorItems } = useFloorItems();
const { activeModule } = useModuleStore(); const { activeModule } = useModuleStore();
const { socket } = useSocketStore(); const { socket } = useSocketStore();
const selectionBox = useMemo( const selectionBox = useMemo(() => new SelectionBox(camera, scene), [camera, scene]);
() => new SelectionBox(camera, scene),
[camera, scene]
);
useEffect(() => { useEffect(() => {
if (!camera || !scene || toggleView) return; if (!camera || !scene || toggleView) return;
@@ -85,12 +74,7 @@ const SelectionControls: React.FC = () => {
rightClickMoved = true; rightClickMoved = true;
} }
isSelecting = true; isSelecting = true;
if ( if (helper.isDown && event.ctrlKey && duplicatedObjects.length === 0 && isCtrlSelecting) {
helper.isDown &&
event.ctrlKey &&
duplicatedObjects.length === 0 &&
isCtrlSelecting
) {
selectionBox.endPoint.set(pointer.x, pointer.y, 0); selectionBox.endPoint.set(pointer.x, pointer.y, 0);
} }
}; };
@@ -110,15 +94,7 @@ const SelectionControls: React.FC = () => {
if (event.ctrlKey && duplicatedObjects.length === 0) { if (event.ctrlKey && duplicatedObjects.length === 0) {
selectAssets(); selectAssets();
} }
} else if ( } else if (!isSelecting && selectedAssets.length > 0 && ((pastedObjects.length === 0 && duplicatedObjects.length === 0 && movedObjects.length === 0 && rotatedObjects.length === 0) || event.button !== 0)) {
!isSelecting &&
selectedAssets.length > 0 &&
((pastedObjects.length === 0 &&
duplicatedObjects.length === 0 &&
movedObjects.length === 0 &&
rotatedObjects.length === 0) ||
event.button !== 0)
) {
clearSelection(); clearSelection();
helper.enabled = true; helper.enabled = true;
isCtrlSelecting = false; isCtrlSelecting = false;
@@ -170,21 +146,7 @@ const SelectionControls: React.FC = () => {
helper.enabled = false; helper.enabled = false;
helper.dispose(); helper.dispose();
}; };
}, [ }, [camera, controls, scene, toggleView, selectedAssets, copiedObjects, pastedObjects, duplicatedObjects, movedObjects, socket, floorItems, rotatedObjects, activeModule,]);
camera,
controls,
scene,
toggleView,
selectedAssets,
copiedObjects,
pastedObjects,
duplicatedObjects,
movedObjects,
socket,
floorItems,
rotatedObjects,
activeModule,
]);
useEffect(() => { useEffect(() => {
if (activeModule !== "builder") { if (activeModule !== "builder") {
@@ -193,12 +155,7 @@ const SelectionControls: React.FC = () => {
}, [activeModule]); }, [activeModule]);
useFrame(() => { useFrame(() => {
if ( if (pastedObjects.length === 0 && duplicatedObjects.length === 0 && movedObjects.length === 0 && rotatedObjects.length === 0) {
pastedObjects.length === 0 &&
duplicatedObjects.length === 0 &&
movedObjects.length === 0 &&
rotatedObjects.length === 0
) {
selectionGroup.current.position.set(0, 0, 0); selectionGroup.current.position.set(0, 0, 0);
} }
}); });
@@ -227,11 +184,7 @@ const SelectionControls: React.FC = () => {
} }
const updatedSelections = new Set(selectedAssets); const updatedSelections = new Set(selectedAssets);
Objects.forEach((obj) => { Objects.forEach((obj) => { updatedSelections.has(obj) ? updatedSelections.delete(obj) : updatedSelections.add(obj); });
updatedSelections.has(obj)
? updatedSelections.delete(obj)
: updatedSelections.add(obj);
});
const selected = Array.from(updatedSelections); const selected = Array.from(updatedSelections);
@@ -246,14 +199,7 @@ const SelectionControls: React.FC = () => {
setDuplicatedObjects([]); setDuplicatedObjects([]);
setSelectedAssets([]); setSelectedAssets([]);
}; };
const updateBackend = async ( const updateBackend = async (updatedPaths: (SimulationTypes.ConveyorEventsSchema | SimulationTypes.VehicleEventsSchema | SimulationTypes.StaticMachineEventsSchema | SimulationTypes.ArmBotEventsSchema)[]) => {
updatedPaths: (
| SimulationTypes.ConveyorEventsSchema
| SimulationTypes.VehicleEventsSchema
| SimulationTypes.StaticMachineEventsSchema
| SimulationTypes.ArmBotEventsSchema
)[]
) => {
if (updatedPaths.length === 0) return; if (updatedPaths.length === 0) return;
const email = localStorage.getItem("email"); const email = localStorage.getItem("email");
const organization = email ? email.split("@")[1].split(".")[0] : ""; const organization = email ? email.split("@")[1].split(".")[0] : "";
@@ -396,9 +342,7 @@ const SelectionControls: React.FC = () => {
...state.points.actions, ...state.points.actions,
processes: (state.points.actions.processes = processes: (state.points.actions.processes =
state.points.actions.processes?.filter((process) => { state.points.actions.processes?.filter((process) => {
const matchedStates = simulationStates.filter((s) => const matchedStates = simulationStates.filter((s) => deletedModelUUIDs.includes(s.modeluuid));
deletedModelUUIDs.includes(s.modeluuid)
);
if (matchedStates.length > 0) { if (matchedStates.length > 0) {
if (matchedStates[0]?.type === "StaticMachine") { if (matchedStates[0]?.type === "StaticMachine") {
@@ -411,14 +355,9 @@ const SelectionControls: React.FC = () => {
const trigPoints = matchedStates[0]?.points; const trigPoints = matchedStates[0]?.points;
if (Array.isArray(trigPoints)) { if (Array.isArray(trigPoints)) {
const nonEmptyTriggers = trigPoints.filter( const nonEmptyTriggers = trigPoints.filter((point) => point && point.triggers && point.triggers.length > 0);
(point) =>
point && point.triggers && point.triggers.length > 0
);
const allTriggerUUIDs = nonEmptyTriggers const allTriggerUUIDs = nonEmptyTriggers.flatMap((point) => point.triggers).map((trigger) => trigger.uuid);
.flatMap((point) => point.triggers)
.map((trigger) => trigger.uuid);
return !allTriggerUUIDs.includes(process.triggerId); return !allTriggerUUIDs.includes(process.triggerId);
} }
@@ -435,9 +374,7 @@ const SelectionControls: React.FC = () => {
return state; return state;
}); });
const filteredStates = updatedStates.filter( const filteredStates = updatedStates.filter((state) => !deletedModelUUIDs.includes(state.modeluuid));
(state) => !deletedModelUUIDs.includes(state.modeluuid)
);
updateBackend(filteredStates); updateBackend(filteredStates);
setSimulationStates(filteredStates); setSimulationStates(filteredStates);
@@ -448,16 +385,10 @@ const SelectionControls: React.FC = () => {
const email = localStorage.getItem("email"); const email = localStorage.getItem("email");
const organization = email!.split("@")[1].split(".")[0]; const organization = email!.split("@")[1].split(".")[0];
const storedItems = JSON.parse( const storedItems = JSON.parse(localStorage.getItem("FloorItems") || "[]");
localStorage.getItem("FloorItems") || "[]" const selectedUUIDs = selectedAssets.map((mesh: THREE.Object3D) => mesh.uuid);
);
const selectedUUIDs = selectedAssets.map(
(mesh: THREE.Object3D) => mesh.uuid
);
const updatedStoredItems = storedItems.filter( const updatedStoredItems = storedItems.filter((item: { modeluuid: string }) => !selectedUUIDs.includes(item.modeluuid));
(item: { modeluuid: string }) => !selectedUUIDs.includes(item.modeluuid)
);
localStorage.setItem("FloorItems", JSON.stringify(updatedStoredItems)); localStorage.setItem("FloorItems", JSON.stringify(updatedStoredItems));
selectedAssets.forEach((selectedMesh: THREE.Object3D) => { selectedAssets.forEach((selectedMesh: THREE.Object3D) => {
@@ -491,21 +422,10 @@ const SelectionControls: React.FC = () => {
} }
}); });
setSimulationStates( setSimulationStates((prevEvents: (| SimulationTypes.ConveyorEventsSchema | SimulationTypes.VehicleEventsSchema | SimulationTypes.StaticMachineEventsSchema | SimulationTypes.ArmBotEventsSchema)[]) => {
( const updatedEvents = (prevEvents || []).filter((event) => event.modeluuid !== selectedMesh.uuid);
prevEvents: (
| SimulationTypes.ConveyorEventsSchema
| SimulationTypes.VehicleEventsSchema
| SimulationTypes.StaticMachineEventsSchema
| SimulationTypes.ArmBotEventsSchema
)[]
) => {
const updatedEvents = (prevEvents || []).filter(
(event) => event.modeluuid !== selectedMesh.uuid
);
return updatedEvents; return updatedEvents;
} });
);
itemsGroupRef.current?.remove(selectedMesh); itemsGroupRef.current?.remove(selectedMesh);
}); });
@@ -513,9 +433,7 @@ const SelectionControls: React.FC = () => {
const allUUIDs = selectedAssets.map((val: any) => val.uuid); const allUUIDs = selectedAssets.map((val: any) => val.uuid);
removeConnections(allUUIDs); removeConnections(allUUIDs);
const updatedItems = floorItems.filter( const updatedItems = floorItems.filter((item: { modeluuid: string }) => !selectedUUIDs.includes(item.modeluuid));
(item: { modeluuid: string }) => !selectedUUIDs.includes(item.modeluuid)
);
setFloorItems(updatedItems); setFloorItems(updatedItems);
} }
toast.success("Selected models removed!"); toast.success("Selected models removed!");
@@ -530,65 +448,13 @@ const SelectionControls: React.FC = () => {
</group> </group>
</group> </group>
<MoveControls <MoveControls movedObjects={movedObjects} setMovedObjects={setMovedObjects} itemsGroupRef={itemsGroupRef} copiedObjects={copiedObjects} setCopiedObjects={setCopiedObjects} pastedObjects={pastedObjects} setpastedObjects={setpastedObjects} duplicatedObjects={duplicatedObjects} setDuplicatedObjects={setDuplicatedObjects} rotatedObjects={rotatedObjects} setRotatedObjects={setRotatedObjects} selectionGroup={selectionGroup} boundingBoxRef={boundingBoxRef} />
movedObjects={movedObjects}
setMovedObjects={setMovedObjects}
itemsGroupRef={itemsGroupRef}
copiedObjects={copiedObjects}
setCopiedObjects={setCopiedObjects}
pastedObjects={pastedObjects}
setpastedObjects={setpastedObjects}
duplicatedObjects={duplicatedObjects}
setDuplicatedObjects={setDuplicatedObjects}
rotatedObjects={rotatedObjects}
setRotatedObjects={setRotatedObjects}
selectionGroup={selectionGroup}
boundingBoxRef={boundingBoxRef}
/>
<RotateControls <RotateControls rotatedObjects={rotatedObjects} setRotatedObjects={setRotatedObjects} movedObjects={movedObjects} setMovedObjects={setMovedObjects} itemsGroupRef={itemsGroupRef} copiedObjects={copiedObjects} setCopiedObjects={setCopiedObjects} pastedObjects={pastedObjects} setpastedObjects={setpastedObjects} duplicatedObjects={duplicatedObjects} setDuplicatedObjects={setDuplicatedObjects} selectionGroup={selectionGroup} boundingBoxRef={boundingBoxRef} />
rotatedObjects={rotatedObjects}
setRotatedObjects={setRotatedObjects}
movedObjects={movedObjects}
setMovedObjects={setMovedObjects}
itemsGroupRef={itemsGroupRef}
copiedObjects={copiedObjects}
setCopiedObjects={setCopiedObjects}
pastedObjects={pastedObjects}
setpastedObjects={setpastedObjects}
duplicatedObjects={duplicatedObjects}
setDuplicatedObjects={setDuplicatedObjects}
selectionGroup={selectionGroup}
boundingBoxRef={boundingBoxRef}
/>
<DuplicationControls <DuplicationControls itemsGroupRef={itemsGroupRef} duplicatedObjects={duplicatedObjects} setDuplicatedObjects={setDuplicatedObjects} setpastedObjects={setpastedObjects} selectionGroup={selectionGroup} movedObjects={movedObjects} setMovedObjects={setMovedObjects} rotatedObjects={rotatedObjects} setRotatedObjects={setRotatedObjects} boundingBoxRef={boundingBoxRef} />
itemsGroupRef={itemsGroupRef}
duplicatedObjects={duplicatedObjects}
setDuplicatedObjects={setDuplicatedObjects}
setpastedObjects={setpastedObjects}
selectionGroup={selectionGroup}
movedObjects={movedObjects}
setMovedObjects={setMovedObjects}
rotatedObjects={rotatedObjects}
setRotatedObjects={setRotatedObjects}
boundingBoxRef={boundingBoxRef}
/>
<CopyPasteControls <CopyPasteControls itemsGroupRef={itemsGroupRef} copiedObjects={copiedObjects} setCopiedObjects={setCopiedObjects} pastedObjects={pastedObjects} setpastedObjects={setpastedObjects} selectionGroup={selectionGroup} setDuplicatedObjects={setDuplicatedObjects} movedObjects={movedObjects} setMovedObjects={setMovedObjects} rotatedObjects={rotatedObjects} setRotatedObjects={setRotatedObjects} boundingBoxRef={boundingBoxRef} />
itemsGroupRef={itemsGroupRef}
copiedObjects={copiedObjects}
setCopiedObjects={setCopiedObjects}
pastedObjects={pastedObjects}
setpastedObjects={setpastedObjects}
selectionGroup={selectionGroup}
setDuplicatedObjects={setDuplicatedObjects}
movedObjects={movedObjects}
setMovedObjects={setMovedObjects}
rotatedObjects={rotatedObjects}
setRotatedObjects={setRotatedObjects}
boundingBoxRef={boundingBoxRef}
/>
</> </>
); );
}; };

File diff suppressed because it is too large Load Diff