architwin 1.14.8 → 1.14.9

package/lib/atwinui/components/toolbar/spacePartition/roomTreePane.d.ts

@@ -27,7 +27,7 @@ export declare function displayChildPartitions(partitions: PartitionNode[], pare
  * @param partitionItems - The details of the partition items to be rendered.
  * @returns {HTMLElement}
  */
-export declare function displayPartitionItems(partitionItems: any, partitionId?: string, object?: any): string;
+export declare function displayPartitionItems(partitionItems: any, partitionId?: string, object?: any, parentUuid?: string): string;
 export declare function updateParentVisibility(isPartition: boolean, currentBtn: HTMLElement): void;
 /**
  * Retrieves the stored room data.
@@ -68,3 +68,9 @@ export declare function setFilteredDisplay(type: String): void;
  * @param isVisible - Visibility value
  */
 export declare function updateRoomVisibilityUI(parentId: string, isVisible: boolean): void;
+/**
+ * Highlights the selected child element within a partition by toggling CSS classes.
+ * @param partitionId - The unique identifier of the partition containing the child elements
+ * @param name - The specific name/identifier of the child element to highlight
+ */
+export declare function highlightSelectedPartitionChild(partitionId: string, name: string): void;

package/lib/atwinui/components/toolbar/spacePartition/roomTreePane.js

@@ -10,9 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { getBundleVersion, extractUUID } from "../../../../utils";
 import { batchAddEventListenerByClassName, handleDeletePartition, handlePartitionVisibility, handlePolygonVisibility, toggleDisplayPane } from "../../../events";
 import i18n from "../i18n";
-import { getCurrentPolygonData, setPartitionFormMode } from "./roomFormPane";
+import { getCurrentPolygonData, handlePartitionRowEditBtnClickEvent, handlePartitionWallEditBtn, setPartitionFormMode } from "./roomFormPane";
 import { SPACE_EVENTS } from "../../../../types";
-import { _3DXObjects, dispatchSpaceEvent, getChildrenOfModel, goToModel, renderPolygon, setSelectedObject } from "../../../../architwin";
+import { _3DXObjects, dispatchSpaceEvent, getChildrenOfModel, goToModel, goToPosition, renderPolygon, setSelectedObject } from "../../../../architwin";
 import log from 'loglevel';
 import { getShortcutTooltipHTML } from "../static/common";
 let roomDataArray = [];
@@ -167,13 +167,13 @@ export function displayChildPartitions(partitions, parentPartitionId, objectData
             // Render floor
             const floorObj = modelChildren.find(item => item.name.includes('floor'));
             log.info("modelChildren floorObj: ", floorObj);
-            childHTML += displayPartitionItems(polygonJson.floor, partition.uuid, floorObj);
+            childHTML += displayPartitionItems(polygonJson.floor, partition.uuid, floorObj, partition.parent_uuid);
             // Render walls
             if (polygonJson.walls.length > 0) {
                 // modelChildren.splice(index, 1); // Remove processed child
                 const wallObjs = modelChildren.filter(item => !item.name.includes("floor"));
                 log.info("modelChildren wallObjs: ", wallObjs);
-                childHTML += displayPartitionItems(polygonJson.walls, partition.uuid, wallObjs);
+                childHTML += displayPartitionItems(polygonJson.walls, partition.uuid, wallObjs, partition.parent_uuid);
             }
         }
         // @ts-ignore
@@ -203,7 +203,7 @@ export function displayChildPartitions(partitions, parentPartitionId, objectData
  * @param partitionItems - The details of the partition items to be rendered.
  * @returns {HTMLElement}
  */
-export function displayPartitionItems(partitionItems, partitionId, object) {
+export function displayPartitionItems(partitionItems, partitionId, object, parentUuid) {
     log.info("__@ displayPartitionItems: ", object === null || object === void 0 ? void 0 : object.name);
     let itemsHTML = '';
     // Check if item is an array, e.g.: walls
@@ -219,9 +219,14 @@ export function displayPartitionItems(partitionItems, partitionId, object) {
                     const isVisible = item.options.is_visible;
                     const objName = object[index].name.includes('_') ? object[index].name : `${partitionId}_${object[index].name}`;
                     log.info("__@ objName: ", objName);
+                    const wallCoords = JSON.stringify(item.edges);
+                    const wallCoordsEncoded = btoa(wallCoords);
                     itemsHTML += `
-                        <li class="at_toggle">${i18n.t(`Wall`)} ${wallNumber}
-                            <span id="${objName}" partition-id="${partitionId}"  polygon-item-id="${item.uuid}" class="mdi ${isVisible ? 'mdi-eye ' : 'mdi-eye-off'} at_child_visible_btn at_pull_right"></span>
+                        <li wall-coords="${wallCoordsEncoded}" object-name="${objName}" partition-li-id="${partitionId}" id="partition-child-${objName}" class="at_toggle at_partition_wall_row_item">${i18n.t(`Wall`)} ${wallNumber}
+                            <div>
+                                <span id="${objName}" partition-id="${partitionId}" partition-parent-uuid="${parentUuid}" polygon-item-id="${item.uuid}" is-wall="true" class="mdi mdi-pencil at_child_edit_btn"></span>
+                                <span id="${objName}" partition-id="${partitionId}" polygon-item-id="${item.uuid}" class="mdi ${isVisible ? 'mdi-eye ' : 'mdi-eye-off'} at_child_visible_btn"></span>
+                            </div>
                         </li>
                     `;
                 }
@@ -231,10 +236,15 @@ export function displayPartitionItems(partitionItems, partitionId, object) {
     else {
         // This is for the floor
         const isVisible = partitionItems.options.is_visible;
+        const floorCoords = JSON.stringify(partitionItems.edges);
+        const floorCoordsEncoded = btoa(floorCoords);
         if (!partitionItems.hide) {
             itemsHTML += `
-            <li class="at_toggle"> ${i18n.t(`Floor`)}
-                <span id="${object.name}" partition-id="${partitionId}"  polygon-item-id="${partitionItems.uuid}" class="mdi ${isVisible ? 'mdi-eye ' : 'mdi-eye-off'} at_child_visible_btn at_pull_right"></span>
+            <li floor-coords="${floorCoordsEncoded}" id="partition-child-${object.name}" object-name="${object.name}" partition-li-id="${partitionId}" class="at_toggle at_partition_floor_row_item"> ${i18n.t(`Floor`)}
+                <div>
+                    <span id="${object}" partition-id="${partitionId}" partition-parent-uuid="${parentUuid}" polygon-item-id="${partitionItems.uuid}" class="mdi mdi-pencil at_child_edit_btn"></span>
+                    <span id="${object.name}" partition-id="${partitionId}"  polygon-item-id="${partitionItems.uuid}" class="mdi ${isVisible ? 'mdi-eye ' : 'mdi-eye-off'} at_child_visible_btn"></span>
+                </div>
             </li>
         `;
         }
@@ -331,6 +341,80 @@ function toggleSelectedPartition() {
         const target = event.target;
         handlePolygonVisibility(target.id);
     }));
+    batchAddEventListenerByClassName('at_partition_wall_row_item', (event) => __awaiter(this, void 0, void 0, function* () {
+        event.stopPropagation();
+        const target = event.target;
+        const partitionId = target.getAttribute('partition-li-id');
+        const objectName = target.getAttribute('object-name');
+        const wallCoordsEncoded = target.getAttribute('wall-coords');
+        const wallCoordsJSON = atob(wallCoordsEncoded);
+        const wallCoords = JSON.parse(wallCoordsJSON);
+        const wallBottomMidPoint = {
+            x: ((wallCoords[0].start.x + wallCoords[1].start.x + wallCoords[2].start.x + wallCoords[3].start.x) / 4),
+            y: ((wallCoords[0].start.y + wallCoords[1].start.y + wallCoords[2].start.y + wallCoords[3].start.y) / 4),
+            z: ((wallCoords[0].start.z + wallCoords[1].start.z + wallCoords[2].start.z + wallCoords[3].start.z) / 4),
+        };
+        try {
+            yield goToPosition(wallBottomMidPoint);
+            highlightSelectedPartitionChild(partitionId, objectName);
+        }
+        catch (e) {
+            log.info('goToPosition failed: ', e);
+        }
+    }));
+    batchAddEventListenerByClassName('at_partition_floor_row_item', (event) => __awaiter(this, void 0, void 0, function* () {
+        event.stopPropagation();
+        const target = event.target;
+        const partitionId = target.getAttribute('partition-li-id');
+        const objectName = target.getAttribute('object-name');
+        const floorCoordsEncoded = target.getAttribute('floor-coords');
+        const floorCoordsJSON = atob(floorCoordsEncoded);
+        const floorCoords = JSON.parse(floorCoordsJSON);
+        const wallBottomMidPoint = {
+            x: ((floorCoords[0].start.x + floorCoords[1].start.x + floorCoords[2].start.x) / 3),
+            y: ((floorCoords[0].start.y + floorCoords[1].start.y + floorCoords[2].start.y) / 3),
+            z: ((floorCoords[0].start.z + floorCoords[1].start.z + floorCoords[2].start.z) / 3),
+        };
+        try {
+            yield goToPosition(wallBottomMidPoint);
+            highlightSelectedPartitionChild(partitionId, objectName);
+        }
+        catch (e) {
+            log.info('goToPosition failed: ', e);
+        }
+    }));
+    batchAddEventListenerByClassName('at_child_edit_btn', (event) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const target = event.target;
+        const isWall = ((_a = target.getAttribute('is-wall')) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'true';
+        const partitionId = target.getAttribute('partition-id');
+        const parentRoomUuid = target.getAttribute('partition-parent-uuid');
+        const parentRoom = document.getElementById(`at-room-edit-${parentRoomUuid}-btn`);
+        function openRoomEdit() {
+            highlightSelectedItem({ target: parentRoom });
+            setPartitionFormMode("EDIT" /* FORM_MODE.EDIT */);
+            setCurrentEditRoomData(`at-room-edit-${parentRoomUuid}-btn`);
+            toggleDisplayPane(`at-room-edit-${parentRoomUuid}-btn`);
+        }
+        if (parentRoom) {
+            openRoomEdit();
+            const partitionRowEdit = document.getElementById(`at-edit-partition-${partitionId}`);
+            if (partitionRowEdit) {
+                const currentEditRoomData = getCurrentEditRoomData();
+                handlePartitionRowEditBtnClickEvent(currentEditRoomData.children, partitionRowEdit);
+                if (isWall) {
+                    const polygonId = target.getAttribute('polygon-item-id');
+                    handlePartitionWallEditBtn(polygonId);
+                }
+            }
+            else {
+                log.warn('Partition row edit element not found');
+            }
+        }
+        else {
+            log.warn('Partition room element not found');
+        }
+    }));
     batchAddEventListenerByClassName('at_room_delete_btn', (event) => __awaiter(this, void 0, void 0, function* () {
         const target = event.target;
         handleDeletePartition(target.id);
@@ -581,3 +665,14 @@ export function updateRoomVisibilityUI(parentId, isVisible) {
         toggleVisibilityState(roomElement, true);
     }
 }
+/**
+ * Highlights the selected child element within a partition by toggling CSS classes.
+ * @param partitionId - The unique identifier of the partition containing the child elements
+ * @param name - The specific name/identifier of the child element to highlight
+ */
+export function highlightSelectedPartitionChild(partitionId, name) {
+    const partitionChildren = document.querySelectorAll(`li[partition-li-id="${partitionId}"]`);
+    partitionChildren.forEach(el => {
+        el.classList.toggle('selected', el.id === `partition-child-${name}`);
+    });
+}

package/lib/atwinui/events.js

@@ -23,8 +23,8 @@ import { isValidUrl, debounce, isElementVisible, extractUUID, showLoader, isVec3
 import log from 'loglevel';
 import * as minimap from '../minimap';
 import { clearActiveThemeCard, getSelectedTheme } from "./components/toolbar/themePane";
-import { getCurrentEditRoomData, displayRoomTree, updatePartitionVisibilityUI, getSelectedPartitionId, updatePolygonVisibilityData, toggleVisibilityState, setFilteredDisplay, updateRoomVisibilityUI } from "./components/toolbar/spacePartition/roomTreePane";
-import { toggleDrawPartitionButton, displayPartitionFormMode, setPartitionFormMode, clearPartitionForm, setPolygonData, getPartitionFormData, getPartitionSavingMode, setPartitionSavingMode, getPartitionFormMode, getNewlyAddedPartition, setCurrentPartitionData, getTempCurrentPolygon, clearTempCurrentPolygon } from "./components/toolbar/spacePartition/roomFormPane";
+import { getCurrentEditRoomData, displayRoomTree, updatePartitionVisibilityUI, getSelectedPartitionId, updatePolygonVisibilityData, toggleVisibilityState, setFilteredDisplay, updateRoomVisibilityUI, highlightSelectedPartitionChild } from "./components/toolbar/spacePartition/roomTreePane";
+import { toggleDrawPartitionButton, displayPartitionFormMode, setPartitionFormMode, clearPartitionForm, setPolygonData, getPartitionFormData, getPartitionSavingMode, setPartitionSavingMode, getPartitionFormMode, getNewlyAddedPartition, setCurrentPartitionData, getCurrentPartitionData, getTempCurrentPolygon, clearTempCurrentPolygon, toggleDrawWindowButton, getDrawingMode } from "./components/toolbar/spacePartition/roomFormPane";
 import { actionSettingsSelectOption, getTempCoordinateSystem, getTempMeasurementUnit, getTempRotationUnit, setCoordinateSystem, setMeasurementUnit, setRotationUnit, initSettingsValues, setTempCoordinateSystem, setTempMeasurementUnit, setTempRotationUnit, toggleActionSettingsDropdown, toggleCalibrateBasepoint, setScaleFactor, getTempScaleFactor, setTempScaleFactor, setBasepoint, getTempBasepoint, setTempBasepoint, getBasepoint, toggleActionSettings, getBasepointObjectPayload, displayConvertedCoordinates, getCoordinateSystem, getScaleFactor, getMeasurementUnit, getRotationUnit, setBasepointObjectPayload } from "./components/toolbar/actionSettingsPane";
 import { getBasepointCalibrateBpCoordinateValues, getBasepointCalibrateMpCoordinateValues, initBsepointCalibratePane, toggleBasepointCalibratePane } from "./components/toolbar/basepointCalibratePane";
 import { toggleGeneralMapOptions, initGeneralSelectedMap, getSelectedMapOption } from './components/toolbar/generalSettingsMenuPane';
@@ -415,6 +415,7 @@ function setupIndividualEventListeners() {
     handleSaveTheme();
     handlePartitionDisplay();
     handleDrawPartition();
+    handleDrawWindow();
     handleSavePartition();
     // handleDeletePartition()
     handleCancelPartition();
@@ -1432,12 +1433,25 @@ function setupSpaceEventSubscriptions() {
     subscribeSpaceEvent(SPACE_EVENTS.DRAW_HISTORY, handleDrawHistory);
     subscribeSpaceEvent(SPACE_EVENTS.FLOOR_IMAGE_UPLOADED, handleCustomMapFloorImageUploaded);
     subscribeSpaceEvent(SPACE_EVENTS.FLOOR_IMAGE_UPLOAD_FAILED, handleCustomMapFloorUploadFailed);
-    subscribeSpaceEvent(SPACE_EVENTS.PATH_UPDATED, handlePathUpdated);
-    subscribeSpaceEvent(SPACE_EVENTS.SCREEN_SHARE_USERS_UPDATE, handleScreenShareUsersUpdated);
+    subscribeSpaceEvent(SPACE_EVENTS.PATH_UPDATED, handlePathUpdated),
+        subscribeSpaceEvent(SPACE_EVENTS.PARTITION_COLLIDER_CLICKED, handlePartitionColiderClickSelected),
+        subscribeSpaceEvent(SPACE_EVENTS.SCREEN_SHARE_USERS_UPDATE, handleScreenShareUsersUpdated);
     subscribeSpaceEvent(SPACE_EVENTS.SCREEN_SHARE_HOST_END_SESSION, handleScreenShareEndSessionEvent);
     subscribeSpaceEvent(SPACE_EVENTS.SCREEN_SHARE_ACCEPT_REQUEST, handleScreenShareAcceptRequest);
     subscribeSpaceEvent(SPACE_EVENTS.SCREEN_SHARE_BACK_USER_LIST_PANE, handleScreenShareBackUserListPane);
 }
+function handlePartitionColiderClickSelected(payload) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const partitionId = payload.collider.name.split('_')[0];
+        if ((activePane === null || activePane === void 0 ? void 0 : activePane.getAttribute('id')) !== 'at-room-tree-pane') {
+            yield toggleDisplayPane('at-room-creation-btn');
+        }
+        else {
+            yield new Promise(resolve => requestAnimationFrame(resolve));
+        }
+        highlightSelectedPartitionChild(partitionId, payload.collider.name);
+    });
+}
 function handleDragEnd(payload) {
     console.log("handleDragEnd payload", payload);
     if (isToolbarFeatureEnabled('bim')) {
@@ -1513,9 +1527,14 @@ function handleDrawHistory(payload) {
 function handleVertexPlace(payload) {
     console.log("handleVertexPlace ==>", payload);
     if (isToolbarFeatureEnabled('roomCreation')) {
+        log.info("getDrawingMode()", getDrawingMode());
+        if (getDrawingMode() === 'window') {
+        }
+        if (getDrawingMode() === 'partition') {
+            // setCurrentPartitionData()
+        }
         const undoBtn = document.getElementById('at-draw-undo-btn');
         undoBtn.classList.remove('at_disabled');
-        setCurrentPartitionData();
         const redoBtn = document.getElementById('at-draw-redo-btn');
         redoBtn.classList.add('at_disabled');
     }
@@ -2019,6 +2038,18 @@ function handleDrawPartition() {
         toggleDrawPartitionButton();
     });
 }
+function handleDrawWindow() {
+    log.info("__@ handleDrawWindow()");
+    const addDoorButton = document.getElementById('at-add-window-door-btn');
+    addDoorButton.addEventListener('click', () => {
+        toggleDrawWindowButton();
+    });
+}
+function handleSaveWindow() {
+    log.info("handleSaveWindow()");
+    const currentPartitionData = getCurrentPartitionData();
+    dispatchSpaceEvent(SPACE_EVENTS.PARTITION_EDITED, { data: currentPartitionData });
+}
 function handleSavePartition() {
     log.info("__@ handleSavePartition()");
     const saveRoomBtn = document.getElementById('at-save-room-btn');

package/lib/loaders/polydrawerLoader.d.ts

@@ -1,6 +1,6 @@
 import { MpSdk } from "../../bundle/sdk";
 import { Pane } from 'tweakpane';
-import { EdgePolyData, WallPolyData } from "../types";
+import { EdgePolyData, PolygonData, WallPolyData, WindowPolyData } from "../types";
 export declare class TubeLine {
     mpSdk: MpSdk;
     mesh: THREE.Mesh;
@@ -39,7 +39,11 @@ export declare class TubeLine {
         scrollSpeed: number;
         collider: boolean;
         visible: boolean;
+        drawingMode: string;
+        targetIndex: any;
+        polygonData: any;
         renderPolygonOnAdd: boolean;
+        targetUUID: any;
     };
     outputs: Record<string, unknown> & MpSdk.Scene.PredefinedOutputs;
     context: MpSdk.Scene.IComponentContext;
@@ -119,6 +123,7 @@ export declare class BufferGeometry {
         floorName: string;
         floorColor: number;
         wallColor: number;
+        windowColor: number;
         floorOpacity: number;
         wallOpacity: number;
         visible: boolean;
@@ -128,6 +133,10 @@ export declare class BufferGeometry {
         excludeHiddenWallsFromCalculation: boolean;
         wallHeight: number;
         floorLevel: any;
+        drawingMode: string;
+        windowData: any;
+        targetIndex: any;
+        targetUUID: any;
     };
     outputs: Record<string, unknown> & MpSdk.Scene.PredefinedOutputs;
     context: MpSdk.Scene.IComponentContext;
@@ -147,9 +156,10 @@ export declare class BufferGeometry {
     onInit: () => void;
     onTick: (delta: any) => void;
     onDestroy(): void;
-    renderWall(): void;
     createLabelCanvas(text: string): HTMLCanvasElement;
-    renderWalls(WALL_HEIGHT: number): (WallPolyData[] | EdgePolyData[])[];
+    renderWindow(WALL_HEIGHT: number): void;
+    renderWalls(WALL_HEIGHT: number, metadata?: PolygonData): (WallPolyData[] | EdgePolyData[])[];
+    renderWindows(windows: WindowPolyData[]): void;
     renderPolygon: () => void;
 }
 export declare const bufferGeometryType = "bufferGeometry";