architwin 1.10.10 → 1.10.11

package/lib/architwin.d.ts

@@ -2,7 +2,7 @@ import { AxiosInstance } from "axios";
 import { MpSdk, Scene, Vector3, Vector2, Renderer } from "../bundle/sdk";
 import { tubeLineType } from "./loaders";
 import { initToolbarUI, themeManager } from "./atwinui";
-import { type ITag, type IUser, type ISpace, type IShowcaseObject, type I3DObject, type IMPConfig, type ISweep, type ITagPublic, type NearbyPayload, type NearbyObjects, type IObjectData, TRANSFORM_TYPE, Object3DPosition, ObjectCoordinates, EulerCoordinates, State, FileUpload, ObjectConfig, IAtwinFloor, IAtwinLabel, SPACE_EVENTS, ComponentOptions, SpaceAvatar, IMapConfig, MEETING_SIDEBAR, IO_ROLE, IO_SPACE_EVENTS, IO_MEETING_EVENTS, SCREEN_POSITIONS, ITagCategory, TagMessage, ISdkConnections, PartitionNode, PartitionPayload } from "./types";
+import { type ITag, type IUser, type ISpace, type IShowcaseObject, type I3DObject, type IMPConfig, type ISweep, type ITagPublic, type NearbyPayload, type NearbyObjects, type IObjectData, TRANSFORM_TYPE, Object3DPosition, ObjectCoordinates, EulerCoordinates, State, FileUpload, ObjectConfig, IAtwinFloor, IAtwinLabel, SPACE_EVENTS, ComponentOptions, SpaceAvatar, IMapConfig, MEETING_SIDEBAR, IO_ROLE, IO_SPACE_EVENTS, IO_MEETING_EVENTS, SCREEN_POSITIONS, ITagCategory, TagMessage, ISdkConnections, PartitionNode, PartitionPayload, ICurrentSpace } from "./types";
 import * as minimap from './minimap';
 import '../static/sidebar.css';
 import '../static/map.css';
@@ -80,6 +80,10 @@ declare function connectSpace(url: string, auth: {
     onPlay: Function;
 }): Promise<void>;
 declare function getAtwinSdk(): MpSdk | null;
