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

update assetID

Browse Source
This commit is contained in:
Vishnu
2025-06-12 09:31:51 +05:30
parent 9b0842ed14
commit c7cc5cf2ca
59 changed files with 1039 additions and 1029 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/modules/scene/controls/selectionControls/copyPasteControls.tsx
View File

@@ -158,7 +158,7 @@ const CopyPasteControls = ({
const newFloorItem: Types.FloorItemType = {
modelUuid: THREE.MathUtils.generateUUID(),
modelName: obj.userData.modelName,
modelfileID: obj.userData.assetId,
assetId: obj.userData.assetId,
position: [worldPosition.x, worldPosition.y, worldPosition.z],
rotation: { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z, },
isLocked: false,
@@ -352,7 +352,7 @@ const CopyPasteControls = ({
organization,
modelUuid: newFloorItem.modelUuid,
modelName: newFloorItem.modelName,
modelfileID: newFloorItem.modelfileID,
assetId: newFloorItem.assetId,
position: newFloorItem.position,
rotation: { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z },
isLocked: false,
@@ -368,7 +368,7 @@ const CopyPasteControls = ({
obj.userData = {
name: newFloorItem.modelName,
modelId: newFloorItem.modelfileID,
modelId: newFloorItem.assetId,
modelUuid: newFloorItem.modelUuid,
eventData: JSON.parse(JSON.stringify(eventData))
};
@@ -376,7 +376,7 @@ const CopyPasteControls = ({
const asset: Asset = {
modelUuid: data.modelUuid,
modelName: data.modelName,
assetId: data.modelfileID,
assetId: data.assetId,
position: data.position,
rotation: [data.rotation.x, data.rotation.y, data.rotation.z],
isLocked: data.isLocked,
@@ -409,7 +409,7 @@ const CopyPasteControls = ({
organization,
modelUuid: newFloorItem.modelUuid,
modelName: newFloorItem.modelName,
modelfileID: newFloorItem.modelfileID,
assetId: newFloorItem.assetId,
position: newFloorItem.position,
rotation: { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z },
isLocked: false,
@@ -425,7 +425,7 @@ const CopyPasteControls = ({
const asset: Asset = {
modelUuid: data.modelUuid,
modelName: data.modelName,
assetId: data.modelfileID,
assetId: data.assetId,
position: data.position,
rotation: [data.rotation.x, data.rotation.y, data.rotation.z],
isLocked: data.isLocked,

10
app/src/modules/scene/controls/selectionControls/duplicationControls.tsx
View File

@@ -133,7 +133,7 @@ const DuplicationControls = ({
const newFloorItem: Types.FloorItemType = {
modelUuid: THREE.MathUtils.generateUUID(),
modelName: obj.userData.modelName,
modelfileID: obj.userData.assetId,
assetId: obj.userData.assetId,
position: [worldPosition.x, worldPosition.y, worldPosition.z],
rotation: { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z, },
isLocked: false,
@@ -327,7 +327,7 @@ const DuplicationControls = ({
organization,
modelUuid: newFloorItem.modelUuid,
modelName: newFloorItem.modelName,
modelfileID: newFloorItem.modelfileID,
assetId: newFloorItem.assetId,
position: newFloorItem.position,
rotation: { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z },
isLocked: false,
@@ -344,7 +344,7 @@ const DuplicationControls = ({
const asset: Asset = {
modelUuid: data.modelUuid,
modelName: data.modelName,
assetId: data.modelfileID,
assetId: data.assetId,
position: data.position,
rotation: [data.rotation.x, data.rotation.y, data.rotation.z],
isLocked: data.isLocked,
@@ -378,7 +378,7 @@ const DuplicationControls = ({
organization,
modelUuid: newFloorItem.modelUuid,
modelName: newFloorItem.modelName,
modelfileID: newFloorItem.modelfileID,
assetId: newFloorItem.assetId,
position: newFloorItem.position,
rotation: { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z },
isLocked: false,
@@ -394,7 +394,7 @@ const DuplicationControls = ({
const asset: Asset = {
modelUuid: data.modelUuid,
modelName: data.modelName,
assetId: data.modelfileID,
assetId: data.assetId,
position: data.position,
rotation: [data.rotation.x, data.rotation.y, data.rotation.z],
isLocked: data.isLocked,

4
app/src/modules/scene/controls/selectionControls/moveControls.tsx
View File

@@ -237,7 +237,7 @@ function MoveControls({
const newFloorItem: Types.FloorItemType = {
modelUuid: obj.userData.modelUuid,
modelName: obj.userData.modelName,
modelfileID: obj.userData.assetId,
assetId: obj.userData.assetId,
position: [worldPosition.x, worldPosition.y, worldPosition.z],
rotation: { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z },
isLocked: false,
@@ -304,7 +304,7 @@ function MoveControls({
organization,
modelUuid: newFloorItem.modelUuid,
modelName: newFloorItem.modelName,
modelfileID: newFloorItem.modelfileID,
assetId: newFloorItem.assetId,
position: newFloorItem.position,
rotation: { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z },
isLocked: false,

4
app/src/modules/scene/controls/selectionControls/rotateControls.tsx
View File

@@ -203,7 +203,7 @@ function RotateControls({
const newFloorItem: Types.FloorItemType = {
modelUuid: obj.userData.modelUuid,
modelName: obj.userData.modelName,
modelfileID: obj.userData.assetId,
assetId: obj.userData.assetId,
position: [worldPosition.x, worldPosition.y, worldPosition.z],
rotation: { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z },
isLocked: false,
@@ -263,7 +263,7 @@ function RotateControls({
organization,
modelUuid: newFloorItem.modelUuid,
modelName: newFloorItem.modelName,
modelfileID: newFloorItem.modelfileID,
assetId: newFloorItem.assetId,
position: newFloorItem.position,
rotation: { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z },
isLocked: false,

7
app/src/modules/scene/controls/selectionControls/selectionControls.tsx
View File

@@ -3,7 +3,7 @@ import { useCallback, 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 { useSelectedAssets, useSocketStore, useToggleView, } from "../../../../store/builder/store";
import { useSelectedAssets, useSocketStore, useToggleView, useToolMode, } from "../../../../store/builder/store";
import BoundingBox from "./boundingBoxHelper";
// import { deleteFloorItem } from '../../../../services/factoryBuilder/assest/floorAsset/deleteFloorItemApi';
import * as Types from "../../../../types/world/worldTypes";
@@ -33,6 +33,7 @@ const SelectionControls: React.FC = () => {
const { socket } = useSocketStore();
const { removeAsset } = useAssetsStore();
const selectionBox = useMemo(() => new SelectionBox(camera, scene), [camera, scene]);
const { toolMode } = useToolMode();
const { projectId } = useParams();
const isDragging = useRef(false);
@@ -173,7 +174,7 @@ const SelectionControls: React.FC = () => {
rightClickMoved.current = false;
};
if (!toggleView && activeModule === "builder") {
if (!toggleView && activeModule === "builder" && toolMode === 'cursor') {
helper.enabled = true;
canvasElement.addEventListener("pointermove", onPointerMove);
canvasElement.addEventListener("pointerup", onPointerUp);
@@ -194,7 +195,7 @@ const SelectionControls: React.FC = () => {
helper.enabled = false;
helper.dispose();
};
}, [camera, controls, scene, toggleView, selectedAssets, copiedObjects, pastedObjects, duplicatedObjects, movedObjects, socket, rotatedObjects, activeModule,]);
}, [camera, controls, scene, toggleView, selectedAssets, copiedObjects, pastedObjects, duplicatedObjects, movedObjects, socket, rotatedObjects, activeModule, toolMode]);
useEffect(() => {
if (activeModule !== "builder") {

2
app/src/modules/scene/controls/transformControls/transformControls.tsx
View File

@@ -124,7 +124,7 @@ export default function TransformControl() {
organization,
modelUuid: asset.modelUuid,
modelName: asset.modelName,
modelfileID: asset.assetId,
assetId: asset.assetId,
position: [selectedFloorItem.position.x, 0, selectedFloorItem.position.z] as [number, number, number],
rotation: { x: selectedFloorItem.rotation.x, y: selectedFloorItem.rotation.y, z: selectedFloorItem.rotation.z },
isLocked: false,