architwin 1.10.14 → 1.10.16

package/lib/architwin.d.ts

@@ -463,7 +463,7 @@ declare function getCurrentPolygon(): IObjectData;
  * @param {MpSdk.Scene.IComponent} component - Component of the model
  * @param {string} name - name of the model
  */
-declare function toggleMeshChildrenVisibility(component: MpSdk.Scene.IComponent, name: string): boolean;
+declare function toggleMeshChildrenVisibility(component: MpSdk.Scene.IComponent, name: string, visible?: boolean): boolean;
 /**
  * Updates the value of a property of a child of the mesh
  * @param {MpSdk.Scene.IComponent} component - Component of the model
@@ -478,13 +478,13 @@ declare function setMeshChildrenMaterialProperty(component: MpSdk.Scene.ICompone
  * @param {MpSdk.Scene.IComponent} component - Component of the model
  * @param {string} name - name of the model
  */
-declare function toggleWallVisibility(component: MpSdk.Scene.IComponent, name: string): boolean;
+declare function toggleWallVisibility(component: MpSdk.Scene.IComponent, name: string, visible?: boolean): boolean;
 /**
  * Wrapper function around toggleMeshChildrenVisibility
  * @param {MpSdk.Scene.IComponent} component - Component of the model
  * @param {string} name - name of the model
  */
-declare function toggleFloorVisibility(component: MpSdk.Scene.IComponent, name: string): boolean;
+declare function toggleFloorVisibility(component: MpSdk.Scene.IComponent, name: string, visible?: boolean): boolean;
 /**
  * Returns the children of a model's component
  * @param component

package/lib/architwin.js

@@ -442,7 +442,6 @@ 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;
                     log.info("appState", appState);
                     if (appState.phase === _atwin.App.Phase.LOADING) {
                         log.info("App is loading...");
@@ -757,33 +756,9 @@ 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_base) {
-                                    setBasepoint((_m = spaceJsonData === null || spaceJsonData === void 0 ? void 0 : spaceJsonData.coordSystemCalibration) === null || _m === void 0 ? void 0 : _m.bim.project_base);
-                                }
-                            }
-                            if ((_o = spaceJsonData === null || spaceJsonData === void 0 ? void 0 : spaceJsonData.coordSystemCalibration) === null || _o === void 0 ? void 0 : _o.bim.mp_project_base) {
-                                console.log("THERE IS A BASEPOINT");
-                                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((_p = spaceJsonData === null || spaceJsonData === void 0 ? void 0 : spaceJsonData.coordSystemCalibration) === null || _p === void 0 ? void 0 : _p.bim.mp_project_base);
-                            }
-                        }
+                    }
+                    if (isToolbarFeatureEnabled('bim')) {
+                        initBimSettings();
                     }
                 }));
                 return _atwin;
@@ -3552,7 +3527,7 @@ function addObjectToSpace(mediaUrl, objectType, config = undefined, object_data)
                 if (config) {
                     if (config.json_data) {
                         const jsonData = JSON.parse(config.json_data);
-                        console.log("__@ JOCHELLE jsonData: ", jsonData);
+                        console.log("__@ jsonData: ", jsonData);
                         showcase_object.json_data = config.json_data;
                         if (jsonData.coordSystemCalibration) {
                             const thisCoordSystemCal = jsonData.coordSystemCalibration;
@@ -5028,10 +5003,10 @@ function goToModel(objectId) {
         const target = _3DXObjects.find(obj => obj.object.id === objectId || obj.object.media_viewer_id === objectId);
         if (target) {
             const noBillboardTag = target.node.id;
-            _atwin.Tag.allowAction(noBillboardTag, {
-                navigating: true,
-                // implies opening: false, etc
-            });
+            // _atwin.Tag.allowAction(noBillboardTag, {
+            //   navigating: true,
+            //   // implies opening: false, etc
+            // });
         }
         log.info("goToModel ", target);
         if (target.node.position.x || target.node.position.y || target.node.position.z) {
@@ -5929,7 +5904,7 @@ function addVertex(name, path) {
  * @param {MpSdk.Scene.IComponent} component - Component of the model
  * @param {string} name - name of the model
  */
