Merge remote-tracking branch 'origin/simulation-arm' into simulation
This commit is contained in:
commit
693f58ff36
|
|
@ -3,7 +3,13 @@ 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 { useFloorItems, useSelectedAssets, useSimulationStates, useSocketStore, useToggleView, } from "../../../../store/store";
|
import {
|
||||||
|
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';
|
||||||
|
|
@ -27,12 +33,17 @@ 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(() => new SelectionBox(camera, scene), [camera, scene]);
|
const selectionBox = useMemo(
|
||||||
|
() => new SelectionBox(camera, scene),
|
||||||
|
[camera, scene]
|
||||||
|
);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!camera || !scene || toggleView) return;
|
if (!camera || !scene || toggleView) return;
|
||||||
|
|
@ -74,7 +85,12 @@ const SelectionControls: React.FC = () => {
|
||||||
rightClickMoved = true;
|
rightClickMoved = true;
|
||||||
}
|
}
|
||||||
isSelecting = 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);
|
selectionBox.endPoint.set(pointer.x, pointer.y, 0);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -94,7 +110,15 @@ const SelectionControls: React.FC = () => {
|
||||||
if (event.ctrlKey && duplicatedObjects.length === 0) {
|
if (event.ctrlKey && duplicatedObjects.length === 0) {
|
||||||
selectAssets();
|
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();
|
clearSelection();
|
||||||
helper.enabled = true;
|
helper.enabled = true;
|
||||||
isCtrlSelecting = false;
|
isCtrlSelecting = false;
|
||||||
|
|
@ -146,7 +170,21 @@ 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") {
|
||||||
|
|
@ -155,7 +193,12 @@ const SelectionControls: React.FC = () => {
|
||||||
}, [activeModule]);
|
}, [activeModule]);
|
||||||
|
|
||||||
useFrame(() => {
|
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);
|
selectionGroup.current.position.set(0, 0, 0);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -184,7 +227,11 @@ const SelectionControls: React.FC = () => {
|
||||||
}
|
}
|
||||||
|
|
||||||
const updatedSelections = new Set(selectedAssets);
|
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);
|
const selected = Array.from(updatedSelections);
|
||||||
|
|
||||||
|
|
@ -199,14 +246,19 @@ 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] : "";
|
||||||
|
|
||||||
updatedPaths.forEach(async (updatedPath) => {
|
updatedPaths.forEach(async (updatedPath) => {
|
||||||
|
|
||||||
if (updatedPath.type === "Conveyor") {
|
if (updatedPath.type === "Conveyor") {
|
||||||
// await setEventApi(
|
// await setEventApi(
|
||||||
// organization,
|
// organization,
|
||||||
|
|
@ -225,9 +277,7 @@ const SelectionControls: React.FC = () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
socket.emit("v2:model-asset:updateEventData", data);
|
socket.emit("v2:model-asset:updateEventData", data);
|
||||||
|
|
||||||
} else if (updatedPath.type === "Vehicle") {
|
} else if (updatedPath.type === "Vehicle") {
|
||||||
|
|
||||||
// await setEventApi(
|
// await setEventApi(
|
||||||
// organization,
|
// organization,
|
||||||
// updatedPath.modeluuid,
|
// updatedPath.modeluuid,
|
||||||
|
|
@ -241,9 +291,7 @@ const SelectionControls: React.FC = () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
socket.emit("v2:model-asset:updateEventData", data);
|
socket.emit("v2:model-asset:updateEventData", data);
|
||||||
|
|
||||||
} else if (updatedPath.type === "StaticMachine") {
|
} else if (updatedPath.type === "StaticMachine") {
|
||||||
|
|
||||||
// await setEventApi(
|
// await setEventApi(
|
||||||
// organization,
|
// organization,
|
||||||
// updatedPath.modeluuid,
|
// updatedPath.modeluuid,
|
||||||
|
|
@ -257,9 +305,7 @@ const SelectionControls: React.FC = () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
socket.emit("v2:model-asset:updateEventData", data);
|
socket.emit("v2:model-asset:updateEventData", data);
|
||||||
|
|
||||||
} else if (updatedPath.type === "ArmBot") {
|
} else if (updatedPath.type === "ArmBot") {
|
||||||
|
|
||||||
// await setEventApi(
|
// await setEventApi(
|
||||||
// organization,
|
// organization,
|
||||||
// updatedPath.modeluuid,
|
// updatedPath.modeluuid,
|
||||||
|
|
@ -274,239 +320,127 @@ const SelectionControls: React.FC = () => {
|
||||||
|
|
||||||
socket.emit("v2:model-asset:updateEventData", data);
|
socket.emit("v2:model-asset:updateEventData", data);
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
// const removeConnection = (modelUUID: any) => {
|
const removeConnections = (deletedModelUUIDs: string[]) => {
|
||||||
//
|
const updatedStates = simulationStates.map((state) => {
|
||||||
// const removedPath = simulationStates?.flatMap((state) => {
|
// Handle Conveyor
|
||||||
// let shouldInclude = false;
|
|
||||||
|
|
||||||
// if (state.type === "Conveyor") {
|
|
||||||
// state.points.forEach((point: any) => {
|
|
||||||
// const sourceMatch =
|
|
||||||
// point.connections?.source?.modelUUID === modelUUID;
|
|
||||||
// const targetMatch = point.connections?.targets?.some(
|
|
||||||
// (target: any) => target.modelUUID === modelUUID
|
|
||||||
// );
|
|
||||||
|
|
||||||
// if (sourceMatch || targetMatch) shouldInclude = true;
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
|
|
||||||
// if (state.type === "Vehicle") {
|
|
||||||
// const targetMatch = state.points.connections?.targets?.some(
|
|
||||||
// (target: any) => target.modelUUID === modelUUID
|
|
||||||
// );
|
|
||||||
|
|
||||||
// if (targetMatch) shouldInclude = true;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// if (state.type === "StaticMachine") {
|
|
||||||
// const targetMatch = state.points.connections?.targets?.some(
|
|
||||||
// (target: any) => target.modelUUID === modelUUID
|
|
||||||
// );
|
|
||||||
|
|
||||||
// if (targetMatch) shouldInclude = true;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// if (state.type === "ArmBot") {
|
|
||||||
// const sourceMatch =
|
|
||||||
// state.points.connections?.source?.modelUUID === modelUUID;
|
|
||||||
// const targetMatch = state.points.connections?.targets?.some(
|
|
||||||
// (target: any) => target.modelUUID === modelUUID
|
|
||||||
// );
|
|
||||||
|
|
||||||
// const processMatch =
|
|
||||||
// state.points.actions?.processes?.some(
|
|
||||||
// (process: any) =>
|
|
||||||
// process.startPoint === modelUUID || process.endPoint === modelUUID
|
|
||||||
// ) ?? false;
|
|
||||||
|
|
||||||
// if (sourceMatch || targetMatch || processMatch) shouldInclude = true;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// return shouldInclude ? [state] : [];
|
|
||||||
// });
|
|
||||||
// updateBackend(removedPath);
|
|
||||||
//
|
|
||||||
// return removedPath;
|
|
||||||
// // updateBackend(updatedPaths);
|
|
||||||
|
|
||||||
// // setSimulationStates(updatedStates);
|
|
||||||
// };
|
|
||||||
// const removeConnection = (modelUUIDs: any[]) => {
|
|
||||||
//
|
|
||||||
// const removedPath = simulationStates?.flatMap((state) => {
|
|
||||||
// let shouldInclude = false;
|
|
||||||
|
|
||||||
// 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)
|
|
||||||
// );
|
|
||||||
|
|
||||||
// if (sourceMatch || targetMatch) shouldInclude = true;
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
|
|
||||||
// if (state.type === "Vehicle") {
|
|
||||||
// const targetMatch = state.points.connections?.targets?.some(
|
|
||||||
// (target: any) => modelUUIDs.includes(target.modelUUID)
|
|
||||||
// );
|
|
||||||
|
|
||||||
// if (targetMatch) shouldInclude = true;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// if (state.type === "StaticMachine") {
|
|
||||||
// const targetMatch = state.points.connections?.targets?.some(
|
|
||||||
// (target: any) => modelUUIDs.includes(target.modelUUID)
|
|
||||||
// );
|
|
||||||
|
|
||||||
// if (targetMatch) shouldInclude = true;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// if (state.type === "ArmBot") {
|
|
||||||
// const sourceMatch = modelUUIDs.includes(
|
|
||||||
// state.points.connections?.source?.modelUUID
|
|
||||||
// );
|
|
||||||
// const targetMatch = state.points.connections?.targets?.some(
|
|
||||||
// (target: any) => modelUUIDs.includes(target.modelUUID)
|
|
||||||
// );
|
|
||||||
|
|
||||||
// const processMatch =
|
|
||||||
// state.points.actions?.processes?.some(
|
|
||||||
// (process: any) =>
|
|
||||||
// modelUUIDs.includes(process.startPoint) ||
|
|
||||||
// modelUUIDs.includes(process.endPoint)
|
|
||||||
// ) ?? false;
|
|
||||||
|
|
||||||
// if (sourceMatch || targetMatch || processMatch) shouldInclude = true;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// return shouldInclude ? [state] : [];
|
|
||||||
// });
|
|
||||||
// updateBackend(removedPath);
|
|
||||||
//
|
|
||||||
// return removedPath;
|
|
||||||
// };
|
|
||||||
|
|
||||||
const removeConnection = (modelUUIDs: any[]) => {
|
|
||||||
const removedPath = simulationStates?.flatMap((state: any) => {
|
|
||||||
let shouldInclude = false;
|
|
||||||
|
|
||||||
// Conveyor type
|
|
||||||
if (state.type === "Conveyor") {
|
if (state.type === "Conveyor") {
|
||||||
state.points.forEach((point: any) => {
|
const updatedConveyor: SimulationTypes.ConveyorEventsSchema = {
|
||||||
const sourceMatch = modelUUIDs.includes(point.connections?.source?.modelUUID);
|
...state,
|
||||||
const targetMatch = point.connections?.targets?.some((target: any) => modelUUIDs.includes(target.modelUUID));
|
points: state.points.map((point) => {
|
||||||
|
return {
|
||||||
if (sourceMatch) {
|
...point,
|
||||||
point.connections.source = {};
|
connections: {
|
||||||
shouldInclude = true;
|
...point.connections,
|
||||||
|
targets: point.connections.targets.filter(
|
||||||
|
(target) => !deletedModelUUIDs.includes(target.modelUUID)
|
||||||
|
),
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}),
|
||||||
|
};
|
||||||
|
return updatedConveyor;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (targetMatch) {
|
// Handle Vehicle
|
||||||
point.connections.targets = [];
|
else if (state.type === "Vehicle") {
|
||||||
shouldInclude = true;
|
const updatedVehicle: SimulationTypes.VehicleEventsSchema = {
|
||||||
}
|
...state,
|
||||||
});
|
points: {
|
||||||
|
...state.points,
|
||||||
|
connections: {
|
||||||
|
...state.points.connections,
|
||||||
|
targets: state.points.connections.targets.filter(
|
||||||
|
(target) => !deletedModelUUIDs.includes(target.modelUUID)
|
||||||
|
),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
return updatedVehicle;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Vehicle & StaticMachine types
|
// Handle StaticMachine
|
||||||
if (state.type === "Vehicle") {
|
else if (state.type === "StaticMachine") {
|
||||||
const targets = state.points?.connections?.targets || [];
|
const updatedStaticMachine: SimulationTypes.StaticMachineEventsSchema =
|
||||||
const targetMatch = targets.some((target: any) => modelUUIDs.includes(target.modelUUID));
|
{
|
||||||
|
...state,
|
||||||
if (targetMatch) {
|
points: {
|
||||||
state.points.connections.targets = [];
|
...state.points,
|
||||||
shouldInclude = true;
|
connections: {
|
||||||
}
|
...state.points.connections,
|
||||||
}
|
targets: state.points.connections.targets.filter(
|
||||||
if (state.type === "StaticMachine") {
|
(target) => !deletedModelUUIDs.includes(target.modelUUID)
|
||||||
const targets = state.points?.connections?.targets || [];
|
),
|
||||||
const targetMatch = targets.some((target: any) => modelUUIDs.includes(target.modelUUID));
|
},
|
||||||
|
},
|
||||||
if (targetMatch) {
|
};
|
||||||
state.points.connections.targets = [];
|
return updatedStaticMachine;
|
||||||
shouldInclude = true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ArmBot type
|
// Handle ArmBot
|
||||||
if (state.type === "ArmBot") {
|
else if (state.type === "ArmBot") {
|
||||||
const sourceMatch = modelUUIDs.includes(state.points.connections?.source?.modelUUID);
|
const updatedArmBot: SimulationTypes.ArmBotEventsSchema = {
|
||||||
|
...state,
|
||||||
|
points: {
|
||||||
|
...state.points,
|
||||||
|
connections: {
|
||||||
|
...state.points.connections,
|
||||||
|
|
||||||
const targetMatch = state.points.connections?.targets?.some(
|
targets: state.points.connections.targets.filter(
|
||||||
(target: any) => modelUUIDs.includes(target.modelUUID)
|
(target: any) => !deletedModelUUIDs.includes(target.modelUUID)
|
||||||
|
),
|
||||||
|
},
|
||||||
|
actions: {
|
||||||
|
...state.points.actions,
|
||||||
|
processes: (state.points.actions.processes =
|
||||||
|
state.points.actions.processes?.filter((process) => {
|
||||||
|
const matchedStates = simulationStates.filter((s) =>
|
||||||
|
deletedModelUUIDs.includes(s.modeluuid)
|
||||||
);
|
);
|
||||||
// state.points.actions.processes = state.points.actions.processes.filter(
|
|
||||||
// (process: any) =>
|
|
||||||
// console.log(
|
|
||||||
// !modelUUIDs.includes(process.startPoint),
|
|
||||||
// !modelUUIDs.includes(process.endPoint),
|
|
||||||
// modelUUIDs,
|
|
||||||
// process.startPoint,
|
|
||||||
// process.endPoint
|
|
||||||
// )
|
|
||||||
// );
|
|
||||||
|
|
||||||
// shouldInclude = true;
|
if (matchedStates.length > 0) {
|
||||||
|
if (matchedStates[0]?.type === "StaticMachine") {
|
||||||
|
const trigPoints = matchedStates[0]?.points;
|
||||||
|
|
||||||
// const processMatches = state.points.actions?.processes?.some(
|
return !(
|
||||||
// (process: any) =>
|
process.triggerId === trigPoints?.triggers?.uuid
|
||||||
// console.log(
|
);
|
||||||
// "process: ",
|
} else if (matchedStates[0]?.type === "Conveyor") {
|
||||||
// process,
|
const trigPoints = matchedStates[0]?.points;
|
||||||
// modelUUIDs,
|
|
||||||
// process.startPoint,
|
|
||||||
// process.endPoint
|
|
||||||
// )
|
|
||||||
// // modelUUIDs.includes(process.startPoint) ||
|
|
||||||
// // modelUUIDs.includes(process.endPoint)
|
|
||||||
// );
|
|
||||||
// const processMatch = state.points.actions?.processes?.some(
|
|
||||||
// (process: any) =>
|
|
||||||
// modelUUIDs.includes(String(process.startPoint)) ||
|
|
||||||
// modelUUIDs.includes(String(process.endPoint))
|
|
||||||
// );
|
|
||||||
|
|
||||||
// console.log("processMatch: ", processMatch);
|
if (Array.isArray(trigPoints)) {
|
||||||
if (sourceMatch) {
|
const nonEmptyTriggers = trigPoints.filter(
|
||||||
state.points.connections.source = {};
|
(point) =>
|
||||||
shouldInclude = true;
|
point && point.triggers && point.triggers.length > 0
|
||||||
|
);
|
||||||
|
|
||||||
|
const allTriggerUUIDs = nonEmptyTriggers
|
||||||
|
.flatMap((point) => point.triggers)
|
||||||
|
.map((trigger) => trigger.uuid);
|
||||||
|
|
||||||
|
return !allTriggerUUIDs.includes(process.triggerId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
})),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
return updatedArmBot;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (targetMatch) {
|
return state;
|
||||||
state.points.connections.targets =
|
|
||||||
state.points.connections.targets.filter((target: any) => !modelUUIDs.includes(target.modelUUID));
|
|
||||||
shouldInclude = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// console.log("processMatch: ", processMatch);
|
|
||||||
// if (processMatch) {
|
|
||||||
// state.points.actions.processes =
|
|
||||||
// state.points.actions.processes.filter((process: any) => {
|
|
||||||
// const shouldRemove =
|
|
||||||
// modelUUIDs.includes(process.startPoint) ||
|
|
||||||
// modelUUIDs.includes(process.endPoint);
|
|
||||||
|
|
||||||
// console.log("shouldRemove: ", shouldRemove);
|
|
||||||
// return !shouldRemove;
|
|
||||||
// });
|
|
||||||
// shouldInclude = true;
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
|
|
||||||
return shouldInclude ? [state] : [];
|
|
||||||
});
|
});
|
||||||
|
|
||||||
updateBackend(removedPath);
|
const filteredStates = updatedStates.filter(
|
||||||
return removedPath;
|
(state) => !deletedModelUUIDs.includes(state.modeluuid)
|
||||||
|
);
|
||||||
|
|
||||||
|
updateBackend(filteredStates);
|
||||||
|
setSimulationStates(filteredStates);
|
||||||
};
|
};
|
||||||
|
|
||||||
const deleteSelection = () => {
|
const deleteSelection = () => {
|
||||||
|
|
@ -514,10 +448,16 @@ 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(localStorage.getItem("FloorItems") || "[]");
|
const storedItems = JSON.parse(
|
||||||
const selectedUUIDs = selectedAssets.map((mesh: THREE.Object3D) => mesh.uuid);
|
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));
|
localStorage.setItem("FloorItems", JSON.stringify(updatedStoredItems));
|
||||||
|
|
||||||
selectedAssets.forEach((selectedMesh: THREE.Object3D) => {
|
selectedAssets.forEach((selectedMesh: THREE.Object3D) => {
|
||||||
|
|
@ -551,7 +491,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(
|
const updatedEvents = (prevEvents || []).filter(
|
||||||
(event) => event.modeluuid !== selectedMesh.uuid
|
(event) => event.modeluuid !== selectedMesh.uuid
|
||||||
);
|
);
|
||||||
|
|
@ -563,50 +511,7 @@ const SelectionControls: React.FC = () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
const allUUIDs = selectedAssets.map((val: any) => val.uuid);
|
const allUUIDs = selectedAssets.map((val: any) => val.uuid);
|
||||||
removeConnection(allUUIDs);
|
removeConnections(allUUIDs);
|
||||||
|
|
||||||
// const removedPath = simulationStates?.flatMap((path: any) => {
|
|
||||||
// let shouldInclude = false;
|
|
||||||
|
|
||||||
// if (Array.isArray(path.points)) {
|
|
||||||
// path.points.forEach((point: any) => {
|
|
||||||
// const sourceMatch =
|
|
||||||
// point.connections?.source?.modelUUID === selectedAssets[0].uuid;
|
|
||||||
// const targetMatch = point.connections?.targets?.some(
|
|
||||||
// (target: any) => target.modelUUID === selectedAssets[0].uuid
|
|
||||||
// );
|
|
||||||
|
|
||||||
// if (sourceMatch) {
|
|
||||||
// point.connections.source = {};
|
|
||||||
// shouldInclude = true;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// if (targetMatch) {
|
|
||||||
// point.connections.targets = [];
|
|
||||||
// shouldInclude = true;
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
// } else {
|
|
||||||
// const sourceMatch =
|
|
||||||
// path.connections?.source?.modelUUID === selectedAssets[0].uuid;
|
|
||||||
// const targetMatch = path.connections?.targets?.some(
|
|
||||||
// (target: any) => target.modelUUID === selectedAssets[0].uuid
|
|
||||||
// );
|
|
||||||
|
|
||||||
// if (sourceMatch) {
|
|
||||||
// path.connections.source = {};
|
|
||||||
// shouldInclude = true;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// if (targetMatch) {
|
|
||||||
// path.connections.targets = [];
|
|
||||||
// shouldInclude = true;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
// return shouldInclude ? [path] : [];
|
|
||||||
// });
|
|
||||||
// updateBackend(removedPath);
|
|
||||||
|
|
||||||
const updatedItems = floorItems.filter(
|
const updatedItems = floorItems.filter(
|
||||||
(item: { modeluuid: string }) => !selectedUUIDs.includes(item.modeluuid)
|
(item: { modeluuid: string }) => !selectedUUIDs.includes(item.modeluuid)
|
||||||
|
|
@ -625,13 +530,65 @@ const SelectionControls: React.FC = () => {
|
||||||
</group>
|
</group>
|
||||||
</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}
|
||||||
|
/>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue