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

removed group schema

Browse Source
This commit is contained in:
Jerald-Golden-B
2025-10-03 15:47:18 +05:30
parent 0d5dade3ad
commit bd67685181
15 changed files with 24 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/modules/builder/asset/hooks/useAddAssetModel.ts
View File

@@ -68,8 +68,6 @@ function useAddAssetModel({ plane, loader }: UseAddAssetModelProps) {
isVisible: true,
isCollidable: false,
opacity: 1,
isInGroup: false,
groupData: null,
};
const socketData: any = {
@@ -82,8 +80,6 @@ function useAddAssetModel({ plane, loader }: UseAddAssetModelProps) {
scale: newFloorItem.scale,
isLocked: newFloorItem.isLocked,
isVisible: newFloorItem.isVisible,
isInGroup: newFloorItem.isInGroup,
groupData: newFloorItem.groupData,
socketId: builderSocket?.id || "",
versionId: versionId,
projectId: projectId,
@@ -99,8 +95,6 @@ function useAddAssetModel({ plane, loader }: UseAddAssetModelProps) {
scale: newFloorItem.scale,
isLocked: newFloorItem.isLocked,
isVisible: newFloorItem.isVisible,
isInGroup: newFloorItem.isInGroup,
groupData: newFloorItem.groupData,
versionId: versionId,
projectId: projectId || "",
};
@@ -155,8 +149,6 @@ function useAddAssetModel({ plane, loader }: UseAddAssetModelProps) {
isCollidable: data.data.isCollidable,
isVisible: data.data.isVisible,
opacity: data.data.opacity,
isInGroup: data.data.isInGroup,
groupData: data.data.groupData,
...(data.data.eventData ? { eventData: data.data.eventData } : {}),
};

6
app/src/modules/builder/asset/models/models.tsx
View File

@@ -19,11 +19,13 @@ function Models({ loader }: { readonly loader: GLTFLoader }) {
const { selectedAsset, clearSelectedAsset } = useSelectedAsset();
const { limitDistance } = useLimitDistance();
const { renderDistance } = useRenderDistance();
const [renderMap, setRenderMap] = useState<Record<string, boolean>>({});
const cameraPos = useRef(new Vector3());
useEffect(() => {
// console.log(assets);
}, [assets]);
useEffect(() => {
distanceWorker.onmessage = (e) => {
const { shouldRender, modelUuid } = e.data;

8
app/src/modules/collaboration/socket/builderResponses.tsx
View File

@@ -53,8 +53,6 @@ function BuilderResponses() {
isCollidable: data.data.isCollidable,
isVisible: data.data.isVisible,
opacity: data.data.opacity,
isInGroup: data.data.isInGroup,
groupData: data.data.groupData,
...(data.data.eventData ? { eventData: data.data.eventData } : {}),
};
@@ -74,8 +72,6 @@ function BuilderResponses() {
isCollidable: data.data.isCollidable,
isVisible: data.data.isVisible,
opacity: data.data.opacity,
isInGroup: data.data.isInGroup,
groupData: data.data.groupData,
...(data.data.eventData ? { eventData: data.data.eventData } : {}),
};
@@ -118,8 +114,6 @@ function BuilderResponses() {
isCollidable: data.data.isCollidable,
isVisible: data.data.isVisible,
opacity: data.data.opacity,
isInGroup: data.data.isInGroup,
groupData: data.data.groupData,
...(data.data.eventData ? { eventData: data.data.eventData } : {}),
};
@@ -157,8 +151,6 @@ function BuilderResponses() {
isCollidable: data.data.isCollidable,
isVisible: data.data.isVisible,
opacity: data.data.opacity,
isInGroup: data.data.isInGroup,
groupData: data.data.groupData,
...(data.data.eventData ? { eventData: data.data.eventData } : {}),
};

18
app/src/modules/scene/controls/assetControls/cutCopyPasteControls3D.tsx
View File

@@ -334,8 +334,6 @@ const CutCopyPasteControls3D = () => {
isLocked: false,
isVisible: true,
isCollidable: false,
isInGroup: false,
groupData: null,
opacity: 0.5,
};
addAsset(asset);
@@ -367,8 +365,6 @@ const CutCopyPasteControls3D = () => {
scale: asset.scale,
isCollidable: asset.isCollidable,
opacity: asset.opacity,
isInGroup: asset.isInGroup,
groupData: asset.groupData,
isLocked: asset.isLocked,
isVisible: asset.isVisible,
};
@@ -421,8 +417,6 @@ const CutCopyPasteControls3D = () => {
isCollidable: newFloorItem.isCollidable,
opacity: newFloorItem.opacity,
isVisible: newFloorItem.isVisible,
isInGroup: newFloorItem.isInGroup,
groupData: newFloorItem.groupData,
socketId: builderSocket?.id,
eventData: eventData,
versionId: selectedVersion?.versionId || "",
@@ -445,8 +439,6 @@ const CutCopyPasteControls3D = () => {
opacity: newFloorItem.opacity,
isLocked: newFloorItem.isLocked,
isVisible: newFloorItem.isVisible,
isInGroup: newFloorItem.isInGroup,
groupData: newFloorItem.groupData,
eventData: eventData,
versionId: selectedVersion?.versionId || "",
projectId: projectId || "",
@@ -468,8 +460,6 @@ const CutCopyPasteControls3D = () => {
isCollidable: data.data.isCollidable,
isVisible: data.data.isVisible,
opacity: data.data.opacity,
isInGroup: data.data.isInGroup,
groupData: data.data.groupData,
...(data.data.eventData ? { eventData: data.data.eventData } : {}),
};
@@ -503,8 +493,6 @@ const CutCopyPasteControls3D = () => {
isCollidable: newFloorItem.isCollidable,
opacity: newFloorItem.opacity,
isVisible: newFloorItem.isVisible,
isInGroup: newFloorItem.isInGroup,
groupData: newFloorItem.groupData,
socketId: builderSocket?.id,
versionId: selectedVersion?.versionId || "",
projectId,
@@ -526,8 +514,6 @@ const CutCopyPasteControls3D = () => {
opacity: newFloorItem.opacity,
isLocked: newFloorItem.isLocked,
isVisible: newFloorItem.isVisible,
isInGroup: newFloorItem.isInGroup,
groupData: newFloorItem.groupData,
versionId: selectedVersion?.versionId || "",
projectId: projectId || "",
})
@@ -548,8 +534,6 @@ const CutCopyPasteControls3D = () => {
isCollidable: data.data.isCollidable,
isVisible: data.data.isVisible,
opacity: data.data.opacity,
isInGroup: data.data.isInGroup,
groupData: data.data.groupData,
...(data.data.eventData ? { eventData: data.data.eventData } : {}),
};
@@ -585,8 +569,6 @@ const CutCopyPasteControls3D = () => {
opacity: newFloorItem.opacity,
isLocked: newFloorItem.isLocked,
isVisible: newFloorItem.isVisible,
isInGroup: newFloorItem.isInGroup,
groupData: newFloorItem.groupData,
eventData: newFloorItem.eventData,
},
timeStap: new Date().toISOString(),

22
app/src/modules/scene/controls/assetControls/duplicationControls3D.tsx
View File

@@ -263,8 +263,6 @@ const DuplicationControls3D = () => {
isVisible: true,
isCollidable: false,
opacity: 0.5,
isInGroup: false,
groupData: null,
};
addAsset(asset);
});
@@ -294,8 +292,6 @@ const DuplicationControls3D = () => {
scale: asset.scale,
isCollidable: asset.isCollidable,
opacity: asset.opacity,
isInGroup: asset.isInGroup,
groupData: asset.groupData,
isLocked: asset.isLocked,
isVisible: asset.isVisible,
};
@@ -344,10 +340,8 @@ const DuplicationControls3D = () => {
position: newFloorItem.position,
rotation: newFloorItem.rotation,
scale: newFloorItem.scale,
isLocked: false,
isVisible: true,
isInGroup: false,
groupData: null,
isLocked: newFloorItem.isLocked,
isVisible: newFloorItem.isVisible,
socketId: builderSocket?.id,
eventData: eventData,
versionId: selectedVersion?.versionId || "",
@@ -370,8 +364,6 @@ const DuplicationControls3D = () => {
opacity: newFloorItem.opacity,
isLocked: newFloorItem.isLocked,
isVisible: newFloorItem.isVisible,
isInGroup: newFloorItem.isInGroup,
groupData: newFloorItem.groupData,
eventData: eventData,
versionId: selectedVersion?.versionId || "",
projectId: projectId || "",
@@ -393,8 +385,6 @@ const DuplicationControls3D = () => {
isCollidable: data.data.isCollidable,
isVisible: data.data.isVisible,
opacity: data.data.opacity,
isInGroup: data.data.isInGroup,
groupData: data.data.groupData,
...(data.data.eventData ? { eventData: data.data.eventData } : {}),
};
@@ -426,8 +416,6 @@ const DuplicationControls3D = () => {
scale: newFloorItem.scale,
isLocked: newFloorItem.isLocked,
isVisible: newFloorItem.isVisible,
isInGroup: newFloorItem.isInGroup,
groupData: newFloorItem.groupData,
socketId: builderSocket?.id,
versionId: selectedVersion?.versionId || "",
projectId,
@@ -449,8 +437,6 @@ const DuplicationControls3D = () => {
opacity: newFloorItem.opacity,
isLocked: newFloorItem.isLocked,
isVisible: newFloorItem.isVisible,
isInGroup: newFloorItem.isInGroup,
groupData: newFloorItem.groupData,
versionId: selectedVersion?.versionId || "",
projectId: projectId || "",
})
@@ -471,8 +457,6 @@ const DuplicationControls3D = () => {
isCollidable: data.data.isCollidable,
isVisible: data.data.isVisible,
opacity: data.data.opacity,
isInGroup: data.data.isInGroup,
groupData: data.data.groupData,
...(data.data.eventData ? { eventData: data.data.eventData } : {}),
};
@@ -508,8 +492,6 @@ const DuplicationControls3D = () => {
opacity: newFloorItem.opacity,
isLocked: newFloorItem.isLocked,
isVisible: newFloorItem.isVisible,
isInGroup: newFloorItem.isInGroup,
groupData: newFloorItem.groupData,
eventData: newFloorItem.eventData,
},
timeStap: new Date().toISOString(),

7
app/src/modules/scene/controls/assetControls/groupControls.tsx Normal file
View File

@@ -0,0 +1,7 @@
import React from "react";
function GroupControls() {
return <div>GroupControls</div>;
}
export default GroupControls;

8
app/src/modules/scene/controls/assetControls/moveControls3D.tsx
View File

@@ -386,8 +386,6 @@ function MoveControls3D() {
scale: asset.scale,
isCollidable: asset.isCollidable,
opacity: asset.opacity,
isInGroup: asset.isInGroup,
groupData: asset.groupData,
isLocked: asset.isLocked,
isVisible: asset.isVisible,
};
@@ -421,8 +419,6 @@ function MoveControls3D() {
opacity: newFloorItem.opacity,
isLocked: newFloorItem.isLocked,
isVisible: newFloorItem.isVisible,
isInGroup: newFloorItem.isInGroup,
groupData: newFloorItem.groupData,
socketId: builderSocket?.id,
versionId: selectedVersion?.versionId || "",
projectId,
@@ -443,8 +439,6 @@ function MoveControls3D() {
opacity: newFloorItem.opacity,
isLocked: newFloorItem.isLocked,
isVisible: newFloorItem.isVisible,
isInGroup: newFloorItem.isInGroup,
groupData: newFloorItem.groupData,
versionId: selectedVersion?.versionId || "",
projectId: projectId || "",
})
@@ -467,8 +461,6 @@ function MoveControls3D() {
isVisible: data.data.isVisible,
isCollidable: data.data.isCollidable,
opacity: data.data.opacity,
isInGroup: data.data.isInGroup,
groupData: data.data.groupData,
...(data.data.eventData ? { eventData: data.data.eventData } : {}),
};

8
app/src/modules/scene/controls/assetControls/rotateControls3D.tsx
View File

@@ -335,8 +335,6 @@ function RotateControls3D() {
opacity: asset.opacity,
isLocked: asset.isLocked,
isVisible: asset.isVisible,
isInGroup: asset.isInGroup,
groupData: asset.groupData,
};
if (asset.eventData) {
@@ -368,8 +366,6 @@ function RotateControls3D() {
opacity: newFloorItem.opacity,
isLocked: newFloorItem.isLocked,
isVisible: newFloorItem.isVisible,
isInGroup: newFloorItem.isInGroup,
groupData: newFloorItem.groupData,
socketId: builderSocket?.id,
versionId: selectedVersion?.versionId || "",
projectId,
@@ -390,8 +386,6 @@ function RotateControls3D() {
opacity: newFloorItem.opacity,
isLocked: newFloorItem.isLocked,
isVisible: newFloorItem.isVisible,
isInGroup: newFloorItem.isInGroup,
groupData: newFloorItem.groupData,
versionId: selectedVersion?.versionId || "",
projectId: projectId || "",
})
@@ -414,8 +408,6 @@ function RotateControls3D() {
isVisible: data.data.isVisible,
isCollidable: data.data.isCollidable,
opacity: data.data.opacity,
isInGroup: data.data.isInGroup,
groupData: data.data.groupData,
...(data.data.eventData ? { eventData: data.data.eventData } : {}),
};

8
app/src/modules/scene/controls/assetControls/scaleControls3D.tsx
View File

@@ -64,8 +64,6 @@ function ScaleControls3D() {
opacity: asset.opacity,
isLocked: asset.isLocked,
isVisible: asset.isVisible,
isInGroup: asset.isInGroup,
groupData: asset.groupData,
};
if (asset.eventData) {
@@ -95,8 +93,6 @@ function ScaleControls3D() {
opacity: updatedAsset.opacity,
isLocked: updatedAsset.isLocked,
isVisible: updatedAsset.isVisible,
isInGroup: updatedAsset.isInGroup,
groupData: updatedAsset.groupData,
versionId: selectedVersion?.versionId || "",
projectId: projectId || "",
})
@@ -117,8 +113,6 @@ function ScaleControls3D() {
isVisible: data.data.isVisible,
isCollidable: data.data.isCollidable,
opacity: data.data.opacity,
isInGroup: data.data.isInGroup,
groupData: data.data.groupData,
...(data.data.eventData ? { eventData: data.data.eventData } : {}),
};
@@ -145,8 +139,6 @@ function ScaleControls3D() {
opacity: updatedAsset.opacity,
isLocked: updatedAsset.isLocked,
isVisible: updatedAsset.isVisible,
isInGroup: updatedAsset.isInGroup,
groupData: updatedAsset.groupData,
socketId: builderSocket?.id,
versionId: selectedVersion?.versionId || "",
projectId,

6
app/src/modules/scene/controls/assetControls/transformControls3D.tsx
View File

@@ -113,8 +113,6 @@ function TransformControls3D() {
opacity: asset.opacity,
isLocked: asset.isLocked,
isVisible: asset.isVisible,
isInGroup: asset.isInGroup,
groupData: asset.groupData,
versionId: selectedVersion?.versionId || "",
projectId: projectId || "",
})
@@ -136,8 +134,6 @@ function TransformControls3D() {
isVisible: data.data.isVisible,
isCollidable: data.data.isCollidable,
opacity: data.data.opacity,
isInGroup: data.data.isInGroup,
groupData: data.data.groupData,
...(data.data.eventData ? { eventData: data.data.eventData } : {}),
};
@@ -165,8 +161,6 @@ function TransformControls3D() {
opacity: asset.opacity,
isLocked: asset.isLocked,
isVisible: asset.isVisible,
isInGroup: asset.isInGroup,
groupData: asset.groupData,
socketId: builderSocket.id,
versionId: selectedVersion?.versionId || "",
userId,

6
app/src/modules/scene/controls/assetControls/visibilityControls.tsx
View File

@@ -32,8 +32,6 @@ function VisibilityControls3D() {
opacity: asset.opacity,
isLocked: asset.isLocked,
isVisible: asset.isVisible,
isInGroup: asset.isInGroup,
groupData: asset.groupData,
versionId: selectedVersion?.versionId || "",
projectId: projectId || "",
})
@@ -54,8 +52,6 @@ function VisibilityControls3D() {
isVisible: data.data.isVisible,
isCollidable: data.data.isCollidable,
opacity: data.data.opacity,
isInGroup: data.data.isInGroup,
groupData: data.data.groupData,
...(data.data.eventData ? { eventData: data.data.eventData } : {}),
};
@@ -82,8 +78,6 @@ function VisibilityControls3D() {
opacity: asset.opacity,
isLocked: asset.isLocked,
isVisible: asset.isVisible,
isInGroup: asset.isInGroup,
groupData: asset.groupData,
socketId: builderSocket?.id,
versionId: selectedVersion?.versionId || "",
projectId,

24
app/src/modules/scene/controls/undoRedoControls/handlers/use3DRedoHandler.ts
View File

@@ -158,8 +158,6 @@ function use3DRedoHandler() {
opacity: assetData.opacity,
isLocked: assetData.isLocked,
isVisible: assetData.isVisible,
isInGroup: assetData.isInGroup,
groupData: assetData.groupData,
eventData: {},
socketId: builderSocket?.id,
versionId: selectedVersion?.versionId || "",
@@ -185,8 +183,6 @@ function use3DRedoHandler() {
opacity: assetData.opacity,
isLocked: assetData.isLocked,
isVisible: assetData.isVisible,
isInGroup: assetData.isInGroup,
groupData: assetData.groupData,
eventData: data.eventData,
versionId: selectedVersion?.versionId || "",
projectId: projectId,
@@ -207,8 +203,6 @@ function use3DRedoHandler() {
isVisible: data.data.isVisible,
isCollidable: data.data.isCollidable,
opacity: data.data.opacity,
isInGroup: data.data.isInGroup,
groupData: data.data.groupData,
...(data.data.eventData ? { eventData: data.data.eventData } : {}),
};
@@ -288,8 +282,6 @@ function use3DRedoHandler() {
opacity: updatedData.opacity,
isLocked: updatedData.isLocked,
isVisible: updatedData.isVisible,
isInGroup: updatedData.isInGroup,
groupData: updatedData.groupData,
socketId: builderSocket?.id,
versionId: selectedVersion?.versionId || "",
projectId,
@@ -310,8 +302,6 @@ function use3DRedoHandler() {
opacity: updatedData.opacity,
isLocked: updatedData.isLocked,
isVisible: updatedData.isVisible,
isInGroup: updatedData.isInGroup,
groupData: updatedData.groupData,
versionId: selectedVersion?.versionId || "",
projectId: projectId,
}).then((data) => {
@@ -331,8 +321,6 @@ function use3DRedoHandler() {
isVisible: data.data.isVisible,
isCollidable: data.data.isCollidable,
opacity: data.data.opacity,
isInGroup: data.data.isInGroup,
groupData: data.data.groupData,
...(data.data.eventData ? { eventData: data.data.eventData } : {}),
};
@@ -382,8 +370,6 @@ function use3DRedoHandler() {
opacity: assetData.opacity,
isLocked: assetData.isLocked,
isVisible: assetData.isVisible,
isInGroup: assetData.isInGroup,
groupData: assetData.groupData,
eventData: {},
socketId: builderSocket?.id,
versionId: selectedVersion?.versionId || "",
@@ -409,8 +395,6 @@ function use3DRedoHandler() {
opacity: assetData.opacity,
isLocked: assetData.isLocked,
isVisible: assetData.isVisible,
isInGroup: assetData.isInGroup,
groupData: assetData.groupData,
eventData: data.eventData,
versionId: selectedVersion?.versionId || "",
projectId: projectId,
@@ -431,8 +415,6 @@ function use3DRedoHandler() {
isVisible: data.data.isVisible,
isCollidable: data.data.isCollidable,
opacity: data.data.opacity,
isInGroup: data.data.isInGroup,
groupData: data.data.groupData,
...(data.data.eventData ? { eventData: data.data.eventData } : {}),
};
@@ -467,8 +449,6 @@ function use3DRedoHandler() {
opacity: assetData.opacity,
isLocked: assetData.isLocked,
isVisible: assetData.isVisible,
isInGroup: assetData.isInGroup,
groupData: assetData.groupData,
eventData: {},
socketId: builderSocket?.id,
versionId: selectedVersion?.versionId || "",
@@ -494,8 +474,6 @@ function use3DRedoHandler() {
opacity: assetData.opacity,
isLocked: assetData.isLocked,
isVisible: assetData.isVisible,
isInGroup: assetData.isInGroup,
groupData: assetData.groupData,
eventData: data.eventData,
versionId: selectedVersion?.versionId || "",
projectId: projectId,
@@ -516,8 +494,6 @@ function use3DRedoHandler() {
isVisible: data.data.isVisible,
isCollidable: data.data.isCollidable,
opacity: data.data.opacity,
isInGroup: data.data.isInGroup,
groupData: data.data.groupData,
...(data.data.eventData ? { eventData: data.data.eventData } : {}),
};

12
app/src/modules/scene/controls/undoRedoControls/handlers/use3DUndoHandler.ts
View File

@@ -157,8 +157,6 @@ function use3DUndoHandler() {
opacity: assetData.opacity,
isLocked: assetData.isLocked,
isVisible: assetData.isVisible,
isInGroup: assetData.isInGroup,
groupData: assetData.groupData,
eventData: {},
socketId: builderSocket?.id,
versionId: selectedVersion?.versionId || "",
@@ -184,8 +182,6 @@ function use3DUndoHandler() {
opacity: assetData.opacity,
isLocked: assetData.isLocked,
isVisible: assetData.isVisible,
isInGroup: assetData.isInGroup,
groupData: assetData.groupData,
eventData: data.eventData,
versionId: selectedVersion?.versionId || "",
projectId: projectId,
@@ -206,8 +202,6 @@ function use3DUndoHandler() {
isVisible: data.data.isVisible,
isCollidable: data.data.isCollidable,
opacity: data.data.opacity,
isInGroup: data.data.isInGroup,
groupData: data.data.groupData,
...(data.data.eventData ? { eventData: data.data.eventData } : {}),
};
@@ -287,8 +281,6 @@ function use3DUndoHandler() {
opacity: updatedData.opacity,
isLocked: updatedData.isLocked,
isVisible: updatedData.isVisible,
isInGroup: updatedData.isInGroup,
groupData: updatedData.groupData,
socketId: builderSocket?.id,
versionId: selectedVersion?.versionId || "",
projectId,
@@ -309,8 +301,6 @@ function use3DUndoHandler() {
opacity: updatedData.opacity,
isLocked: updatedData.isLocked,
isVisible: updatedData.isVisible,
isInGroup: updatedData.isInGroup,
groupData: updatedData.groupData,
versionId: selectedVersion?.versionId || "",
projectId: projectId,
}).then((data) => {
@@ -330,8 +320,6 @@ function use3DUndoHandler() {
isVisible: data.data.isVisible,
isCollidable: data.data.isCollidable,
opacity: data.data.opacity,
isInGroup: data.data.isInGroup,
groupData: data.data.groupData,
...(data.data.eventData ? { eventData: data.data.eventData } : {}),
};

2
app/src/services/factoryBuilder/asset/floorAsset/setAssetsApi.ts
View File

@@ -11,8 +11,6 @@ type assetType = {
opacity?: number;
isLocked?: boolean;
isVisible?: boolean;
isInGroup?: boolean;
groupData?: any;
eventData?: any;
projectId: string;
versionId: string;

25
app/src/types/builderTypes.d.ts vendored
View File

@@ -23,20 +23,6 @@ interface Asset {
isCollidable: boolean;
isVisible: boolean;
opacity: number;
isInGroup: boolean;
groupData: {
groupUuid: string;
groupName: string;
groupType: string;
isGroupVisible: boolean;
isInParent: boolean;
parentData: {
parentUuid: string;
parentName: string;
parentType: string;
isParentVisible: boolean;
} | null;
} | null;
animations?: string[];
animationState?: {
current: string;
@@ -62,6 +48,17 @@ interface Asset {
type Assets = Asset[];
interface AssetHierarchyNode {
modelUuid: string;
assetId: string;
assetName: string;
isVisible: boolean;
isLocked: boolean;
isCollidable: boolean;
opacity: number;
children: AssetHierarchyNode[];
}
// Wall-Asset
interface WallAsset {