+/**
+ * Check if a specific toolbar feature is enabled or not
+ */
+declare function isToolbarFeatureEnabled(key: string): boolean;
 declare function getFloors(): IAtwinFloor[];
 declare function getLabels(): IAtwinLabel[];
 /**
@@ -616,6 +620,7 @@ declare function setTagMessages(messages: Array<TagMessage>): void;
 declare function getTagMessages(): Array<TagMessage>;
 declare function setSelectedTagUuid(uuid: string): void;
 declare function getSelectedTagUuid(): string;
+declare function setCurrentSpace(space: ICurrentSpace): void;
 declare function renderMeetingSidebar(template?: string, templateName?: MEETING_SIDEBAR): void;
 /**
  * Subscribes a method or an array of methods to a Matterport event.
@@ -687,4 +692,4 @@ declare function getPathBetweenSweeps(startSweepId: string, endSweepId: string,
     }[];
 }>;
 declare function moveAlongPath(path: any[], iframeId: any): 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, _partitionNodes, initAtwinApi, getAtwinSdk, connectSpace, disconnectSpace, clearActionHistory, getSweeps, getCurrentSweep, getCurrentSweepPosition, moveToSweep, getNearbySweeps, getAllSweeps, getCurrentCameraPose, getCurrentCameraZoom, getCameraPosition, getCurrentFloor, 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, drawPath, toggleSpaceNavigation, startDraw, exitDraw, cancelDraw, setPolygonPath, setTubeLinePath, getCurrentTubeLine, renderPolygon, toggleWallVisibility, toggleMeshChildrenVisibility, toggleFloorVisibility, getChildrenOfModel, toggleVerticeRingVisibility, setPolygonFloorOffset, getPolygonFloorOffset, setFloorBaseHeight, clearFloorBaseHeight, enableVerticeControls, deleteEdge, disposePathLine, getFloorBaseHeight, setMeshChildrenMaterialProperty, undoDrawAction, redoDrawAction, addUndoDrawActions, setWallBaseHeight, getWallBaseHeight, clearWallBaseHeight, setSpacePartitionNodes, setCurrentPolygon, getSpaceId, getCurrentPolygon, getPathBetweenSweeps, moveAlongPath, _atwinConnections };
+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, _partitionNodes, initAtwinApi, getAtwinSdk, connectSpace, disconnectSpace, clearActionHistory, getSweeps, getCurrentSweep, getCurrentSweepPosition, moveToSweep, getNearbySweeps, getAllSweeps, getCurrentCameraPose, getCurrentCameraZoom, getCameraPosition, getCurrentFloor, 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, isToolbarFeatureEnabled, 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, setCurrentSpace, 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, drawPath, toggleSpaceNavigation, startDraw, exitDraw, cancelDraw, setPolygonPath, setTubeLinePath, getCurrentTubeLine, renderPolygon, toggleWallVisibility, toggleMeshChildrenVisibility, toggleFloorVisibility, getChildrenOfModel, toggleVerticeRingVisibility, setPolygonFloorOffset, getPolygonFloorOffset, setFloorBaseHeight, clearFloorBaseHeight, enableVerticeControls, deleteEdge, disposePathLine, getFloorBaseHeight, setMeshChildrenMaterialProperty, undoDrawAction, redoDrawAction, addUndoDrawActions, setWallBaseHeight, getWallBaseHeight, clearWallBaseHeight, setSpacePartitionNodes, setCurrentPolygon, getSpaceId, getCurrentPolygon, getPathBetweenSweeps, moveAlongPath, _atwinConnections };

package/lib/architwin.js

@@ -13,7 +13,7 @@ import { planeType, planeFactory,
 planeImageFactory, planeVideoFactory, planePdfFactory, setHudState, gltfType, gltfFactory, boxType, boxFactory, textType, textFactory, css3DType, css3DFactory, planeTypeImage, planeTypeVideo, planeTypePdf, sweepPuckType, puckBackgroundFactory, viewpointType, viewpointFactory, tubeLineType, tubeLineFactory, verticeType, verticeFactory, bufferGeometryType, bufferGeometry, fbxType, fbxFactory } from "./loaders";
 import { meterToMillimeter, generateUUID, formatMatterportUrl, initBundleVersion, isEqual, useHexToRgb } from "./utils";
 import { initToolbarUI, themeManager, toggleActionBarButtons, setActiveActionBtn } from "./atwinui";
-import { SPACE_EVENTS, } from "./types";
+import { SPACE_EVENTS, COORDINATE_SYSTEM, } from "./types";
 import * as JSZip from "jszip";
 import * as JSZipUtils from "jszip-utils";
 import * as superviz from './superviz';
@@ -38,6 +38,8 @@ import { getCurrentPolygonData, getDrawingMode, setCurrentPartitionData } from "
 import { Notyf } from 'notyf';
 import 'notyf/notyf.min.css';
 import i18n from "./atwinui/components/toolbar/i18n";
+import { setBasepoint, setBasepointObjectPayload, setCoordinateSystem, setMeasurementUnit, setRotationUnit, setScaleFactor, setTempCoordinateSystem, setTempMeasurementUnit, setTempRotationUnit, setTempScaleFactor, getCoordinateSystem } from "./atwinui/components/toolbar/actionSettingsPane";
+import { convertZupToYup } from "./worldConversion";
 const uid = new ShortUniqueId({
     dictionary: 'number'
 });
@@ -195,6 +197,7 @@ let _atwinConnections = {};
 let _onMouseClickInstance;
 let _modelDetails;
 let _currentRoom;
+let _currentCoordinateSystem = '';
 const supportedMediaTypes = ["WMV", "MOV", "MP4", "JPG", "PNG", "JPEG", "image", "video", "FRAME", "PDF", "PDF"];
 const supportedModelTypes = ["GLB", "GLTF", "FBX"];
 const supportedFileTypes = ["ZIP", "PDF", ...supportedMediaTypes, ...supportedModelTypes];
@@ -231,6 +234,7 @@ let notyf = new Notyf({ position: { x: 'left', y: 'bottom' }, duration: 4500, ty
             icon: '<span class="mdi mdi-information-outline"></span>'
         }
     ] });
+let _currentSpace;
 // end here
 // =========================================== INITIALIZATION ===========================================
 /**
@@ -398,9 +402,24 @@ function getAtwinSdk() {
     return _atwin;
 }
 /**
- * Set the custom sweep pucks
+ * Check if a specific toolbar feature is enabled or not
  */
