Refactor asset model handling and event data management
- Removed redundant data structure in handleModelLoad function. - Introduced eventData object to encapsulate event-related information for different asset types (Conveyor, Vehicle, ArmBot, StaticMachine). - Updated socket emission to include complete data with eventData. - Enhanced copy-paste and duplication controls to maintain eventData integrity during object duplication. - Integrated event data updates in move and rotate controls to reflect changes in the simulation state. - Improved PointsCreator component to handle rotation for event groups. - Updated handleAddEventToProduct function to support event data management. - Enhanced product management to fetch existing products from the server and handle new product creation. - Added new types for eventData in worldTypes and simulationTypes for better type safety. - Refactored IndexedDB utility functions for cleaner code.
This commit is contained in:
@@ -137,6 +137,38 @@ const CopyPasteControls = ({ itemsGroupRef, copiedObjects, setCopiedObjects, pas
|
||||
|
||||
if (itemsGroupRef.current) {
|
||||
|
||||
let updatedEventData = null;
|
||||
if (obj.userData.eventData) {
|
||||
updatedEventData = JSON.parse(JSON.stringify(obj.userData.eventData));
|
||||
|
||||
updatedEventData.modelUuid = THREE.MathUtils.generateUUID();
|
||||
|
||||
if (updatedEventData.type === "Conveyor" && updatedEventData.points) {
|
||||
updatedEventData.points = updatedEventData.points.map((point: any) => ({
|
||||
...point,
|
||||
uuid: THREE.MathUtils.generateUUID()
|
||||
}));
|
||||
}
|
||||
else if (updatedEventData.type === "Vehicle" && updatedEventData.point) {
|
||||
updatedEventData.point = {
|
||||
...updatedEventData.point,
|
||||
uuid: THREE.MathUtils.generateUUID()
|
||||
};
|
||||
}
|
||||
else if (updatedEventData.type === "ArmBot" && updatedEventData.point) {
|
||||
updatedEventData.point = {
|
||||
...updatedEventData.point,
|
||||
uuid: THREE.MathUtils.generateUUID()
|
||||
};
|
||||
}
|
||||
else if (updatedEventData.type === "StaticMachine" && updatedEventData.point) {
|
||||
updatedEventData.point = {
|
||||
...updatedEventData.point,
|
||||
uuid: THREE.MathUtils.generateUUID()
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
const newFloorItem: Types.FloorItemType = {
|
||||
modeluuid: obj.uuid,
|
||||
modelname: obj.userData.name,
|
||||
@@ -144,7 +176,8 @@ const CopyPasteControls = ({ itemsGroupRef, copiedObjects, setCopiedObjects, pas
|
||||
position: [worldPosition.x, worldPosition.y, worldPosition.z],
|
||||
rotation: { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z, },
|
||||
isLocked: false,
|
||||
isVisible: true
|
||||
isVisible: true,
|
||||
eventData: updatedEventData
|
||||
};
|
||||
|
||||
setFloorItems((prevItems: Types.FloorItems) => {
|
||||
@@ -181,11 +214,18 @@ const CopyPasteControls = ({ itemsGroupRef, copiedObjects, setCopiedObjects, pas
|
||||
isLocked: false,
|
||||
isVisible: true,
|
||||
socketId: socket.id,
|
||||
eventData: updatedEventData
|
||||
};
|
||||
|
||||
socket.emit("v2:model-asset:add", data);
|
||||
|
||||
obj.userData.modeluuid = newFloorItem.modeluuid;
|
||||
obj.userData = {
|
||||
name: newFloorItem.modelname,
|
||||
modelId: newFloorItem.modelfileID,
|
||||
modeluuid: newFloorItem.modeluuid,
|
||||
eventData: updatedEventData
|
||||
};
|
||||
|
||||
itemsGroupRef.current.add(obj);
|
||||
}
|
||||
});
|
||||
@@ -205,7 +245,7 @@ const CopyPasteControls = ({ itemsGroupRef, copiedObjects, setCopiedObjects, pas
|
||||
setSelectedAssets([]);
|
||||
}
|
||||
|
||||
return null; // No visible output, but the component handles copy-paste functionality
|
||||
return null;
|
||||
};
|
||||
|
||||
export default CopyPasteControls;
|
||||
Reference in New Issue
Block a user