From c9dc6c864233d3a5c6fa54d25f52cdc6e0120dc0 Mon Sep 17 00:00:00 2001 From: Jerald-Golden-B Date: Fri, 18 Jul 2025 15:25:22 +0530 Subject: [PATCH] bug fix --- .../selection3D/copyPasteControls3D.tsx | 23 ++++++---------- .../selection3D/duplicationControls3D.tsx | 23 ++++++---------- .../selection3D/moveControls3D.tsx | 21 +++++---------- .../selection3D/rotateControls3D.tsx | 27 +++++-------------- 4 files changed, 29 insertions(+), 65 deletions(-) diff --git a/app/src/modules/scene/controls/selectionControls/selection3D/copyPasteControls3D.tsx b/app/src/modules/scene/controls/selectionControls/selection3D/copyPasteControls3D.tsx index 8593758..0d7cf7e 100644 --- a/app/src/modules/scene/controls/selectionControls/selection3D/copyPasteControls3D.tsx +++ b/app/src/modules/scene/controls/selectionControls/selection3D/copyPasteControls3D.tsx @@ -10,6 +10,8 @@ import { getUserData } from "../../../../../functions/getUserData"; import { useSceneContext } from "../../../sceneContext"; import { useVersionContext } from "../../../../builder/version/versionContext"; +// import { setAssetsApi } from "../../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi"; + const CopyPasteControls3D = ({ copiedObjects, setCopiedObjects, @@ -419,21 +421,6 @@ const CopyPasteControls3D = ({ newFloorItem.eventData = eventData; - //REST - - // await setAssetsApi( - // organization, - // pastedAsset.uuid, - // pastedAsset.userData.name, - // [worldPosition.x, worldPosition.y, worldPosition.z], - // { "x": pastedAsset.rotation.x, "y": pastedAsset.rotation.y, "z": pastedAsset.rotation.z }, - // pastedAsset.userData.modelId, - // false, - // true, - // ); - - //SOCKET - const data = { organization, modelUuid: newFloorItem.modelUuid, @@ -450,6 +437,12 @@ const CopyPasteControls3D = ({ projectId }; + //REST + + // await setAssetsApi(data); + + //SOCKET + socket.emit("v1:model-asset:add", data); const asset: Asset = { diff --git a/app/src/modules/scene/controls/selectionControls/selection3D/duplicationControls3D.tsx b/app/src/modules/scene/controls/selectionControls/selection3D/duplicationControls3D.tsx index 4f08cc7..f4f5048 100644 --- a/app/src/modules/scene/controls/selectionControls/selection3D/duplicationControls3D.tsx +++ b/app/src/modules/scene/controls/selectionControls/selection3D/duplicationControls3D.tsx @@ -10,6 +10,8 @@ import { getUserData } from "../../../../../functions/getUserData"; import { useSceneContext } from "../../../sceneContext"; import { useVersionContext } from "../../../../builder/version/versionContext"; +// import { setAssetsApi } from "../../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi"; + const DuplicationControls3D = ({ duplicatedObjects, setDuplicatedObjects, @@ -420,21 +422,6 @@ const DuplicationControls3D = ({ newFloorItem.eventData = eventData; - //REST - - // await setAssetsApi( - // organization, - // pastedAsset.uuid, - // pastedAsset.userData.name, - // [worldPosition.x, worldPosition.y, worldPosition.z], - // { "x": pastedAsset.rotation.x, "y": pastedAsset.rotation.y, "z": pastedAsset.rotation.z }, - // pastedAsset.userData.modelId, - // false, - // true, - // ); - - //SOCKET - const data = { organization, modelUuid: newFloorItem.modelUuid, @@ -451,6 +438,12 @@ const DuplicationControls3D = ({ projectId }; + //REST + + // await setAssetsApi(data); + + //SOCKET + socket.emit("v1:model-asset:add", data); const asset: Asset = { diff --git a/app/src/modules/scene/controls/selectionControls/selection3D/moveControls3D.tsx b/app/src/modules/scene/controls/selectionControls/selection3D/moveControls3D.tsx index d74c2da..e58cc44 100644 --- a/app/src/modules/scene/controls/selectionControls/selection3D/moveControls3D.tsx +++ b/app/src/modules/scene/controls/selectionControls/selection3D/moveControls3D.tsx @@ -341,21 +341,6 @@ function MoveControls3D({ rotation: [movedAsset.rotation.x, movedAsset.rotation.y, movedAsset.rotation.z], }); - //REST - - // await setAssetsApi( - // organization, - // obj.uuid, - // obj.userData.name, - // [worldPosition.x, worldPosition.y, worldPosition.z], - // { "x": obj.rotation.x, "y": obj.rotation.y, "z": obj.rotation.z }, - // obj.userData.modelId, - // false, - // true, - // ); - - //SOCKET - const data = { organization, modelUuid: newFloorItem.modelUuid, @@ -371,6 +356,12 @@ function MoveControls3D({ userId }; + //REST + + // await setAssetsApi(data); + + //SOCKET + socket.emit("v1:model-asset:add", data); } }); diff --git a/app/src/modules/scene/controls/selectionControls/selection3D/rotateControls3D.tsx b/app/src/modules/scene/controls/selectionControls/selection3D/rotateControls3D.tsx index f31bc9a..83266fd 100644 --- a/app/src/modules/scene/controls/selectionControls/selection3D/rotateControls3D.tsx +++ b/app/src/modules/scene/controls/selectionControls/selection3D/rotateControls3D.tsx @@ -278,32 +278,13 @@ function RotateControls3D({ rotation: rotationArray, }); - //REST - - // await setAssetsApi( - // organization, - // obj.uuid, - // obj.userData.name, - // [worldPosition.x, worldPosition.y, worldPosition.z], - // { "x": obj.rotation.x, "y": obj.rotation.y, "z": obj.rotation.z }, - // obj.userData.modelId, - // false, - // true, - // ); - - //SOCKET - const data = { organization, modelUuid: newFloorItem.modelUuid, modelName: newFloorItem.modelName, assetId: newFloorItem.assetId, position: newFloorItem.position, - rotation: { - x: obj.rotation.x, - y: obj.rotation.y, - z: obj.rotation.z - }, + rotation: { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z }, isLocked: false, isVisible: true, socketId: socket.id, @@ -312,6 +293,12 @@ function RotateControls3D({ userId }; + //REST + + // await setAssetsApi(data); + + //SOCKET + socket.emit("v1:model-asset:add", data); } });