architwin 1.10.6 → 1.10.8

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, 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 } from "./types";
 import * as minimap from './minimap';
 import '../static/sidebar.css';
 import '../static/map.css';
@@ -50,6 +50,7 @@ declare let state: State;
 declare let domMousePosition: Vector3;
 declare let isFitScreenOccupied: boolean;
 declare let isCdnMapDataAvailable: boolean;
+declare let _atwinConnections: ISdkConnections;
 declare let _onMouseClickInstance: any;
 declare let _modelDetails: MpSdk.Model.ModelDetails;
 declare const tagColors: string[];
@@ -686,4 +687,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, };
+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 };

package/lib/architwin.js

@@ -7383,4 +7383,4 @@ tubeLineType, _sceneObject, _tubes, drawPath, toggleSpaceNavigation, startDraw,
 // Space partition
 setSpacePartitionNodes, setCurrentPolygon, 
 // others
-getSpaceId, getCurrentPolygon, getPathBetweenSweeps, moveAlongPath, };
+getSpaceId, getCurrentPolygon, getPathBetweenSweeps, moveAlongPath, _atwinConnections };

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

@@ -141,6 +141,12 @@ i18n
                 "CoordinateNote": "The coordinate from your CAD or either BIM tools shall be internally converted to the appropriate coordinate used by the Matterport space.",
                 "CalibrateBasepoint": "Calibrate Basepoint",
                 "AdjustBasepoint": "Adjust Basepoint",
+                "Shorcuts": "Shortcuts",
+                "AddVertex": "Add Vertex",
+                "UndoPlaceVertex": "Undo Place Vertex",
+                "RedoPlaceVertex": "Redo Place Vertex",
+                "HideShowAll": " Hide/Show All Rooms",
+                "Navigate": "Navigate"
             }
         },
         ja: {
@@ -274,6 +280,12 @@ i18n
                 "Radian": "ラジアン",
                 "Degree": "度",
                 "CoordinateNote": "CAD または BIM ツールからの座標は、Matterport スペースで使用される適切な座標に内部的に変換される必要があります。",
+                "Shorcuts": "ショートカット",
+                "AddVertex": "頂点を追加",
+                "UndoPlaceVertex": "頂点の配置を元に戻す",
+                "RedoPlaceVertex": "頂点の配置をやり直す",
+                "HideShowAll": "すべての部屋を非表示/表示",
+                "Navigate": "ナビゲート"
             }
         }
     },

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

@@ -16,6 +16,7 @@ import { getCurrentEditRoomData } from './roomTreePane';
 import { toggleModal, setModalAction } from "../modal";
 import { Notyf } from 'notyf';
 import log from 'loglevel';
+import { getShortcutTooltipHTML } from '../static/common';
 let isDrawing = false;
 let roomFormMode = "ADD" /* FORM_MODE.ADD */;
 let isSaving = false;
