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

refactor: Remove unused imports and simplify JSX structure in AssetsGroup and Model components

This commit is contained in:
Jerald-Golden-B 2025-05-29 13:43:36 +05:30
parent 40d7cbbcc4
commit 95a98e131f
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/modules/builder/asset/assetsGroup.tsx
View File

@ -12,7 +12,6 @@ import useModuleStore from "../../../store/useModuleStore";
import { useThree } from "@react-three/fiber"; import { useThree } from "@react-three/fiber";
import { CameraControls } from "@react-three/drei"; import { CameraControls } from "@react-three/drei";
import addAssetModel from "./functions/addAssetModel"; import addAssetModel from "./functions/addAssetModel";
import { useSceneContext } from "../../scene/sceneContext";
const gltfLoaderWorker = new Worker( const gltfLoaderWorker = new Worker(
new URL( new URL(
@ -23,7 +22,6 @@ const gltfLoaderWorker = new Worker(
function AssetsGroup({ floorGroup, plane }: { readonly floorGroup: RefGroup, readonly plane: RefMesh }) { function AssetsGroup({ floorGroup, plane }: { readonly floorGroup: RefGroup, readonly plane: RefMesh }) {
const { activeModule } = useModuleStore(); const { activeModule } = useModuleStore();
const { layout } = useSceneContext();
const { socket } = useSocketStore(); const { socket } = useSocketStore();
const { controls, gl, pointer, camera, raycaster } = useThree(); const { controls, gl, pointer, camera, raycaster } = useThree();
const { setLoadingProgress } = useLoadingProgress(); const { setLoadingProgress } = useLoadingProgress();
@ -292,9 +290,7 @@ function AssetsGroup({ floorGroup, plane }: { readonly floorGroup: RefGroup, rea
}, [selectedItem, camera, pointer, activeModule, controls]); }, [selectedItem, camera, pointer, activeModule, controls]);
return ( return (
<>
<Models /> <Models />
</>
) )
} }

11
app/src/modules/builder/asset/models/model/model.tsx
View File

@ -4,7 +4,7 @@ import { retrieveGLTF, storeGLTF } from '../../../../../utils/indexDB/idbUtils';
import { GLTF, GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader'; import { GLTF, GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader';
import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader'; import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader';
import { ThreeEvent, useFrame, useThree } from '@react-three/fiber'; import { ThreeEvent, useFrame, useThree } from '@react-three/fiber';
import { useActiveTool, useDeletableFloorItem, useRenderDistance, useSelectedFloorItem, useSocketStore } from '../../../../../store/builder/store'; import { useActiveTool, useDeletableFloorItem, useRenderDistance, useSelectedFloorItem, useSocketStore, useToggleView } from '../../../../../store/builder/store';
import { AssetBoundingBox } from '../../functions/assetBoundingBox'; import { AssetBoundingBox } from '../../functions/assetBoundingBox';
import { CameraControls } from '@react-three/drei'; import { CameraControls } from '@react-three/drei';
import { useAssetsStore } from '../../../../../store/builder/useAssetStore'; import { useAssetsStore } from '../../../../../store/builder/useAssetStore';
@ -18,6 +18,7 @@ import { useProductContext } from '../../../../simulation/products/productContex
function Model({ asset }: { readonly asset: Asset }) { function Model({ asset }: { readonly asset: Asset }) {
const { camera, controls, gl } = useThree(); const { camera, controls, gl } = useThree();
const { activeTool } = useActiveTool(); const { activeTool } = useActiveTool();
const { toggleView } = useToggleView();
const { subModule } = useSubModuleStore(); const { subModule } = useSubModuleStore();
const { activeModule } = useModuleStore(); const { activeModule } = useModuleStore();
const { removeAsset } = useAssetsStore(); const { removeAsset } = useAssetsStore();
@ -249,20 +250,28 @@ function Model({ asset }: { readonly asset: Asset }) {
visible={asset.isVisible} visible={asset.isVisible}
userData={asset} userData={asset}
onDoubleClick={(e) => { onDoubleClick={(e) => {
if (!toggleView) {
e.stopPropagation(); e.stopPropagation();
handleDblClick(asset); handleDblClick(asset);
}
}} }}
onClick={(e) => { onClick={(e) => {
if (!toggleView) {
e.stopPropagation(); e.stopPropagation();
handleClick(asset); handleClick(asset);
}
}} }}
onPointerOver={(e) => { onPointerOver={(e) => {
if (!toggleView) {
e.stopPropagation(); e.stopPropagation();
handlePointerOver(asset); handlePointerOver(asset);
}
}} }}
onPointerOut={(e) => { onPointerOut={(e) => {
if (!toggleView) {
e.stopPropagation(); e.stopPropagation();
handlePointerOut(asset); handlePointerOut(asset);
}
}} }}
onContextMenu={(e) => { onContextMenu={(e) => {
e.stopPropagation(); e.stopPropagation();