-function setCustomSweepPucks() {
+function isToolbarFeatureEnabled(key) {
+    log.info("isToolbarFeatureEnabled()");
+    if (!key) {
+        log.error("key is undefined");
+        return;
+    }
+    if (!_mpConfig.toolbarConfig) {
+        return false;
+    }
+    if (!_mpConfig.toolbarConfig.menuItems) {
+        return false;
+    }
+    if (_mpConfig.toolbarConfig.menuItems[key] == undefined) {
+        return false;
+    }
+    return _mpConfig.toolbarConfig.menuItems[key];
 }
 /*
     Note: no need iframe reload.
@@ -423,6 +442,7 @@ function loadDefaultMpSpace(url, config, showcase, callbacks = undefined) {
                 _atwinConnections[showcase.id] = _atwin;
                 log.info("Hello Bundle SDK", _atwin);
                 _atwin.App.state.subscribe((appState) => __awaiter(this, void 0, void 0, function* () {
+                    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
                     log.info("appState", appState);
                     if (appState.phase === _atwin.App.Phase.LOADING) {
                         log.info("App is loading...");
@@ -737,6 +757,44 @@ function loadDefaultMpSpace(url, config, showcase, callbacks = undefined) {
                             initToolbarUI({ objects: spaceObjects });
                             themeManager(_mpConfig.toolbarConfig.themeConfig);
                         }
+                        if (_currentSpace.json_data) {
+                            const spaceJsonData = JSON.parse(_currentSpace.json_data);
+                            if ((_a = spaceJsonData === null || spaceJsonData === void 0 ? void 0 : spaceJsonData.coordSystemCalibration) === null || _a === void 0 ? void 0 : _a.bim) {
+                                // setCoordinateSystem()
+                                console.log("spaceJsonData?.coordSystemCalibration?.bim", (_b = spaceJsonData === null || spaceJsonData === void 0 ? void 0 : spaceJsonData.coordSystemCalibration) === null || _b === void 0 ? void 0 : _b.bim);
+                                setCoordinateSystem((_c = spaceJsonData === null || spaceJsonData === void 0 ? void 0 : spaceJsonData.coordSystemCalibration) === null || _c === void 0 ? void 0 : _c.bim.coord_system);
+                                setScaleFactor((_d = spaceJsonData === null || spaceJsonData === void 0 ? void 0 : spaceJsonData.coordSystemCalibration) === null || _d === void 0 ? void 0 : _d.bim.scale_factor);
+                                setRotationUnit((_e = spaceJsonData === null || spaceJsonData === void 0 ? void 0 : spaceJsonData.coordSystemCalibration) === null || _e === void 0 ? void 0 : _e.bim.rotation_unit);
+                                setMeasurementUnit((_f = spaceJsonData === null || spaceJsonData === void 0 ? void 0 : spaceJsonData.coordSystemCalibration) === null || _f === void 0 ? void 0 : _f.bim.measurement_unit);
+                                setTempCoordinateSystem((_g = spaceJsonData === null || spaceJsonData === void 0 ? void 0 : spaceJsonData.coordSystemCalibration) === null || _g === void 0 ? void 0 : _g.bim.coord_system);
+                                setTempScaleFactor((_h = spaceJsonData === null || spaceJsonData === void 0 ? void 0 : spaceJsonData.coordSystemCalibration) === null || _h === void 0 ? void 0 : _h.bim.scale_factor);
+                                setTempRotationUnit((_j = spaceJsonData === null || spaceJsonData === void 0 ? void 0 : spaceJsonData.coordSystemCalibration) === null || _j === void 0 ? void 0 : _j.bim.rotation_unit);
+                                setTempMeasurementUnit((_k = spaceJsonData === null || spaceJsonData === void 0 ? void 0 : spaceJsonData.coordSystemCalibration) === null || _k === void 0 ? void 0 : _k.bim.measurement_unit);
+                            }
+                            if ((_l = spaceJsonData === null || spaceJsonData === void 0 ? void 0 : spaceJsonData.coordSystemCalibration) === null || _l === void 0 ? void 0 : _l.bim.project_basepoint) {
+                                console.log("THERE IS A BASEPOINT");
+                                const truncateToThreeDecimals = (num) => Math.floor(num * 1000) / 1000;
+                                const truncatedCoordinate = {
+                                    x: truncateToThreeDecimals(spaceJsonData.coordSystemCalibration.bim.project_basepoint.object_position.x),
+                                    y: truncateToThreeDecimals(spaceJsonData.coordSystemCalibration.bim.project_basepoint.object_position.y),
+                                    z: truncateToThreeDecimals(spaceJsonData.coordSystemCalibration.bim.project_basepoint.object_position.z),
+                                };
+                                console.log("BASEPOINT COORDINATE_SYSTEM", (_m = spaceJsonData === null || spaceJsonData === void 0 ? void 0 : spaceJsonData.coordSystemCalibration) === null || _m === void 0 ? void 0 : _m.bim.project_basepoint.coordinate_system);
+                                if (((_o = spaceJsonData === null || spaceJsonData === void 0 ? void 0 : spaceJsonData.coordSystemCalibration) === null || _o === void 0 ? void 0 : _o.bim.project_basepoint.coordinate_system) === COORDINATE_SYSTEM.MATTERPORT) {
+                                    setBasepoint(truncatedCoordinate);
+                                }
+                                else if (((_p = spaceJsonData === null || spaceJsonData === void 0 ? void 0 : spaceJsonData.coordSystemCalibration) === null || _p === void 0 ? void 0 : _p.bim.project_basepoint.coordinate_system) === COORDINATE_SYSTEM.BIM) {
+                                    const basepointCoord = convertZupToYup(truncatedCoordinate);
+                                    setBasepoint(basepointCoord);
+                                }
+                                const index = _3DXObjects.findIndex(obj => obj.object.object_data.amazon_uri == "https://cdn.jsdelivr.net/npm/architwin@latest/static/images/basepointmarker.png");
+                                console.log("_3DXObjects", _3DXObjects[index], index);
+                                if (index != -1) {
+                                    _3DXObjects[index].type = "BASEPOINT";
+                                }
+                                setBasepointObjectPayload((_q = spaceJsonData === null || spaceJsonData === void 0 ? void 0 : spaceJsonData.coordSystemCalibration) === null || _q === void 0 ? void 0 : _q.bim.project_basepoint);
+                            }
+                        }
                     }
                 }));
                 return _atwin;
@@ -3502,6 +3560,14 @@ function addObjectToSpace(mediaUrl, objectType, config = undefined, object_data)
                     objId = config.id;
                 }
                 showcase_object = createIShowcaseObjectData(object, config.position, config.scale, config.rotation, objId);
+                if (config) {
+                    if (config.json_data) {
+                        const jsonData = JSON.parse(config.json_data);
+                        showcase_object.json_data = config.json_data;
+                        if (jsonData.coordinate_system)
+                            showcase_object.coordinate_system = jsonData.coordinate_system;
+                    }
+                }
                 log.info("About to render object", showcase_object);
                 // if (object.object_type == 'MP4') {
                 //   await showVideoObjects(showcase_object)
@@ -3844,7 +3910,7 @@ function createIShowcaseObjectData(object_data, position = undefined, scale = un
     showcase_object.position_unit = "m";
     showcase_object.object_data = object_data;
     showcase_object.showcase_object_name = object_data.name;
-    showcase_object.coordinate_system = 'yup';
+    showcase_object.coordinate_system = getCoordinateSystem() == 'matterport' ? COORDINATE_SYSTEM.MATTERPORT : COORDINATE_SYSTEM.BIM;
     if (showcase_object.object_data) {
         showcase_object.object_data = newObj;
     }
@@ -6703,6 +6769,13 @@ function getSelectedTagUuid() {
         return _selectedTagUuid;
     }
 }
+function setCurrentSpace(space) {
+    _currentSpace = space;
+    console.log("_currentSpace", _currentSpace);
+}
+function getCurrentSpace() {
+    return _currentSpace;
+}
 //===================== END TAGS =========================//
 //===================== START ZOOM MEETING =========================//
 function renderMeetingSidebar(template, templateName) {
@@ -7254,8 +7327,6 @@ class EmitSpy {
             };
             if (_mpConfig.toolbarConfig && _mpConfig.toolbarConfig.menuItems && _mpConfig.toolbarConfig.menuItems.models !== undefined) {
                 if (_mpConfig.toolbarConfig.menuItems.models) {
-                    //Emit event to application
-                    this.callback('CLICK', { objectData: this.object_data, component: this.component });
                     //clearActionHistory()
                     setSelectedObject(this.object_data, this.node, this.component, '3DX');
                     if (_viewMode === "interactive" /* VIEW_MODE.INTERACTIVE */ && !excludedColliders.includes(data.collider.name)) {
@@ -7264,11 +7335,11 @@ class EmitSpy {
                     else {
                         removeTransformControls();
                     }
+                    //Emit event to application
+                    this.callback('CLICK', { objectData: this.object_data, component: this.component });
                 }
             }
             else {
-                //Emit event to application
-                this.callback('CLICK', { objectData: this.object_data, component: this.component });
                 //clearActionHistory()
                 setSelectedObject(this.object_data, this.node, this.component, '3DX');
                 if (_viewMode === "interactive" /* VIEW_MODE.INTERACTIVE */ && !excludedColliders.includes(data.collider.name)) {
@@ -7277,6 +7348,8 @@ class EmitSpy {
                 else {
                     removeTransformControls();
                 }
+                //Emit event to application
+                this.callback('CLICK', { objectData: this.object_data, component: this.component });
             }
         }
         else if (data.input.type === 'drag_end') {
@@ -7339,13 +7412,13 @@ getNearbyObjects, setTransformMode, setSelectedObject, clearSelectedObject, reve
 // setBasePointPosition,
 // showObjectDimensions,
 // hideObjectDimensions,
-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, 
+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, isToolbarFeatureEnabled, 
 // video
 pauseVideo, playVideo, setVideoPlayback, setAnimationState, 
 // minimap
 showMinimap, hideMinimap, getMapConfig, 
 // tags
-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, 
+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, setCurrentSpace, toggleFitToScreen, 
 // floors
 getFloors, getLabels, 
 // zoom meeting

package/lib/atwinui/components/toolbar/actionSettingsPane.d.ts

@@ -1,10 +1,13 @@
-import { Vector3 } from "three";
+import { IShowcaseObject } from "../../../types";
+import { Vector3 } from "../../../../bundle/sdk";
+export declare let isAdjust: boolean;
 export declare function renderActionSettingsPane(): HTMLDivElement;
 export declare function toggleActionSettings(visible?: boolean): void;
 export declare function toggleActionSettingsDropdown(id: string): void;
 export declare function actionSettingsSelectOption(element: HTMLElement, id: string): void;
 export declare function initSettingsValues(): void;
 export declare function toggleCalibrateBasepoint(): Promise<void>;
+export declare function displayConvertedCoordinates(payload: any): void;
 export declare function getCoordinateSystem(): string;
 export declare function setCoordinateSystem(value: string): void;
 export declare function getScaleFactor(): string;
@@ -25,3 +28,5 @@ export declare function setBasepoint(value: Vector3): void;
 export declare function getBasepoint(): Vector3;
 export declare function setTempBasepoint(value: Vector3): void;
 export declare function getTempBasepoint(): Vector3;
+export declare function getBasepointObjectPayload(): IShowcaseObject;
+export declare function setBasepointObjectPayload(payload: IShowcaseObject): void;

package/lib/atwinui/components/toolbar/actionSettingsPane.js

@@ -7,24 +7,27 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { _3DXObjects, addObjectToSpace, cancelModelPlacement, clearSelectedObject, disposeModel, getTargetPosition, removeTransformControls, setSelectedObject, setTransformControls } from "../../../architwin";
+import { _3DXObjects, addObjectToSpace, cancelModelPlacement, clearSelectedObject, disposeModel, getTargetPosition, removeTransformControls, setSelectedObject } from "../../../architwin";
 import { batchAddEventListenerByClassName } from "../../events";
 import i18n from "./i18n";
 import { toggleModelControl } from "./modelControlsPane";
 import { convertYupToZup } from "../../../worldConversion";
 import { getAssetUrl } from "../../../utils";
+import { COORDINATE_SYSTEM } from "../../../types";
+import { generateUUID } from "three/src/math/MathUtils";
 let actionSettingsPane;
-let coordinateSystem = "matterport";
+let coordinateSystem = COORDINATE_SYSTEM.MATTERPORT;
 let scaleFactor = "1";
 let measurementUnit = "meter";
 let rotationUnit = "radian";
-let tempCoordinateSystem = "matterport";
+let tempCoordinateSystem = COORDINATE_SYSTEM.MATTERPORT;
 let tempScaleFactor = "1";
 let tempMeasurementUnit = "meter";
 let tempRotationUnit = "radian";
 let tempBasepoint = undefined;
 let basepoint = undefined;
-let isSettingsSaved = false;
+let basepointObjectPayload = undefined;
+export let isAdjust = false;
 export function renderActionSettingsPane() {
     const element = document.createElement('div');
     element.classList.add('at_container');
@@ -135,7 +138,17 @@ export function actionSettingsSelectOption(element, id) {
 }
 export function initSettingsValues() {
     // set coordinate saystem
-    const coordinateSystemvalue = coordinateSystem;
+    let coordinateSystemvalue;
+    console.log("coordinateSystemvalue", coordinateSystemvalue);
+    if (coordinateSystem == COORDINATE_SYSTEM.MATTERPORT) {
+        coordinateSystemvalue = "matterport";
+    }
+    else if (coordinateSystem == COORDINATE_SYSTEM.BIM) {
+        coordinateSystemvalue = "bim";
+    }
+    else {
+        console.error("Coordinate system not found");
+    }
     const radioButton = document.querySelector(`input[name="coordinate-system"][value="${coordinateSystemvalue}"]`);
     if (radioButton) {
         radioButton.checked = true;
@@ -154,20 +167,26 @@ export function initSettingsValues() {
     const rotationUnitElement = document.getElementById(`at-selected-rotation-unit-text`);
     const rotationUnitValue = rotationUnit.charAt(0).toUpperCase() + rotationUnit.substring(1).toLowerCase();
     rotationUnitElement.innerText = i18n.t(rotationUnitValue);
+    const element = document.getElementById(`at-calibrate-basepoint-btn`);
     if (basepoint) {
-        const element = document.getElementById(`at-calibrate-basepoint-btn`);
         element.dataset.state = basepoint ? "adjust" : "calibrate";
         element.innerText = basepoint ? i18n.t("AdjustBasepoint") : i18n.t("CalibrateBasepoint");
         displayConvertedCoordinates(basepoint);
+        setTempBasepoint(basepoint);
+        // const index = _3DXObjects.findIndex(obj => obj.type = "BASEPOINT")
+        // const basepointPayload = _3DXObjects[index]
+        // setBasepointObjectPayload(basepointPayload.object)
     }
     else {
+        setBasepointObjectPayload(undefined);
         const convertedCoordinatesContainer = document.getElementById('at-converted-coordiantes-container');
         convertedCoordinatesContainer.style.display = 'none';
-        const element = document.getElementById(`at-calibrate-basepoint-btn`);
-        element.classList.remove('active');
         element.dataset.state = basepoint ? "adjust" : "calibrate";
         element.innerText = basepoint ? i18n.t("AdjustBasepoint") : i18n.t("CalibrateBasepoint");
     }
+    element.classList.remove("active");
+    clearSelectedObject();
+    removeTransformControls();
 }
 export function toggleCalibrateBasepoint() {
     return __awaiter(this, void 0, void 0, function* () {
@@ -176,6 +195,7 @@ export function toggleCalibrateBasepoint() {
         console.log("toggleCalibrateBasepoint()", element.innerText);
         console.log(element.innerText === i18n.t("CalibrateBasepoint"));
         console.log(typeof element.innerText, typeof i18n.t("CalibrateBasepoint"));
+        console.log("currentState", currentState);
         switch (currentState) {
             case "cancel":
                 element.dataset.state = tempBasepoint || basepoint ? "adjust" : "calibrate";
@@ -197,16 +217,35 @@ export function toggleCalibrateBasepoint() {
                 element.innerText = i18n.t("Cancel");
                 yield getTargetPosition((coords) => __awaiter(this, void 0, void 0, function* () {
                     console.log("coord", coords);
-                    coords.y = coords.y + 0.01;
-                    setTempBasepoint(coords);
+                    const newCoords = Object.assign({}, coords);
+                    newCoords.y = newCoords.y + 0.05;
+                    setTempBasepoint(newCoords);
                     const mediaUrl = getAssetUrl('images/basepointmarker.png');
                     const objectType = '';
-                    yield addObjectToSpace(mediaUrl, objectType, {
-                        position: coords,
+                    const objectPaylaod = {
+                        mediaUrl: mediaUrl,
+                        objectType: objectType,
+                    };
+                    basepointObjectPayload = yield addObjectToSpace(objectPaylaod.mediaUrl, objectPaylaod.objectType, {
+                        position: newCoords,
                         rotation: { x: 1.57079633, y: 0, z: 0 }
                     });
+                    basepointObjectPayload.object_data.uuid = generateUUID();
+                    basepointObjectPayload.object_data.id = Number(basepointObjectPayload.object_data.uuid);
+                    basepointObjectPayload.coordinate_system = COORDINATE_SYSTEM.MATTERPORT;
                     _3DXObjects[_3DXObjects.length - 1].type = 'BASEPOINT';
-                    displayConvertedCoordinates(coords);
+                    _3DXObjects[_3DXObjects.length - 1].object.coordinate_system = getCoordinateSystem() == 'matterport' ? 'yup' : 'zup';
+                    // make it display 4 decimals only
+                    const truncateToThreeDecimals = (num) => Math.floor(num * 1000) / 1000;
+                    const truncatedCoordinate = {
+                        x: truncateToThreeDecimals(newCoords.x),
+                        y: truncateToThreeDecimals(newCoords.y),
+                        z: truncateToThreeDecimals(newCoords.z),
+                    };
+                    displayConvertedCoordinates(truncatedCoordinate);
+                    console.log("_3DXObject", _3DXObjects);
+                    console.log("coords", coords);
+                    console.log("newCoords", newCoords);
                     element.dataset.state = "adjust";
                     element.innerText = i18n.t("AdjustBasepoint");
                     element.classList.remove("active");
@@ -217,13 +256,17 @@ export function toggleCalibrateBasepoint() {
                 element.innerText = i18n.t("Cancel");
                 const object = _3DXObjects.find(obj => obj.type == "BASEPOINT");
                 console.log("object", object);
+                // setup coordinate system
+                object.object.coordinate_system = getCoordinateSystem() == 'matterport' ? 'yup' : 'zup';
+                // sets currentState that is needed for modenlControlsPane
+                isAdjust = currentState == "adjust" ? true : false;
                 setSelectedObject(object.object, object.node, object.component, object.type);
                 const selectedObj = {
                     object: object.object,
                     node: object.node,
                     component: object.component
                 };
-                setTransformControls(selectedObj);
+                // setTransformControls(selectedObj)
                 toggleModelControl(true, 'translate');
                 break;
             default:
@@ -232,7 +275,8 @@ export function toggleCalibrateBasepoint() {
         element.classList.toggle("active");
     });
 }
-function displayConvertedCoordinates(payload) {
+export function displayConvertedCoordinates(payload) {
+    console.log("displayConvertedCoordinates()", payload);
     const convertedCoordinatesContainer = document.getElementById('at-converted-coordiantes-container');
     convertedCoordinatesContainer.style.display = 'flex';
     convertedCoordinatesContainer.innerHTML = ``;
@@ -248,9 +292,9 @@ function displayConvertedCoordinates(payload) {
         const element = document.getElementById(`at-xyz-coordinate-${idName}`);
         const isHidden = element.style.display === 'block' || element.style.display === '';
         element.style.display = isHidden ? 'none' : 'block';
-        // const chevronIcon = document.getElementById(`at-expand-btn-${faceId}`).querySelector(isHidden ? '.mdi-chevron-down' : '.mdi-chevron-up');
-        // chevronIcon.classList.toggle('mdi-chevron-down');
-        // chevronIcon.classList.toggle('mdi-chevron-up');
+        const chevronIcon = document.getElementById(`at-coordinate-title-${idName}`).querySelector(isHidden ? '.mdi-chevron-up' : '.mdi-chevron-down');
+        chevronIcon.classList.toggle('mdi-chevron-up');
+        chevronIcon.classList.toggle('mdi-chevron-down');
     });
     // displayCoordinateList()
 }
@@ -323,9 +367,9 @@ function displayCoordinatesItemTitle(title) {
     element.classList.add('at_coordinate_title_container');
     const idName = title.toLowerCase();
     element.innerHTML = `
-        <div class="at_coordinate_title" id="at-coordinate-title-${idName}" data-cy="">
+        <div class="at_coordinate_title" id="at-coordinate-title-${idName}" data-cy="at-coordinate-title-${idName}">
             ${i18n.t(title)}
-            <span class="mdi mdi-chevron-down" id="" data-cy=""></span>
+            <span class="mdi mdi-chevron-up" id="at-coordinate-title-icon-${idName}" data-cy="at-coordinate-title-icon-${idName}"></span>
         </div>
     `;
     return element;
@@ -422,3 +466,9 @@ export function setTempBasepoint(value) {
 export function getTempBasepoint() {
     return tempBasepoint;
 }
+export function getBasepointObjectPayload() {
+    return basepointObjectPayload;
+}
+export function setBasepointObjectPayload(payload) {
+    basepointObjectPayload = payload;
+}

package/lib/atwinui/components/toolbar/i18n.js

@@ -146,7 +146,11 @@ i18n
                 "UndoPlaceVertex": "Undo Place Vertex",
                 "RedoPlaceVertex": "Redo Place Vertex",
                 "HideShowAll": " Hide/Show All Rooms",
-                "Navigate": "Navigate"
+                "Navigate": "Navigate",
+                "ScaleFactor": "Scale Factor",
+                "SuccessSettingsSaved": "Successfully saved settings",
+                "ConvertedCoordinates": "Converted Coordinates",
+                "Origin": "Origin",
             }
         },
         ja: {
@@ -285,7 +289,13 @@ i18n
                 "UndoPlaceVertex": "頂点の配置を元に戻す",
                 "RedoPlaceVertex": "頂点の配置をやり直す",
                 "HideShowAll": "すべての部屋を非表示/表示",
-                "Navigate": "ナビゲート"
+                "Navigate": "ナビゲート",
+                "CalibrateBasepoint": "基準ポイント設定",
+                "AdjustBasepoint": "基準ポイント調整",
+                "ScaleFactor": "スケール比",
+                "SuccessSettingsSaved": "設定を保存しました",
+                "ConvertedCoordinates": "位置変換",
+                "Origin": "起点",
             }
         }
     },

package/lib/atwinui/components/toolbar/menuBar.js

@@ -51,7 +51,7 @@ export function renderMenuBar(iFrame) {
         <div class="at_icon_tooltip" data-cy="at-tooltip-theme">${i18n.t('RoomCreation')}</div>
     </div>
     <div class="at_sidebar_button_icon" style="display:${isBIMEnabled ? 'block' : 'none'}">
-        <img class="at_bim_settings_img" src="${bimImageIcon}" alt="bim" id="at-settings-btn" data-cy="at-settings-btn" target-pane="at-settings-pane"/>
+        <img class="mdi at_bim_settings_img" src="${bimImageIcon}" alt="bim" id="at-settings-btn" data-cy="at-settings-btn" target-pane="at-settings-pane"/>
         <div class="at_icon_tooltip" data-cy="at-tooltip-settings">${i18n.t('Settings')}</div>
     </div>
     `;
@@ -145,9 +145,6 @@ export function clearActiveMenu(id) {
     if (id != 'at-minimap-btn' && activeMenu) {
         // get child id
         let activeChildId = (_b = (_a = activeMenu.querySelector('.mdi')) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : undefined;
-        if (id == 'at-settings-btn') {
-            activeChildId = "at-settings-btn";
-        }
         log.info("activeChildId: ", activeChildId);
         // check if active menu and target menu id are the same
         // if true do not set inactive otherwise, remove

package/lib/atwinui/components/toolbar/modelControlsPane.d.ts

@@ -1,4 +1,4 @@
-import type { IShowcaseObject, Object3DPosition } from "../../../types";
+import { IShowcaseObject, Object3DPosition } from "../../../types";
 export declare let activeModelControlPane: boolean;
 export declare let modelControlPane: HTMLDivElement;
 export declare function renderModelControlPane(type?: string): HTMLDivElement;
@@ -8,3 +8,7 @@ export declare function getCoordinateValues(): Object3DPosition;
 export declare function clearCoordinateInputs(): void;
 export declare function showCurrentCoordinateValue(payload?: IShowcaseObject): void;
 export declare function handleModelControlInputs(): void;
+export declare function updateDisplayedCoordinates(): void;
+export declare function getSelectedObjectCoordinateSystem(): any;
+export declare function setSelectedObjectCoordinateSystem(payload: string): void;
+export declare function setCoordinateSystemType(): void;