From 98eb403b4acdd813e414bb4a1c078a6a6007e046 Mon Sep 17 00:00:00 2001 From: Jerald-Golden-B Date: Sat, 29 Mar 2025 18:35:34 +0530 Subject: [PATCH] refactor: clean up code in various components; streamline material properties and improve state management --- .../components/layout/sidebarRight/Header.tsx | 16 +++++++--------- .../builder/geomentries/roofs/addRoofToScene.ts | 2 +- .../builder/geomentries/roofs/hideRoof.ts | 3 +-- app/src/modules/collaboration/collabCams.tsx | 8 +------- .../factoryBuilder/zones/deleteZoneApi.ts | 1 + 5 files changed, 11 insertions(+), 19 deletions(-) diff --git a/app/src/components/layout/sidebarRight/Header.tsx b/app/src/components/layout/sidebarRight/Header.tsx index b4983c6..46bfdaf 100644 --- a/app/src/components/layout/sidebarRight/Header.tsx +++ b/app/src/components/layout/sidebarRight/Header.tsx @@ -28,15 +28,13 @@ const Header: React.FC = () => {
+{guestUsers.length - 3}
)} {guestUsers.slice(0, 3).map((user, index) => ( - <> -
- {user.userName[0]} -
- +
+ {user.userName[0]} +
))}
diff --git a/app/src/modules/builder/geomentries/roofs/addRoofToScene.ts b/app/src/modules/builder/geomentries/roofs/addRoofToScene.ts index 090dc06..4630efc 100644 --- a/app/src/modules/builder/geomentries/roofs/addRoofToScene.ts +++ b/app/src/modules/builder/geomentries/roofs/addRoofToScene.ts @@ -17,7 +17,7 @@ function addRoofToScene( }; const geometry = new THREE.ExtrudeGeometry(shape, extrudeSettings); - const material = new THREE.MeshStandardMaterial({ color: CONSTANTS.roofConfig.defaultColor, side: THREE.DoubleSide, transparent: true, depthWrite: false }); + const material = new THREE.MeshStandardMaterial({ color: CONSTANTS.roofConfig.defaultColor, side: THREE.DoubleSide }); const mesh = new THREE.Mesh(geometry, material); mesh.position.y = CONSTANTS.wallConfig.height + floor; mesh.castShadow = true; diff --git a/app/src/modules/builder/geomentries/roofs/hideRoof.ts b/app/src/modules/builder/geomentries/roofs/hideRoof.ts index 3dc48fe..8eb80f8 100644 --- a/app/src/modules/builder/geomentries/roofs/hideRoof.ts +++ b/app/src/modules/builder/geomentries/roofs/hideRoof.ts @@ -22,8 +22,7 @@ function hideRoof( if (roofChild.material) { const materials = Array.isArray(roofChild.material) ? roofChild.material : [roofChild.material]; materials.forEach(material => { - // material.visible = v.dot(u) < 0.25; - material.visible = true; + material.visible = v.dot(u) < 0.25; }); } } diff --git a/app/src/modules/collaboration/collabCams.tsx b/app/src/modules/collaboration/collabCams.tsx index af135a7..a699bf3 100644 --- a/app/src/modules/collaboration/collabCams.tsx +++ b/app/src/modules/collaboration/collabCams.tsx @@ -20,12 +20,7 @@ const CamModelsGroup = () => { const loader = new GLTFLoader(); const dracoLoader = new DRACOLoader(); const [cams, setCams] = useState([]); - const [models, setModels] = useState< - Record< - string, - { targetPosition: THREE.Vector3; targetRotation: THREE.Euler } - > - >({}); + const [models, setModels] = useState>({}); dracoLoader.setDecoderPath("three/examples/jsm/libs/draco/gltf/"); loader.setDRACOLoader(dracoLoader); @@ -163,7 +158,6 @@ const CamModelsGroup = () => { cam.rotation.z ); newModel.userData = cam.userData; - console.log('cam.userData: ', cam.userData); setActiveUsers([...activeUsers, cam.userData]); return newModel; }); diff --git a/app/src/services/factoryBuilder/zones/deleteZoneApi.ts b/app/src/services/factoryBuilder/zones/deleteZoneApi.ts index 2ba5156..fbe4a83 100644 --- a/app/src/services/factoryBuilder/zones/deleteZoneApi.ts +++ b/app/src/services/factoryBuilder/zones/deleteZoneApi.ts @@ -15,6 +15,7 @@ export const deleteZonesApi = async (userId: string, organization: string, zoneI } const result = await response.json(); + console.log('result: ', result); return result; } catch (error) { if (error instanceof Error) {