-function toggleMeshChildrenVisibility(component, name) {
+function toggleMeshChildrenVisibility(component, name, visible) {
     if (!component) {
         log.error("Component is undefined");
         return;
@@ -5941,7 +5916,7 @@ function toggleMeshChildrenVisibility(component, name) {
     //@ts-expect-error
     component.mesh.children.forEach(child => {
         if (child.name == name) {
-            child.visible = !child.visible;
+            child.visible = visible !== undefined ? visible : !child.visible;
             return child.visible;
         }
     });
@@ -6013,7 +5988,7 @@ function setMeshChildrenMaterialProperty(component, name, key, value) {
  * @param {MpSdk.Scene.IComponent} component - Component of the model
  * @param {string} name - name of the model
  */
-function toggleWallVisibility(component, name) {
+function toggleWallVisibility(component, name, visible) {
     if (!component) {
         log.error("Component is undefined");
         return;
@@ -6022,10 +5997,10 @@ function toggleWallVisibility(component, name) {
         log.error("name is undefined");
         return;
     }
-    const state = toggleMeshChildrenVisibility(component, name);
+    const state = toggleMeshChildrenVisibility(component, name, visible);
     // const wallLabelName = replaceWordInString(name,'wall','wallLabel')
     const wallLabelName = name.replace("wall", "wallLabel");
-    toggleMeshChildrenVisibility(component, wallLabelName);
+    toggleMeshChildrenVisibility(component, wallLabelName, visible);
     return state;
 }
 /**
@@ -6033,7 +6008,7 @@ function toggleWallVisibility(component, name) {
  * @param {MpSdk.Scene.IComponent} component - Component of the model
  * @param {string} name - name of the model
  */
-function toggleFloorVisibility(component, name) {
+function toggleFloorVisibility(component, name, visible) {
     log.info("TEST toggleFloorVisibility: ", component, name);
     if (!component) {
         log.error("Component is undefined");
@@ -6043,7 +6018,7 @@ function toggleFloorVisibility(component, name) {
         log.error("name is undefined");
         return;
     }
-    const state = toggleMeshChildrenVisibility(component, name);
+    const state = toggleMeshChildrenVisibility(component, name, visible);
     //@ts-expect-error
     const edgeCount = component.inputs.path.length;
     if (edgeCount !== undefined) {
@@ -6052,13 +6027,13 @@ function toggleFloorVisibility(component, name) {
         if (parts.length > 1) {
             const uuid = parts[0];
             for (let index = 0; index < edgeCount; index++) {
-                toggleMeshChildrenVisibility(component, `${uuid}_edgeLabel-${index}`);
+                toggleMeshChildrenVisibility(component, `${uuid}_edgeLabel-${index}`, visible);
             }
         }
         else {
             for (let index = 0; index < edgeCount; index++) {
                 edgeLabelNames.push(`edgeLabel-${index}`);
-                toggleMeshChildrenVisibility(component, `edgeLabel-${index}`);
+                toggleMeshChildrenVisibility(component, `edgeLabel-${index}`, visible);
             }
         }
     }
@@ -6302,7 +6277,7 @@ function handleKeyDown(event) {
         isCtrlPressed = true;
         toggleSpaceNavigation(false);
     }
-    if (event.altKey) {
+    if (event.key == 'Alt') {
         log.info("Alt key down");
         isAltPressed = true;
         toggleSpaceNavigation(false);
@@ -6336,18 +6311,19 @@ function handleKeyDown(event) {
         lastKeyPressed = event.key;
 }
 function handleKeyUp(event) {
+    log.info("handleKeyUp() ", event);
     if (event.key === "Control") {
-        log.info("Ctrl key down");
+        log.info("Ctrl key up");
         isCtrlPressed = false;
         toggleSpaceNavigation(true);
     }
-    if (event.altKey) {
-        log.info("Alt key down");
+    if (event.key == 'Alt') {
+        log.info("Alt key up");
         isAltPressed = false;
         toggleSpaceNavigation(true);
     }
     if (event.key === "Shift") {
-        log.info("Ctrl key down");
+        log.info("Ctrl key up");
         isShiftPressed = false;
     }
 }
@@ -6362,6 +6338,41 @@ function setupKeybindingEventListeners(iframe) {
     window.addEventListener('keydown', handleKeyDown);
     window.addEventListener('keyup', handleKeyUp);
 }
+function initBimSettings() {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+    try {
+        if (_currentSpace && _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()
+                log.info("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_base) {
+                    setBasepoint((_m = spaceJsonData === null || spaceJsonData === void 0 ? void 0 : spaceJsonData.coordSystemCalibration) === null || _m === void 0 ? void 0 : _m.bim.project_base);
+                }
+            }
+            if ((_o = spaceJsonData === null || spaceJsonData === void 0 ? void 0 : spaceJsonData.coordSystemCalibration) === null || _o === void 0 ? void 0 : _o.bim.mp_project_base) {
+                console.log("THERE IS A BASEPOINT");
+                const index = _3DXObjects.findIndex(obj => obj.object.object_data.amazon_uri == "https://cdn.jsdelivr.net/npm/architwin@latest/static/images/basepointmarker.png");
+                log.info("_3DXObjects", _3DXObjects[index], index);
+                if (index != -1) {
+                    _3DXObjects[index].type = "BASEPOINT";
+                }
+                setBasepointObjectPayload((_p = spaceJsonData === null || spaceJsonData === void 0 ? void 0 : spaceJsonData.coordSystemCalibration) === null || _p === void 0 ? void 0 : _p.bim.mp_project_base);
+            }
+        }
+    }
+    catch (error) {
+        log.error("initBimSettings error ", error);
+    }
+}
 //===================== END KEYBINDING =========================//
 //===================== START TAGS =========================//
 // set tag icon

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

@@ -107,10 +107,16 @@ export function renderActionSettingsPane() {
                 </div>
             </div>
 
-            <div class="at_button at_ghost" id="at-save-settings" data-cy="at-save-settings">
-                ${i18n.t('Save')}
-                <span class="mdi mdi-content-save"></span>
-            </div>
+            <div class="at_button_row at_justify_between" >
+                <div class="at_button at_ghost" id="at-cancel-settings" data-cy="at-save-settings">
+                    ${i18n.t('Cancel')}
+                    <span class="mdi mdi-close-circle-outline"></span>
+                </div>                
+                <div class="at_button at_ghost" id="at-save-settings" data-cy="at-save-settings">
+                    ${i18n.t('Save')}
+                    <span class="mdi mdi-content-save"></span>
+                </div>
+            </div>       
     `;
     return element;
 }
@@ -192,6 +198,7 @@ export function initSettingsValues() {
     // set measurement unit
     const measurementUnitElement = document.getElementById(`at-selected-measurement-unit-text`);
     let measurementUnitValue = `${i18n.t('Meter')}`;
+    console.log("=============measurement from document", measurementUnitValue, measurementUnit == UNITS.METER);
     if (measurementUnit == UNITS.METER) {
         measurementUnitValue = `${i18n.t('Meter')}`;
     }
@@ -530,7 +537,10 @@ export function setCoordinateSystem(value) {
     coordinateSystem = value;
     let text = value;
     text = text.charAt(0).toUpperCase() + text.substring(1).toLowerCase();
-    document.getElementById('at-coordinate-system-text').innerText = `${i18n.t("CoordinateSystem")}: ${i18n.t(text)}`;
+    const el = document.getElementById('at-coordinate-system-text');
+    if (el) {
+        el.innerText = `${i18n.t("CoordinateSystem")}: ${i18n.t(text)}`;
+    }
     console.log("Coordinate System set to:", value);
 }
 export function getScaleFactor() {
@@ -544,7 +554,21 @@ export function getMeasurementUnit() {
     return measurementUnit;
 }
 export function setMeasurementUnit(value) {
-    measurementUnit = value;
+    if (value == 'm') {
+        measurementUnit = UNITS.METER;
+    }
+    else if (value == 'mm') {
+        measurementUnit = UNITS.MILLIMETER;
+    }
+    else if (value == 'cm') {
+        measurementUnit = UNITS.CENTIMETER;
+    }
+    else if (value == 'ft') {
+        measurementUnit = UNITS.FOOT;
+    }
+    else if (value == 'in') {
+        measurementUnit = UNITS.INCH;
+    }
     console.log("Measurement Unit set to:", value);
 }
 export function getRotationUnit() {
@@ -567,7 +591,22 @@ export function getTempScaleFactor() {
     return tempScaleFactor;
 }
 export function setTempMeasurementUnit(value) {
-    tempMeasurementUnit = value;
+    if (value == 'm') {
+        tempMeasurementUnit = UNITS.METER;
+    }
+    else if (value == 'mm') {
+        tempMeasurementUnit = UNITS.MILLIMETER;
+    }
+    else if (value == 'cm') {
+        tempMeasurementUnit = UNITS.CENTIMETER;
+    }
+    else if (value == 'ft') {
+        tempMeasurementUnit = UNITS.FOOT;
+    }
+    else if (value == 'in') {
+        tempMeasurementUnit = UNITS.INCH;
+    }
+    console.log("Temp Measurement Unit set to:", value);
 }
 export function getTempMeasurementUnit() {
     return tempMeasurementUnit;

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

@@ -2,7 +2,7 @@ import { Notyf } from "notyf";
 import i18n from "./i18n";
 import { _3DXObjects, getSelectedObject } from "../../../architwin";
 import { UNITS } from "../../../types";
-import { getMeasurementUnit, getTempBasepoint, getTempMeasurementUnit } from "./actionSettingsPane";
+import { getBasepoint, getMeasurementUnit, getTempBasepoint, getTempMeasurementUnit } from "./actionSettingsPane";
 import { convertMeasurement } from "../../../utils";
 let notyf = new Notyf({ position: { x: 'left', y: 'bottom' }, duration: 4500 });
 export function renderBasepointCalibratePane() {
@@ -91,12 +91,23 @@ export function initBsepointCalibratePane() {
     const measurementUnit = getMeasurementUnit();
     const tempMeasurementUnit = getTempMeasurementUnit();
     const tempBasepoint = getTempBasepoint();
+    const basepoint = getBasepoint();
+    let bpXValues;
+    let bpYValues;
+    let bpZValues;
+    if (tempBasepoint) {
+        bpXValues = tempBasepoint.x;
+        bpYValues = tempBasepoint.y;
+        bpZValues = tempBasepoint.z;
+    }
+    else if (basepoint) {
+        bpXValues = basepoint.x;
+        bpYValues = basepoint.y;
+        bpZValues = basepoint.z;
+    }
     let mpXValues = object.object.object_position.x;
     let mpYValues = object.object.object_position.y;
     let mpZValues = object.object.object_position.z;
-    let bpXValues = tempBasepoint.x;
-    let bpYValues = tempBasepoint.y;
-    let bpZValues = tempBasepoint.z;
     if (measurementUnit != UNITS.METER) {
         //     if(tempMeasurementUnit == measurementUnit){
         mpXValues = convertMeasurement(mpXValues, UNITS.METER, measurementUnit);

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

@@ -7,12 +7,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { goToModel, setSelectedObject, get3DXObjects, getLibrary, getTargetPosition, addObjectToSpace, _mpConfig, dispatchSpaceEvent, removeTransformControls, _onMouseClickInstance, cancelModelPlacement } from "../../../architwin";
+import { goToModel, setSelectedObject, get3DXObjects, getLibrary, getTargetPosition, addObjectToSpace, _mpConfig, dispatchSpaceEvent, removeTransformControls, _onMouseClickInstance, cancelModelPlacement, isToolbarFeatureEnabled, convertYupToZup } from "../../../architwin";
 import { SPACE_EVENTS } from "../../../types";
 import { toggleDisplayPane, cancelModelPlacementPrompt } from "../../events";
 import { clearActiveActionBtn } from "./actionBar";
 import { Notyf } from 'notyf';
 import i18n from './i18n';
+import { getBasepoint, getCoordinateSystem, getMPBasepoint } from "./actionSettingsPane";
 let activeCard, activeLibraryCard;
 let _basePath = '../../../../architwin/static';
 export function renderObjectCard(payload, objectComponent) {
@@ -250,6 +251,17 @@ export function setActiveLibraryCard(cardId) {
             yield getTargetPosition((coords) => __awaiter(this, void 0, void 0, function* () {
                 const payload = yield addObjectToSpace(selectedObject.amazon_uri, selectedObject.object_type, { position: coords });
                 payload.object_data = selectedObject;
+                if (isToolbarFeatureEnabled('bim')) {
+                    payload.coordinate_system = getCoordinateSystem();
+                    const thisObjBimPosition = convertYupToZup(payload.object_position, getMPBasepoint(), getBasepoint());
+                    console.log("======thisObjBimPosition: ", thisObjBimPosition);
+                    const coordPayload = {
+                        coord_system: getCoordinateSystem(),
+                        bim_coordinates: thisObjBimPosition
+                    };
+                    payload.json_data = JSON.stringify({ coordSystemCalibration: coordPayload });
+                }
+                console.log("======Payload:", payload);
                 dispatchSpaceEvent(SPACE_EVENTS.MODEL_RENDERED, { model: payload });
                 clearActiveLibraryCard();
                 toggleDisplayPane('at-cancel-library-btn');

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

@@ -9,9 +9,10 @@ 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 updateSelectedObject(): void;
 export declare function getSelectedObjectCoordinateSystem(): any;
 export declare function setSelectedObjectCoordinateSystem(payload: string): void;
 export declare function setCoordinateSystemType(): void;
-export declare function displayMTCoordinates(): void;
-export declare function getBimCoordinate(): Vector3;
+export declare function displayConvertedObjectCoordinates(): void;
+export declare function setConvertedBimPosition(bimPos: Vector3): void;
+export declare function getConvertedBimPosition(): Vector3;