@@ -33,7 +34,7 @@ let currentHighlightedFace = null;
 let previousPartitionData = null;
 let tempCurrentPolygon = undefined;
 export function renderRoomFormPane() {
-    console.info("__@ renderRoomFormPane");
+    console.info("__@ renderRoomFormPane: ", roomFormMode);
     const element = document.createElement('div');
     element.classList.add('at_container');
     element.classList.add('at_w-12');
@@ -243,7 +244,11 @@ function populatePartitionForm(partition) {
  */
 function displayFormTitle() {
     const title = document.getElementById('at-room-form-title');
-    title.innerHTML = '';
+    title.innerHTML = `
+        <span class="mdi mdi-keyboard at_pull_left at_icon_hover">
+            ${getShortcutTooltipHTML()}
+        </span>
+    `;
     const span = document.createElement('span');
     span.textContent = roomFormMode === 'ADD'
         ? i18n.t('AddRoom')

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

@@ -13,6 +13,7 @@ import i18n from "../i18n";
 import { getCurrentPolygonData, setPartitionFormMode } from "./roomFormPane";
 import { SPACE_EVENTS } from "../../../../types";
 import { _3DXObjects, dispatchSpaceEvent, getChildrenOfModel, goToModel, renderPolygon, setSelectedObject } from "../../../../architwin";
+import { getShortcutTooltipHTML } from "../static/common";
 let roomDataArray = [];
 let currentEditRoomData = null;
 let currentSelectedPartitionId = null;
@@ -31,6 +32,9 @@ export function renderRoomTreePane() {
     element.setAttribute('data-cy', 'at-room-tree-pane');
     element.innerHTML = `
         <div class="at_panel_header">
+            <span class="mdi mdi-keyboard at_pull_left at_icon_hover">
+                ${getShortcutTooltipHTML()}
+            </span>
             <span>${i18n.t('RoomTree')}</span>
         </div>
 

package/lib/atwinui/components/toolbar/static/common.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Returns the HTML string for the shortcut tooltip.
+ */
+export declare function getShortcutTooltipHTML(): string;

package/lib/atwinui/components/toolbar/static/common.js

@@ -0,0 +1,17 @@
+import i18n from "../i18n";
+/**
+ * Returns the HTML string for the shortcut tooltip.
+ */
+export function getShortcutTooltipHTML() {
+    const tooltipElement = `
+    <span class="at_custom_tooltip">
+        <span class="at_tooltip_title">${i18n.t('Shorcuts')}</span>
+        <span class="shortcut">Alt (⌥) + Click</span> ${i18n.t('AddVertex')} 
+        <span class="at_ml_4 shortcut" >Ctrl (^) + Z</span> ${i18n.t('UndoPlaceVertex')} <br>
+        <span class="shortcut">Ctrl (^) + Shift + Z</span> ${i18n.t('RedoPlaceVertex')}
+        <span class="at_ml_4 shortcut">F8</span> ${i18n.t('HideShowAll')} <br>
+        <span class="shortcut">Click</span> ${i18n.t('Navigate')}
+    </span>
+    `;
+    return tooltipElement;
+}

package/lib/loaders/polydrawerLoader.js

@@ -1,5 +1,5 @@
 import { Pane } from 'tweakpane';
-import { dispatchSpaceEvent, renderPolygon, getPolygonFloorOffset, getCurrentFloor, getWallBaseHeight } from "../architwin";
+import { dispatchSpaceEvent, renderPolygon, getPolygonFloorOffset, getCurrentFloor, getWallBaseHeight, getFloorBaseHeight } from "../architwin";
 import { SPACE_EVENTS } from "../types";
 import { getPolygonArea } from "../utils";
 import { PolygonCalculator, WallCalculator } from "../math";
@@ -398,6 +398,13 @@ export class Vertice {
             //this.pointerIntersection.object  === 'intersectedobject.model'
             if (this.pointerIntersection.object) {
                 let e = Object.assign({}, this.pointerIntersection.position);
+                const floorLevel = getFloorBaseHeight();
+                if (floorLevel != undefined) {
+                    e.y = floorLevel;
+                }
+                else {
+                    e.y = this.mesh.position.y;
+                }
                 this.mesh.position.set(e.x, e.y, e.z);
                 //this.mesh.children[0].position.set(e.x, e.y, e.z)
                 //@ts-expect-error

package/package.json

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

package/static/atwinui.css

@@ -1505,6 +1505,78 @@
     padding-right: 5px;
 }
 
+.at_icon_hover {
+    padding-right: 0.5em;
+    padding-left: 0.5em;
+    border-radius: 4px;
+    transition: background-color 0.2s ease-in-out;
+    position: relative;
+}
+
+.at_icon_hover:hover {
+    background-color: rgba(128, 128, 128, 0.5);
+}
+
+.at_custom_tooltip {
+    position: absolute;
+    top: 120%;
+    left: 50%;
+    transform: translateX(-50%);
+    background-color: rgba(0, 0, 0, 0.9);
+    color: white;
+    padding: 8px 12px;
+    font-size: 12px;
+    border-radius: 6px;
+    text-align: left;
+    opacity: 0;
+    visibility: hidden;
+    transition: opacity 0.2s ease-in-out;
+    width: max-content;
+    max-width: none;
+    z-index: 10;
+    white-space: nowrap;
+}
+
+.at_icon_hover:hover .at_custom_tooltip {
+    opacity: 1;
+    visibility: visible;
+}
+
+.at_custom_tooltip .shortcut {
+    background-color: rgba(128, 128, 128, 0.3);
+    padding: 2px 6px;
+    border-radius: 4px;
+    font-family: monospace;
+    font-weight: bold;
+    color: white;
+    display: inline-block;
+    margin: 2px 0;
+}
+
+/* Tooltip Arrow */
+.at_custom_tooltip::after {
+    content: "";
+    position: absolute;
+    top: -10px;
+    left: 50%;
+    transform: translateX(-50%);
+    border-width: 5px;
+    border-style: solid;
+    border-color: transparent transparent black transparent;
+}
+
+.at_icon_hover:hover .at_custom_tooltip {
+    display: block;
+}
+
+.at_tooltip_title {
+    display: block;
+    font-weight: bold;
+    text-align: center;
+    margin-bottom: 3px;
+    font-size: 14px;
+}
+
 /* BIM */
 .at_mt_static_text_container {
     text-align: center;

package/static/utility.css

@@ -257,10 +257,33 @@ width: 100vw;
     float: right;
   }
 
+  .at_pull_left {
+    float: left;
+  }
   .at_mx-auto {
     margin: auto;
   }
 
+  .at_ml_0 {
+    margin-left: 0 !important;
+  }
+
+  .at_ml_1 {
+    margin-left: 0.25rem !important;
+  }
+
+  .at_ml_2 {
+    margin-left: 0.5rem !important;
+  }
+
+  .at_ml_3 {
+    margin-left: 0.75rem !important;
+  }
+
+  .at_ml_4 {
+    margin-left: 1rem !important;
+  }
+  
   .at_gap_1 {
     gap: 0.25rem;
   }