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

Merge remote-tracking branch 'origin/simulation' into simulation-animation

Browse Source
This commit is contained in:
SreeNath14
2025-04-01 15:13:36 +05:30
parent e95abfb4dd 526befad20
commit fa05e0c9c6
20 changed files with 173 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
app/src/modules/scene/IntialLoad/loadInitialFloorItems.ts
View File

@@ -5,9 +5,9 @@ import * as THREE from 'three';
import * as CONSTANTS from '../../../types/world/worldConstants';
import { toast } from 'react-toastify';
import * as Types from "../../../types/world/worldTypes";
import { getFloorItems } from '../../../services/factoryBuilder/assest/floorAsset/getFloorItemsApi';
import { initializeDB, retrieveGLTF, storeGLTF } from '../../../utils/indexDB/idbUtils';
import { getCamera } from '../../../services/factoryBuilder/camera/getCameraApi';
import { getFloorAssets } from '../../../services/factoryBuilder/assest/floorAsset/getFloorItemsApi';
async function loadInitialFloorItems(
itemsGroup: Types.RefGroup,
@@ -18,7 +18,8 @@ async function loadInitialFloorItems(
const email = localStorage.getItem('email');
const organization = (email!.split("@")[1]).split(".")[0];
const items = await getFloorItems(organization);
const items = await getFloorAssets(organization);
console.log('items: ', items);
localStorage.setItem("FloorItems", JSON.stringify(items));
await initializeDB();
@@ -121,18 +122,34 @@ async function loadInitialFloorItems(
});
} else {
// console.log(`Item ${item.modelname} is not near`);
setFloorItems((prevItems) => [
...(prevItems || []),
{
modeluuid: item.modeluuid,
modelname: item.modelname,
position: item.position,
rotation: item.rotation,
modelfileID: item.modelfileID,
isLocked: item.isLocked,
isVisible: item.isVisible,
},
]);
if (item.eventData) {
setFloorItems((prevItems) => [
...(prevItems || []),
{
modeluuid: item.modeluuid,
modelname: item.modelname,
position: item.position,
rotation: item.rotation,
modelfileID: item.modelfileID,
isLocked: item.isLocked,
isVisible: item.isVisible,
eventData: item.eventData,
},
]);
} else {
setFloorItems((prevItems) => [
...(prevItems || []),
{
modeluuid: item.modeluuid,
modelname: item.modelname,
position: item.position,
rotation: item.rotation,
modelfileID: item.modelfileID,
isLocked: item.isLocked,
isVisible: item.isVisible,
},
]);
}
modelsLoaded++;
checkLoadingCompletion(modelsLoaded, modelsToLoad, dracoLoader, () => { });
}
@@ -169,18 +186,35 @@ function processLoadedModel(
itemsGroup?.current?.add(model);
setFloorItems((prevItems) => [
...(prevItems || []),
{
modeluuid: item.modeluuid,
modelname: item.modelname,
position: item.position,
rotation: item.rotation,
modelfileID: item.modelfileID,
isLocked: item.isLocked,
isVisible: item.isVisible,
},
]);
if (item.eventData) {
setFloorItems((prevItems) => [
...(prevItems || []),
{
modeluuid: item.modeluuid,
modelname: item.modelname,
position: item.position,
rotation: item.rotation,
modelfileID: item.modelfileID,
isLocked: item.isLocked,
isVisible: item.isVisible,
eventData: item.eventData,
},
]);
} else {
setFloorItems((prevItems) => [
...(prevItems || []),
{
modeluuid: item.modeluuid,
modelname: item.modelname,
position: item.position,
rotation: item.rotation,
modelfileID: item.modelfileID,
isLocked: item.isLocked,
isVisible: item.isVisible,
},
]);
}
gsap.to(model.position, { y: item.position[1], duration: 1.5, ease: 'power2.out' });
gsap.to(model.scale, { x: 1, y: 1, z: 1, duration: 1.5, ease: 'power2.out' });

2
app/src/modules/scene/controls/selection/copyPasteControls.tsx
View File

@@ -180,7 +180,7 @@ const CopyPasteControls = ({ itemsGroupRef, copiedObjects, setCopiedObjects, pas
socketId: socket.id,
};
socket.emit("v1:FloorItems:set", data);
socket.emit("v2:model-asset:add", data);
itemsGroupRef.current.add(obj);
}

2
app/src/modules/scene/controls/selection/duplicationControls.tsx
View File

@@ -161,7 +161,7 @@ const DuplicationControls = ({ itemsGroupRef, duplicatedObjects, setDuplicatedOb
socketId: socket.id,
};
socket.emit("v1:FloorItems:set", data);
socket.emit("v2:model-asset:add", data);
itemsGroupRef.current.add(obj);
}

2
app/src/modules/scene/controls/selection/moveControls.tsx
View File

@@ -209,7 +209,7 @@ function MoveControls({ movedObjects, setMovedObjects, itemsGroupRef, copiedObje
socketId: socket.id,
};
socket.emit("v1:FloorItems:set", data);
socket.emit("v2:model-asset:add", data);
itemsGroupRef.current.add(obj);
}

2
app/src/modules/scene/controls/selection/rotateControls.tsx
View File

@@ -212,7 +212,7 @@ function RotateControls({ rotatedObjects, setRotatedObjects, movedObjects, setMo
socketId: socket.id,
};
socket.emit("v1:FloorItems:set", data);
socket.emit("v2:model-asset:add", data);
itemsGroupRef.current.add(obj);
}

2
app/src/modules/scene/controls/selection/selectionControls.tsx
View File

@@ -222,7 +222,7 @@ const SelectionControls: React.FC = () => {
socketId: socket.id
};
socket.emit('v1:FloorItems:delete', data);
socket.emit('v2:model-asset:delete', data);
selectedMesh.traverse((child: THREE.Object3D) => {
if (child instanceof THREE.Mesh) {

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

@@ -83,7 +83,7 @@ export default function TransformControl() {
socketId: socket.id
}
socket.emit('v1:FloorItems:set', data);
socket.emit('v2:model-asset:add', data);
}
localStorage.setItem("FloorItems", JSON.stringify(updatedItems));
return updatedItems;