Dwinzo-Beta
/
Dwinzo_dev
4
0
Fork 3
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed targets based on condition for armbot

This commit is contained in:
Poovizhi99 2025-04-15 10:05:53 +05:30
parent 05214997f1
commit 3446507307
1 changed files with 712 additions and 588 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

190
app/src/modules/scene/controls/selection/selectionControls.tsx
View File

@ -3,7 +3,13 @@ import { useEffect, useMemo, useRef, useState } from "react";
import { SelectionBox } from "three/examples/jsm/interactive/SelectionBox";
import { SelectionHelper } from "./selectionHelper";
import { useFrame, useThree } from "@react-three/fiber";
import { useFloorItems, useSelectedAssets, useSimulationStates, useSocketStore, useToggleView, } from "../../../../store/store";
import {
useFloorItems,
useSelectedAssets,
useSimulationStates,
useSocketStore,
useToggleView,
} from "../../../../store/store";
import BoundingBox from "./boundingBoxHelper";
import { toast } from "react-toastify";
// import { deleteFloorItem } from '../../../../services/factoryBuilder/assest/floorAsset/deleteFloorItemApi';
@ -27,12 +33,17 @@ const SelectionControls: React.FC = () => {
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 [duplicatedObjects, setDuplicatedObjects] = useState<THREE.Object3D[]>(
[]
);
const boundingBoxRef = useRef<THREE.Mesh>();
const { floorItems, setFloorItems } = useFloorItems();
const { activeModule } = useModuleStore();
const { socket } = useSocketStore();
const selectionBox = useMemo(() => new SelectionBox(camera, scene), [camera, scene]);
const selectionBox = useMemo(
() => new SelectionBox(camera, scene),
[camera, scene]
);
useEffect(() => {
if (!camera || !scene || toggleView) return;
@ -74,7 +85,12 @@ const SelectionControls: React.FC = () => {
rightClickMoved = true;
}
isSelecting = true;
if (helper.isDown && event.ctrlKey && duplicatedObjects.length === 0 && isCtrlSelecting) {
if (
helper.isDown &&
event.ctrlKey &&
duplicatedObjects.length === 0 &&
isCtrlSelecting
) {
selectionBox.endPoint.set(pointer.x, pointer.y, 0);
}
};
@ -94,7 +110,15 @@ const SelectionControls: React.FC = () => {
if (event.ctrlKey && duplicatedObjects.length === 0) {
selectAssets();
}
} else if (!isSelecting && selectedAssets.length > 0 && ((pastedObjects.length === 0 && duplicatedObjects.length === 0 && movedObjects.length === 0 && rotatedObjects.length === 0) || event.button !== 0)) {
} else if (
!isSelecting &&
selectedAssets.length > 0 &&
((pastedObjects.length === 0 &&
duplicatedObjects.length === 0 &&
movedObjects.length === 0 &&
rotatedObjects.length === 0) ||
event.button !== 0)
) {
clearSelection();
helper.enabled = true;
isCtrlSelecting = false;
@ -146,7 +170,21 @@ const SelectionControls: React.FC = () => {
helper.enabled = false;
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(() => {
if (activeModule !== "builder") {
@ -155,7 +193,12 @@ const SelectionControls: React.FC = () => {
}, [activeModule]);
useFrame(() => {
if (pastedObjects.length === 0 && duplicatedObjects.length === 0 && movedObjects.length === 0 && rotatedObjects.length === 0) {
if (
pastedObjects.length === 0 &&
duplicatedObjects.length === 0 &&
movedObjects.length === 0 &&
rotatedObjects.length === 0
) {
selectionGroup.current.position.set(0, 0, 0);
}
});
@ -184,7 +227,11 @@ const SelectionControls: React.FC = () => {
}
const updatedSelections = new Set(selectedAssets);
Objects.forEach((obj) => { updatedSelections.has(obj) ? updatedSelections.delete(obj) : updatedSelections.add(obj); });
Objects.forEach((obj) => {
updatedSelections.has(obj)
? updatedSelections.delete(obj)
: updatedSelections.add(obj);
});
const selected = Array.from(updatedSelections);
@ -199,13 +246,19 @@ const SelectionControls: React.FC = () => {
setDuplicatedObjects([]);
setSelectedAssets([]);
};
const updateBackend = async (updatedPaths: (SimulationTypes.ConveyorEventsSchema | SimulationTypes.VehicleEventsSchema | SimulationTypes.StaticMachineEventsSchema | SimulationTypes.ArmBotEventsSchema)[]) => {
const updateBackend = async (
updatedPaths: (
| SimulationTypes.ConveyorEventsSchema
| SimulationTypes.VehicleEventsSchema
| SimulationTypes.StaticMachineEventsSchema
| SimulationTypes.ArmBotEventsSchema
)[]
) => {
if (updatedPaths.length === 0) return;
const email = localStorage.getItem("email");
const organization = email ? email.split("@")[1].split(".")[0] : "";
updatedPaths.forEach(async (updatedPath) => {
if (updatedPath.type === "Conveyor") {
// await setEventApi(
// organization,
@ -224,9 +277,7 @@ const SelectionControls: React.FC = () => {
};
socket.emit("v2:model-asset:updateEventData", data);
} else if (updatedPath.type === "Vehicle") {
// await setEventApi(
// organization,
// updatedPath.modeluuid,
@ -240,9 +291,7 @@ const SelectionControls: React.FC = () => {
};
socket.emit("v2:model-asset:updateEventData", data);
} else if (updatedPath.type === "StaticMachine") {
// await setEventApi(
// organization,
// updatedPath.modeluuid,
@ -256,9 +305,7 @@ const SelectionControls: React.FC = () => {
};
socket.emit("v2:model-asset:updateEventData", data);
} else if (updatedPath.type === "ArmBot") {
// await setEventApi(
// organization,
// updatedPath.modeluuid,
@ -273,7 +320,6 @@ const SelectionControls: React.FC = () => {
socket.emit("v2:model-asset:updateEventData", data);
}
});
};
@ -401,8 +447,12 @@ const SelectionControls: React.FC = () => {
// Conveyor type
if (state.type === "Conveyor") {
state.points.forEach((point: any) => {
const sourceMatch = modelUUIDs.includes(point.connections?.source?.modelUUID);
const targetMatch = point.connections?.targets?.some((target: any) => modelUUIDs.includes(target.modelUUID));
const sourceMatch = modelUUIDs.includes(
point.connections?.source?.modelUUID
);
const targetMatch = point.connections?.targets?.some((target: any) =>
modelUUIDs.includes(target.modelUUID)
);
if (sourceMatch) {
point.connections.source = {};
@ -415,11 +465,12 @@ const SelectionControls: React.FC = () => {
}
});
}
// Vehicle & StaticMachine types
if (state.type === "Vehicle") {
const targets = state.points?.connections?.targets || [];
const targetMatch = targets.some((target: any) => modelUUIDs.includes(target.modelUUID));
const targetMatch = targets.some((target: any) =>
modelUUIDs.includes(target.modelUUID)
);
if (targetMatch) {
state.points.connections.targets = [];
@ -428,7 +479,9 @@ const SelectionControls: React.FC = () => {
}
if (state.type === "StaticMachine") {
const targets = state.points?.connections?.targets || [];
const targetMatch = targets.some((target: any) => modelUUIDs.includes(target.modelUUID));
const targetMatch = targets.some((target: any) =>
modelUUIDs.includes(target.modelUUID)
);
if (targetMatch) {
state.points.connections.targets = [];
@ -438,7 +491,11 @@ const SelectionControls: React.FC = () => {
// ArmBot type
if (state.type === "ArmBot") {
const sourceMatch = modelUUIDs.includes(state.points.connections?.source?.modelUUID);
const sourceMatch = modelUUIDs.includes(
state.points.connections?.source?.modelUUID
);
console.log("model", modelUUIDs);
console.log("state.points.connections: ", state.points);
const targetMatch = state.points.connections?.targets?.some(
(target: any) => modelUUIDs.includes(target.modelUUID)
@ -482,7 +539,9 @@ const SelectionControls: React.FC = () => {
if (targetMatch) {
state.points.connections.targets =
state.points.connections.targets.filter((target: any) => !modelUUIDs.includes(target.modelUUID));
state.points.connections.targets.filter(
(target: any) => !modelUUIDs.includes(target.modelUUID)
);
shouldInclude = true;
}
@ -493,7 +552,6 @@ const SelectionControls: React.FC = () => {
// const shouldRemove =
// modelUUIDs.includes(process.startPoint) ||
// modelUUIDs.includes(process.endPoint);
// console.log("shouldRemove: ", shouldRemove);
// return !shouldRemove;
// });
@ -513,10 +571,16 @@ const SelectionControls: React.FC = () => {
const email = localStorage.getItem("email");
const organization = email!.split("@")[1].split(".")[0];
const storedItems = JSON.parse(localStorage.getItem("FloorItems") || "[]");
const selectedUUIDs = selectedAssets.map((mesh: THREE.Object3D) => mesh.uuid);
const storedItems = JSON.parse(
localStorage.getItem("FloorItems") || "[]"
);
const selectedUUIDs = selectedAssets.map(
(mesh: THREE.Object3D) => mesh.uuid
);
const updatedStoredItems = storedItems.filter((item: { modeluuid: string }) => !selectedUUIDs.includes(item.modeluuid));
const updatedStoredItems = storedItems.filter(
(item: { modeluuid: string }) => !selectedUUIDs.includes(item.modeluuid)
);
localStorage.setItem("FloorItems", JSON.stringify(updatedStoredItems));
selectedAssets.forEach((selectedMesh: THREE.Object3D) => {
@ -550,7 +614,15 @@ const SelectionControls: React.FC = () => {
}
});
setSimulationStates((prevEvents: (| SimulationTypes.ConveyorEventsSchema | SimulationTypes.VehicleEventsSchema | SimulationTypes.StaticMachineEventsSchema | SimulationTypes.ArmBotEventsSchema)[]) => {
setSimulationStates(
(
prevEvents: (
| SimulationTypes.ConveyorEventsSchema
| SimulationTypes.VehicleEventsSchema
| SimulationTypes.StaticMachineEventsSchema
| SimulationTypes.ArmBotEventsSchema
)[]
) => {
const updatedEvents = (prevEvents || []).filter(
(event) => event.modeluuid !== selectedMesh.uuid
);
@ -624,13 +696,65 @@ const SelectionControls: React.FC = () => {
</group>
</group>
<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} />
<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}
/>
<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} />
<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}
/>
<DuplicationControls itemsGroupRef={itemsGroupRef} duplicatedObjects={duplicatedObjects} setDuplicatedObjects={setDuplicatedObjects} setpastedObjects={setpastedObjects} selectionGroup={selectionGroup} movedObjects={movedObjects} setMovedObjects={setMovedObjects} rotatedObjects={rotatedObjects} setRotatedObjects={setRotatedObjects} boundingBoxRef={boundingBoxRef} />
<DuplicationControls
itemsGroupRef={itemsGroupRef}
duplicatedObjects={duplicatedObjects}
setDuplicatedObjects={setDuplicatedObjects}
setpastedObjects={setpastedObjects}
selectionGroup={selectionGroup}
movedObjects={movedObjects}
setMovedObjects={setMovedObjects}
rotatedObjects={rotatedObjects}
setRotatedObjects={setRotatedObjects}
boundingBoxRef={boundingBoxRef}
/>
<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} />
<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}
/>
</>
);
};