architwin 1.8.3 → 1.8.4

package/lib/architwin.d.ts

@@ -424,7 +424,7 @@ declare function renderPolygonFromPath(path: Array<Vector3>): void;
  * @param {PartitionPayload|Array<Vector3>} payload
  * @returns {void}
  */
-declare function renderPolygon(payload: PartitionPayload | Array<Vector3>): IShowcaseObject;
+declare function renderPolygon(payload: PartitionPayload | Array<Vector3>, updatePolygon?: boolean): IShowcaseObject;
 /**
  * Updates the polygons by passing a new array of vertices. Do note that any vertex markers visible will not automatically update their position
  * @param {number} id - id of the polygon object
@@ -436,6 +436,18 @@ declare function startDraw(): void;
 declare function exitDraw(): void;
 declare function cancelDraw(): void;
 declare function getCurrentPolygon(): IObjectData;
+/**
+ * Wrapper function around toggleMeshChildrenVisibility
+ * @param {MpSdk.Scene.IComponent} component - Component of the model
+ * @param {string | Array<string>} name - name of the model
+ */
+declare function toggleWallVisibility(component: MpSdk.Scene.IComponent, name: string): boolean;
+/**
+ * Returns the children of a model's component
+ * @param component
+ * @returns
+ */
+declare function getChildrenOfModel(component: MpSdk.Scene.IComponent): any;
 declare function setTagIcon(payload: {
     tag: MpSdk.Tag.TagData;
     iconName: string;
@@ -579,4 +591,4 @@ declare function unFollowParticipant(unFollowParticipant: any): void;
  * @param roomNodes Array of room nodes
  */
 declare function setSpaceRoomNodes(roomNodes: Array<RoomNode>): Promise<void>;
-export { _atwin, _config, _mpConfig, tags, sweeps, selectedObject, previousObjTransform, currentObjTransform, actionHistory, state, _tags, _tagCategories, _tagMessageRecepients, _space, _spaceId, _api, _pointerCoord, _3DXObjects, _meetingParticipants, _generatedObjectIds, tagColors, domMousePosition, isFitScreenOccupied, isCdnMapDataAvailable, minimap, _modelDetails, _onMouseClickInstance, transformHistory, _roomNodes, initAtwinApi, getAtwinSdk, connectSpace, disconnectSpace, clearActionHistory, getSweeps, getCurrentSweep, getCurrentSweepPosition, moveToSweep, getNearbySweeps, getAllSweeps, getCurrentCameraPose, getCurrentCameraZoom, getCameraPosition, moveInDirection, cameraLookAt, cameraPan, cameraRotate, cameraSetRotation, getViewMode, setViewMode, captureSpaceScreenshot, captureScreenshotAndCameraDetails, getNearbyObjects, setTransformMode, setSelectedObject, clearSelectedObject, revertTransform, setTransformControls, removeTransformControls, setRenderDistance, addObject, getObject, addObjectToSpace, addMediaScreen, attachMediaScreenContent, updateObject, updateShowcaseObject, deleteObject, deleteShowcaseObject, copyObject, replaceObject, getTargetPosition, setObjectTransformation, setPointerCoordinates, addTextMarkupScreen, setTextMarkupScreenContent, goTo3dx, goToModel, hasTimeElapsed, getSelectedObject, renderAvatar, setSpaceAvatar, get3DXObjects, setLibrary, getLibrary, disposeModel, renderInSpaceMediaScreen, goToPosition, goToParticipant, getNearestSweepFromObject, cancelModelPlacement, renderViewpointMarker, toggleViewpointVisibility, convertDegRotationToEuler, pauseVideo, playVideo, setVideoPlayback, setAnimationState, showMinimap, hideMinimap, getMapConfig, addTag, getTags, gotoTag, renderTag, disposeTag, disposeTags, getMpTags, getMpTag, showTags, attachTagMedia, detachTagMedia, moveTag, editTagLabel, editTagDescription, editTagStem, editTagIcon, editTagColor, saveTag, rotateCameraToObject, setModelVisibility, tagStateSubscriber, setTagIcon, setTagCategories, setUserAssignedCategories, getUserAssignedCategories, setTagMessageRecepients, getTagMessageRecepients, setTagMessages, getTagMessages, setSelectedTagUuid, getSelectedTagUuid, toggleFitToScreen, getFloors, getLabels, renderMeetingSidebar, createMeetingTemplate, joinMeetingTemplate, meet, dispatchSpaceEvent, subscribeSpaceEvent, unsubscribeSpaceEvent, registerCustomSpaceEvent, initSocketIo, socketEmit, getParticipants, followParticipant, unFollowParticipant, enableHUD, disableHUD, getMediaScreenHUDs, canSetHud, saveMediaScreenHud, removeMediaScreenHud, enableFitScreen, disableFitScreen, initToolbarUI, themeManager, convertToEuler, disableSweeps, enableSweep, disableSweep, tubeLineType, _sceneObject, _tubes, drawLine, renderPolygonFromPath, toggleSpaceNavigation, startDraw, exitDraw, cancelDraw, setPolygonPath, setTubeLinePath, getCurrentTubeLine, renderPolygon, setSpaceRoomNodes, getSpaceId, getCurrentPolygon };
+export { _atwin, _config, _mpConfig, tags, sweeps, selectedObject, previousObjTransform, currentObjTransform, actionHistory, state, _tags, _tagCategories, _tagMessageRecepients, _space, _spaceId, _api, _pointerCoord, _3DXObjects, _meetingParticipants, _generatedObjectIds, tagColors, domMousePosition, isFitScreenOccupied, isCdnMapDataAvailable, minimap, _modelDetails, _onMouseClickInstance, transformHistory, _roomNodes, initAtwinApi, getAtwinSdk, connectSpace, disconnectSpace, clearActionHistory, getSweeps, getCurrentSweep, getCurrentSweepPosition, moveToSweep, getNearbySweeps, getAllSweeps, getCurrentCameraPose, getCurrentCameraZoom, getCameraPosition, moveInDirection, cameraLookAt, cameraPan, cameraRotate, cameraSetRotation, getViewMode, setViewMode, captureSpaceScreenshot, captureScreenshotAndCameraDetails, getNearbyObjects, setTransformMode, setSelectedObject, clearSelectedObject, revertTransform, setTransformControls, removeTransformControls, setRenderDistance, addObject, getObject, addObjectToSpace, addMediaScreen, attachMediaScreenContent, updateObject, updateShowcaseObject, deleteObject, deleteShowcaseObject, copyObject, replaceObject, getTargetPosition, setObjectTransformation, setPointerCoordinates, addTextMarkupScreen, setTextMarkupScreenContent, goTo3dx, goToModel, hasTimeElapsed, getSelectedObject, renderAvatar, setSpaceAvatar, get3DXObjects, setLibrary, getLibrary, disposeModel, renderInSpaceMediaScreen, goToPosition, goToParticipant, getNearestSweepFromObject, cancelModelPlacement, renderViewpointMarker, toggleViewpointVisibility, convertDegRotationToEuler, pauseVideo, playVideo, setVideoPlayback, setAnimationState, showMinimap, hideMinimap, getMapConfig, addTag, getTags, gotoTag, renderTag, disposeTag, disposeTags, getMpTags, getMpTag, showTags, attachTagMedia, detachTagMedia, moveTag, editTagLabel, editTagDescription, editTagStem, editTagIcon, editTagColor, saveTag, rotateCameraToObject, setModelVisibility, tagStateSubscriber, setTagIcon, setTagCategories, setUserAssignedCategories, getUserAssignedCategories, setTagMessageRecepients, getTagMessageRecepients, setTagMessages, getTagMessages, setSelectedTagUuid, getSelectedTagUuid, toggleFitToScreen, getFloors, getLabels, renderMeetingSidebar, createMeetingTemplate, joinMeetingTemplate, meet, dispatchSpaceEvent, subscribeSpaceEvent, unsubscribeSpaceEvent, registerCustomSpaceEvent, initSocketIo, socketEmit, getParticipants, followParticipant, unFollowParticipant, enableHUD, disableHUD, getMediaScreenHUDs, canSetHud, saveMediaScreenHud, removeMediaScreenHud, enableFitScreen, disableFitScreen, initToolbarUI, themeManager, convertToEuler, disableSweeps, enableSweep, disableSweep, tubeLineType, _sceneObject, _tubes, drawLine, renderPolygonFromPath, toggleSpaceNavigation, startDraw, exitDraw, cancelDraw, setPolygonPath, setTubeLinePath, getCurrentTubeLine, renderPolygon, toggleWallVisibility, getChildrenOfModel, setSpaceRoomNodes, getSpaceId, getCurrentPolygon };

package/lib/architwin.js

@@ -5131,7 +5131,7 @@ function renderPolygonFromPath(path) {
  * @param {PartitionPayload|Array<Vector3>} payload
  * @returns {void}
  */
-function renderPolygon(payload) {
+function renderPolygon(payload, updatePolygon = false) {
     if (!payload) {
         log.error("Payload is undefined");
         return;
@@ -5168,38 +5168,44 @@ function renderPolygon(payload) {
                     component: polyComponent,
                     type: 'POLYGON'
                 };
+                const eventPath = _sceneObject.addEmitPath(polyComponent, 'polygonclicked');
+                _sceneObject.spyOnEvent(new PolygonClickSpy(eventPath, showcaseObj, polyNode, polyComponent, dispatchSpaceEvent));
                 _3DXObjects.push(newObj);
                 _currentPolygon = newObj;
+                log.info("_currentPolygon ", _currentPolygon);
             }
             catch (error) {
                 log.error("Error renderPolygon ", error);
             }
         }
-        const index = _3DXObjects.findIndex(item => item.object.id == _currentPolygon.object.id);
-        _currentPolygon.node = polyNode;
-        _currentPolygon.component = polyComponent;
-        _currentPolygon.object.object_data.uuid = generateUUID();
-        _currentPolygon.object.object_data.json_data = {
-            vertexPath: payload
-        };
-        _3DXObjects[index] = _currentPolygon;
-        if (payload.length > 3) {
-            console.log(" _3DXObjects[index] ", _3DXObjects[index]);
-            setPolygonPath(_3DXObjects[index].object.id, payload);
+        if (updatePolygon) {
+            const index = _3DXObjects.findIndex(item => item.object.id == _currentPolygon.object.id);
+            _currentPolygon.node = polyNode;
+            _currentPolygon.component = polyComponent;
+            _currentPolygon.object.object_data.uuid = generateUUID();
+            _currentPolygon.object.object_data.json_data = {
+                vertexPath: payload
+            };
+            _3DXObjects[index] = _currentPolygon;
+            if (payload.length > 3) {
+                console.log(" _3DXObjects[index] ", _3DXObjects[index]);
+                setPolygonPath(_3DXObjects[index].object.id, payload);
+            }
         }
     }
     else {
         polyNode = _sceneObject.addNode();
         polyComponent = polyNode.addComponent(bufferGeometryType, {
-            path: payload.polygon_json.path
+            path: payload.polygon_json.path,
+            uuid: payload.uuid
         });
         polyNode.start();
         polyObj.uuid = payload.uuid;
         polyObj.name = payload.name;
         polyObj.json_data = payload.polygon_json;
         _sceneObject.addInputPath(polyComponent, 'path', `path_${showcaseObj.id}`);
-        // const eventPath = _sceneObject.addEmitPath(polyComponent, 'polygonclicked');
-        // _sceneObject.spyOnEvent(new PolygonClickSpy(eventPath, showcaseObj, polyNode, polyComponent, dispatchSpaceEvent))
+        const eventPath = _sceneObject.addEmitPath(polyComponent, 'polygonclicked');
+        _sceneObject.spyOnEvent(new PolygonClickSpy(eventPath, showcaseObj, polyNode, polyComponent, dispatchSpaceEvent));
         const newObj = {
             object: showcaseObj,
             node: polyNode,
@@ -5383,6 +5389,7 @@ function exitDraw() {
     toggleSpaceNavigation(true);
     _drawPolygonMode = false;
     _currentPolygon = undefined;
+    _polygonShapePath = undefined;
     _atwin.Pointer.resetTexture();
 }
 function cancelDraw() {
@@ -5460,6 +5467,59 @@ function addVertex(name, path) {
     _activeVertex = drawComponent;
     return [drawNode, drawComponent];
 }
+/**
+ * Toggles the visibility of the children of a mesh
+ * @param {MpSdk.Scene.IComponent} component - Component of the model
+ * @param {string} name - name of the model
+ */
+function toggleMeshChildrenVisibility(component, name) {
+    if (!component) {
+        log.error("Component is undefined");
+        return;
+    }
+    if (!name) {
+        log.error("name is undefined");
+        return;
+    }
+    //@ts-expect-error
+    component.mesh.children.forEach(child => {
+        if (child.name == name) {
+            child.visible = !child.visible;
+            return child.visible;
+        }
+    });
+}
+/**
+ * Wrapper function around toggleMeshChildrenVisibility
+ * @param {MpSdk.Scene.IComponent} component - Component of the model
+ * @param {string | Array<string>} name - name of the model
+ */
+function toggleWallVisibility(component, name) {
+    if (!component) {
+        log.error("Component is undefined");
+        return;
+    }
+    if (!name) {
+        log.error("name is undefined");
+        return;
+    }
+    const state = toggleMeshChildrenVisibility(component, name);
+    return state;
+}
+/**
+ * Returns the children of a model's component
+ * @param component
+ * @returns
+ */
+function getChildrenOfModel(component) {
+    if (!component) {
+        log.error("Component is undefined");
+        return;
+    }
+    //@ts-expect-error
+    const children = component.mesh.children;
+    return children;
+}
 //===================== END VERTEX DRAWING METHODS =========================//
 //===================== START TAGS =========================//
 // set tag icon
@@ -6400,15 +6460,20 @@ class PolygonClickSpy {
         this.callback = callback;
     }
     onEvent(data) {
-        log.info("VerticeClickSpy");
-        log.info('Clicked on polygon', data);
-        //Emit event to application
-        this.callback('PARTITION_CLICKED', this.object_data);
-        // const index = _3DXObjects.findIndex(item => item.object.id == _currentPolygon.object.id)
-        // _currentPolygon.node = this.node
-        // _currentPolygon.component = this.component
-        // _3DXObjects[index] = _currentPolygon
-        setSelectedObject(this.object_data, this.node, this.component, 'POLYGON');
+        if (data.input.type == 'click') {
+            if (_drawPolygonMode == false) {
+                log.info("VerticeClickSpy");
+                log.info('Clicked on polygon', data);
+                //Emit event to application
+                this.callback('PARTITION_CLICKED', this.object_data);
+                setSelectedObject(this.object_data, this.node, this.component, 'POLYGON');
+                _currentPolygon = {
+                    node: this.node,
+                    component: this.component,
+                    object: this.object_data
+                };
+            }
+        }
     }
 }
 class VerticeEditSpy {
@@ -6491,7 +6556,7 @@ initToolbarUI, themeManager,
 //utils
 convertToEuler, disableSweeps, enableSweep, disableSweep, 
 //Draw polygon
-tubeLineType, _sceneObject, _tubes, drawLine, renderPolygonFromPath, toggleSpaceNavigation, startDraw, exitDraw, cancelDraw, setPolygonPath, setTubeLinePath, getCurrentTubeLine, renderPolygon, 
+tubeLineType, _sceneObject, _tubes, drawLine, renderPolygonFromPath, toggleSpaceNavigation, startDraw, exitDraw, cancelDraw, setPolygonPath, setTubeLinePath, getCurrentTubeLine, renderPolygon, toggleWallVisibility, getChildrenOfModel, 
 // Room creation
 setSpaceRoomNodes, 
 // others

package/lib/atwinui/components/toolbar/roomCreation/roomFormPane.js

@@ -360,9 +360,12 @@ function renderFloor(floor) {
 function renderWalls(wall, index) {
     console.log('renderWall()', wall);
     const element = document.createElement('div');
-    const parts = wall.name.split(' ');
-    const wallName = parts[0];
-    const wallNumber = parts[1] ? parts[1] : null;
+    const match = wall.name.match(/_wall-(\d+)$/);
+    let wallName = '';
+    if (match) {
+        console.log("HELLO");
+        wallName = `${i18n.t(`Wall`)} ${match[1]}`;
+    }
     element.innerHTML =
         `
         <div class="at_face_item">
@@ -370,11 +373,11 @@ function renderWalls(wall, index) {
                 <span class="mdi mdi-perspective-less at_face_icon_rotate_270"></span>
             </div>
             <div class="at_face_name" id="at-expand-btn-${wall.uuid}" data-cy="at-expand-btn-${wall.uuid}">
-                ${i18n.t(`${wallName}`)} ${wallNumber}
+                ${wallName}
                 <span class="mdi mdi-chevron-down" id="at-expand-btn-${wall.uuid}" data-cy="at-expand-btn-${wall.uuid}"></span>
             </div>
             <div class="at_icon_right">
-                <span class="mdi mdi-delete-outline"></span>
+                <span class=""></span>
             </div>
         </div>
         <div class="at_edit_name" id="at-edit-name-${wall.uuid}" data-cy="at-edit-name-${wall.uuid}" >
@@ -552,7 +555,7 @@ export function setPolygonData(payload) {
     if (payload.walls && payload.walls.length > 0) {
         payload.walls = payload.walls.map((wall, index) => {
             var _a, _b, _c, _d;
-            return (Object.assign(Object.assign({}, roundToTwoDecimals(wall)), { name: `Wall ${index + 1}`, uuid: wall.uuid || generateUUID(), options: {
+            return (Object.assign(Object.assign({}, roundToTwoDecimals(wall)), { name: `_wall-${index + 1}`, uuid: wall.uuid || generateUUID(), options: {
                     color: (_b = (_a = wall.options) === null || _a === void 0 ? void 0 : _a.color) !== null && _b !== void 0 ? _b : 0xffffff,
                     opacity: (_d = (_c = wall.options) === null || _c === void 0 ? void 0 : _c.opacity) !== null && _d !== void 0 ? _d : 1.0 // Default opacity (fully opaque)
                 } }));

package/lib/atwinui/events.js

@@ -130,7 +130,7 @@ function toggleDisplayPane(targetId) {
                 if (paneId === 'at-object-list-pane') {
                     const objectsInSpace = get3DXObjects();
                     const objectComponents = objectsInSpace.map(obj => obj.component);
-                    const spaceObjects = objectsInSpace.map(obj => obj.object);
+                    const spaceObjects = objectsInSpace.filter(obj => obj.type !== 'POLYGON').map(obj => obj.object);
                     renderObjectCards(spaceObjects, objectComponents);
                     if (targetId === 'at-cancel-library-btn') {
                         yield cancelModelPlacement();
@@ -1132,7 +1132,7 @@ function handleSetModelsView() {
         modelsListViewBtn.classList.remove('at_ghost_active');
         modelsView = 'card';
         log.info("modelCardViewBtn", modelsView);
-        const spaceObjects = _3DXObjects.map(obj => obj.object);
+        const spaceObjects = _3DXObjects.filter(obj => obj.type !== 'POLYGON').map(obj => obj.object);
         const objectComponents = _3DXObjects.map(obj => obj.component);
         renderObjectCards(spaceObjects, objectComponents);
     });
@@ -1141,7 +1141,7 @@ function handleSetModelsView() {
         modelsCardViewBtn.classList.remove('at_ghost_active');
         modelsView = 'list';
         log.info("modelListViewBtn", modelsView);
-        const spaceObjects = _3DXObjects.map(obj => obj.object);
+        const spaceObjects = _3DXObjects.filter(obj => obj.type !== "POLYGON").map(obj => obj.object);
         const objectComponents = _3DXObjects.map(obj => obj.component);
         renderObjectList(spaceObjects, objectComponents);
     });

package/lib/loaders/polydrawerLoader.d.ts

@@ -110,6 +110,7 @@ export declare class BufferGeometry {
     inputs: {
         id: number;
         name: string;
+        uuid: string;
         position: any;
         fillColor: string;
         hoverColor: string;
@@ -140,7 +141,7 @@ export declare class BufferGeometry {
     onDestroy(): void;
     renderWall(): void;
     createLabelCanvas(text: string): HTMLCanvasElement;
-    renderWalls(WALL_HEIGHT: number): (EdgePolyData | WallPolyData)[];
+    renderWalls(WALL_HEIGHT: number): (EdgePolyData[] | WallPolyData[])[];
     renderPolygon: () => void;
 }
 export declare const bufferGeometryType = "bufferGeometry";

package/lib/loaders/polydrawerLoader.js

@@ -76,7 +76,7 @@ export class TubeLine {
                     this.renderTubeLine();
                     console.log("paths ", this.inputs.path);
                     if (this.inputs.path.length >= 3 && this.inputs.renderPolygonOnAdd) {
-                        renderPolygon(this.inputs.path);
+                        renderPolygon(this.inputs.path, true);
                     }
                 }
             }
@@ -434,6 +434,7 @@ export class BufferGeometry {
         this.inputs = {
             id: 0,
             name: '',
+            uuid: '',
             position: null,
             fillColor: 'rgb(0,255,0)',
             hoverColor: 'rgb(255,0,0)',
@@ -526,6 +527,7 @@ export class BufferGeometry {
                     opacity: this.inputs.wallOpacity,
                     transparent: true
                 }));
+                wallMesh.name = `${this.inputs.uuid}-wall-${i + 1}`;
                 const wallLength = new THREE.Vector3(endPoint.x - startPoint.x, endPoint.y - startPoint.y, endPoint.z - startPoint.z).length();
                 const wallArea = wallLength * WALL_HEIGHT;
                 // Create wall label
@@ -591,6 +593,7 @@ export class BufferGeometry {
                         color: this.inputs.wallColor,
                         opacity: this.inputs.wallOpacity
                     },
+                    name: `${this.inputs.uuid}-wall-${i + 1}`,
                     area: wallArea,
                     wall_height: WALL_HEIGHT,
                     edges: wallEdges
@@ -615,6 +618,9 @@ export class BufferGeometry {
                 walls: wallDataArray
             };
             dispatchSpaceEvent(SPACE_EVENTS.PARTITION_UPDATED, partitionData);
+            console.log("Polygon mesh ", this.groupedMesh);
+            //@ts-expect-error
+            this.mesh = this.groupedMesh;
             this.outputs.objectRoot = this.groupedMesh;
             this.outputs.collider = this.groupedMesh;
         };
@@ -622,6 +628,9 @@ export class BufferGeometry {
     }
     onEvent(eventType, data) {
         if (eventType === 'INTERACTION.CLICK') {
+            data.input.type = 'click';
+            //@ts-expect-error
+            this.notify('polygonclicked', data);
         }
         if (eventType === 'INTERACTION.DRAG') {
         }
@@ -629,8 +638,6 @@ export class BufferGeometry {
         }
         if (eventType === 'INTERACTION.DRAG_END') {
         }
-        ////@ts-expect-error
-        //this.notify('polygonclicked', data);
     }
     onDestroy() {
         this.outputs.collider = null;
@@ -656,6 +663,8 @@ export class BufferGeometry {
     ;
     renderWalls(WALL_HEIGHT) {
         const THREE = this.context.three;
+        let floorDataArray = [];
+        let wallDataArray = [];
         for (let i = 0; i < this.inputs.path.length; i++) {
             const startPoint = this.inputs.path[i];
             const endPoint = this.inputs.path[(i + 1) % this.inputs.path.length];
@@ -747,8 +756,10 @@ export class BufferGeometry {
                 wall_height: WALL_HEIGHT,
                 edges: wallEdges
             };
-            return [floorEdges, wallData];
+            floorDataArray.push(floorEdges);
+            wallDataArray.push(wallData);
         }
+        return [floorDataArray, wallDataArray];
     }
     ;
 }

package/lib/types.d.ts

@@ -1041,7 +1041,7 @@ export interface RoomNode {
     uuid?: string;
     space_uuid: string;
     name: string;
-    parent_uuid: string | null;
+    parent_uuid: string | undefined;
     polygon_json: string;
     children?: RoomNode[];
     created_on?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "architwin",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "description": "ArchiTwin Library for Matterport",
   "main": "./lib/architwin.js",
   "types": "./lib/architwin.d.ts",