@realsee/dnalogel 2.0.0-alpha.42 → 2.0.0-alpha.45

package/dist/floorplan/TopviewFloorplanPlugin/index.js

@@ -30,31 +30,6 @@ function _interopNamespace(e) {
 
 var THREE__namespace = /*#__PURE__*/_interopNamespace(THREE);
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
 /**
  * 检查一个值是否是狭义上的对象
  * @param {any} value 要检查的值
@@ -3531,26 +3506,22 @@ class Main extends internal.SvelteComponent {
 	}
 }
 
-function formatOutlines(outlines) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const headers = new Headers({ 'Content-Type': 'text/plain' });
-        const getOutlineItem = function (item) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const outlineItem = {
-                    index: item.index,
-                    url: item.url,
-                    svgUrl: item.svg_url,
-                };
-                if (item.svg_url) {
-                    const svgContent = yield fetch(item.svg_url, { headers }).then((res) => res.text());
-                    outlineItem.svgContent = svgContent;
-                }
-                return outlineItem;
-            });
+async function formatOutlines(outlines) {
+    const headers = new Headers({ 'Content-Type': 'text/plain' });
+    const getOutlineItem = async function (item) {
+        const outlineItem = {
+            index: item.index,
+            url: item.url,
+            svgUrl: item.svg_url,
         };
-        const svgOutlineItems = yield Promise.all(outlines.map(getOutlineItem));
-        return svgOutlineItems;
-    });
+        if (item.svg_url) {
+            const svgContent = await fetch(item.svg_url, { headers }).then((res) => res.text());
+            outlineItem.svgContent = svgContent;
+        }
+        return outlineItem;
+    };
+    const svgOutlineItems = await Promise.all(outlines.map(getOutlineItem));
+    return svgOutlineItems;
 }
 function formatRoom(data) {
     const floorplanRoomItem = {
@@ -3596,21 +3567,19 @@ function formatFloorplanEntrance(data) {
     };
     return floorplanEntrance;
 }
-function formatData(data) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const outlines = yield formatOutlines(data.outlines);
-        const bounding = data.computed_data.bounding;
-        const floorDatas = data.computed_data.floor_datas.map(formatFloorData);
-        const entrance = data.computed_data.entrance ? formatFloorplanEntrance(data.computed_data.entrance) : null;
-        const floorplanData = {
-            outlines,
-            entrance,
-            bounding,
-            floorDatas,
-            observers: data.computed_data.observers.map(formateFloorplanObserver),
-        };
-        return floorplanData;
-    });
+async function formatData(data) {
+    const outlines = await formatOutlines(data.outlines);
+    const bounding = data.computed_data.bounding;
+    const floorDatas = data.computed_data.floor_datas.map(formatFloorData);
+    const entrance = data.computed_data.entrance ? formatFloorplanEntrance(data.computed_data.entrance) : null;
+    const floorplanData = {
+        outlines,
+        entrance,
+        bounding,
+        floorDatas,
+        observers: data.computed_data.observers.map(formateFloorplanObserver),
+    };
+    return floorplanData;
 }
 
 /**
@@ -3695,37 +3664,35 @@ function nearlyEqual(num1, num2, accuracy = 4) {
 /** 等待 five changeMode 结束
  * @description Promise 的状态只代表 mode 与预期是否一致，不保证参数的一致性
  */
-function changeMode(five, changeModeParams) {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield new Promise((resolve, reject) => {
-            // 虽然 changeMode 是异步函数，但不代表异步流程结束代表切换 Mode 动画结束
-            five.changeMode(...changeModeParams).catch((error) => reject(error));
-            five.once('initAnimationEnded', () => {
-                const fiveCurrentState = five.getCurrentState();
-                const correctMode = changeModeParams[0];
-                if (fiveCurrentState.mode !== correctMode)
-                    reject(new Error('mode 与预期不符'));
-                /** 检测当前的 current pose 和传入的 pose 是否一致 */
-                const checkPose = () => {
-                    const correctPose = changeModeParams[1];
-                    if (!correctPose)
+async function changeMode(five, changeModeParams) {
+    await new Promise((resolve, reject) => {
+        // 虽然 changeMode 是异步函数，但不代表异步流程结束代表切换 Mode 动画结束
+        five.changeMode(...changeModeParams).catch((error) => reject(error));
+        five.once('initAnimationEnded', () => {
+            const fiveCurrentState = five.getCurrentState();
+            const correctMode = changeModeParams[0];
+            if (fiveCurrentState.mode !== correctMode)
+                reject(new Error('mode 与预期不符'));
+            /** 检测当前的 current pose 和传入的 pose 是否一致 */
+            const checkPose = () => {
+                const correctPose = changeModeParams[1];
+                if (!correctPose)
+                    return true;
+                return Object.keys(correctPose).every((key) => {
+                    const fivePoseItem = fiveCurrentState[key];
+                    if (fivePoseItem === undefined)
                         return true;
-                    return Object.keys(correctPose).every((key) => {
-                        const fivePoseItem = fiveCurrentState[key];
-                        if (fivePoseItem === undefined)
-                            return true;
-                        const correctPoseItem = correctPose[key];
-                        if (typeof fivePoseItem === 'number' && typeof correctPoseItem === 'number') {
-                            return nearlyEqual(fivePoseItem, correctPoseItem, 2);
-                        }
-                        return fivePoseItem === correctPoseItem;
-                    });
-                };
-                const checkPoseResult = checkPose();
-                if (!checkPoseResult)
-                    reject(new Error('five pose 与预期不符'));
-                resolve();
-            });
+                    const correctPoseItem = correctPose[key];
+                    if (typeof fivePoseItem === 'number' && typeof correctPoseItem === 'number') {
+                        return nearlyEqual(fivePoseItem, correctPoseItem, 2);
+                    }
+                    return fivePoseItem === correctPoseItem;
+                });
+            };
+            const checkPoseResult = checkPose();
+            if (!checkPoseResult)
+                reject(new Error('five pose 与预期不符'));
+            resolve();
         });
     });
 }
@@ -4072,24 +4039,22 @@ class Controller extends Controller$1 {
         five.once('dispose', this.dispose);
         this.addEventListener();
     }
-    load(serverData, state, userAction = true) {
-        return __awaiter(this, void 0, void 0, function* () {
-            function isPluginServerData(serverData) {
-                return Object.prototype.hasOwnProperty.apply(serverData, ['version']);
-            }
-            const _data = serverData;
-            if (_data && !_data.version)
-                console.warn('传入 serverData.data 的方式后续可能不再支持，请把 serverData 整体传入 load 函数');
-            const copyData = JSON.parse(JSON.stringify(serverData));
-            const _serverData = isPluginServerData(copyData) ? copyData.data : copyData;
-            const prevData = this.data;
-            this.data = yield formatData(_serverData);
-            this.hooks.emit('dataLoaded', this.data);
-            this.hooks.emit('dataChange', this.data, prevData);
-            if (state)
-                this.updateState(state, userAction);
-            this.render();
-        });
+    async load(serverData, state, userAction = true) {
+        function isPluginServerData(serverData) {
+            return Object.prototype.hasOwnProperty.apply(serverData, ['version']);
+        }
+        const _data = serverData;
+        if (_data && !_data.version)
+            console.warn('传入 serverData.data 的方式后续可能不再支持，请把 serverData 整体传入 load 函数');
+        const copyData = JSON.parse(JSON.stringify(serverData));
+        const _serverData = isPluginServerData(copyData) ? copyData.data : copyData;
+        const prevData = this.data;
+        this.data = await formatData(_serverData);
+        this.hooks.emit('dataLoaded', this.data);
+        this.hooks.emit('dataChange', this.data, prevData);
+        if (state)
+            this.updateState(state, userAction);
+        this.render();
     }
     /** 更新户型图位置 */
     updatePosition() {
@@ -4114,25 +4079,21 @@ class Controller extends Controller$1 {
         this.render();
         return this;
     }
-    show(options = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // 已经展示完成了，不做任何操作
-            if (this.state.visible)
-                return;
-            const userAction = options.userAction !== undefined ? options.userAction : true;
-            this.updateState({ visible: true }, userAction);
-            this._show({ userAction });
-        });
+    async show(options = {}) {
+        // 已经展示完成了，不做任何操作
+        if (this.state.visible)
+            return;
+        const userAction = options.userAction !== undefined ? options.userAction : true;
+        this.updateState({ visible: true }, userAction);
+        this._show({ userAction });
     }
-    hide(options = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.isHiddenByHideFunc = true;
-            if (!this.state.visible)
-                return;
-            const userAction = options.userAction !== undefined ? options.userAction : true;
-            this.updateState({ visible: false }, userAction);
-            this._hide({ userAction });
-        });
+    async hide(options = {}) {
+        this.isHiddenByHideFunc = true;
+        if (!this.state.visible)
+            return;
+        const userAction = options.userAction !== undefined ? options.userAction : true;
+        this.updateState({ visible: false }, userAction);
+        this._hide({ userAction });
     }
     enable(options = {}) {
         if (this.state.enabled)
@@ -4162,42 +4123,36 @@ class Controller extends Controller$1 {
             state.visible ? this._show(options) : this._hide(options);
         }
     }
-    formatData(serverData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield formatData(serverData.data);
-        });
+    async formatData(serverData) {
+        return await formatData(serverData.data);
     }
-    _show(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.state.enabled)
-                return;
-            this.isHiddenByHideFunc = false;
-            const { userAction } = options;
-            this.hooks.emit('show', { userAction });
-            if (this.five.getCurrentState().mode !== 'Topview') {
-                yield changeMode(this.five, ['Topview', undefined, undefined, userAction]);
-            }
-            this.five.model.show(this.floorIndex);
-            this.updatePosition();
-            this.updateSize();
-            const renderDuration = 500;
-            const modelOpacity = this.state.config.modelOpacity;
-            changeModelCanvasOpacity(this.five, modelOpacity, renderDuration);
-            this.hooks.emit('showAnimationEnded', { userAction });
-            this.render();
-        });
+    async _show(options) {
+        if (!this.state.enabled)
+            return;
+        this.isHiddenByHideFunc = false;
+        const { userAction } = options;
+        this.hooks.emit('show', { userAction });
+        if (this.five.getCurrentState().mode !== 'Topview') {
+            await changeMode(this.five, ['Topview', undefined, undefined, userAction]);
+        }
+        this.five.model.show(this.floorIndex);
+        this.updatePosition();
+        this.updateSize();
+        const renderDuration = 500;
+        const modelOpacity = this.state.config.modelOpacity;
+        changeModelCanvasOpacity(this.five, modelOpacity, renderDuration);
+        this.hooks.emit('showAnimationEnded', { userAction });
+        this.render();
     }
-    _hide(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.state.enabled)
-                return;
-            const { userAction } = options;
-            this.hooks.emit('hide', { userAction });
-            const modelOpacity = 1;
-            const renderDuration = 0;
-            changeModelCanvasOpacity(this.five, modelOpacity, renderDuration);
-            this.render();
-        });
+    async _hide(options) {
+        if (!this.state.enabled)
+            return;
+        const { userAction } = options;
+        this.hooks.emit('hide', { userAction });
+        const modelOpacity = 1;
+        const renderDuration = 0;
+        changeModelCanvasOpacity(this.five, modelOpacity, renderDuration);
+        this.render();
     }
     _enable(options) {
         const { userAction } = options;

package/dist/floorplan/typings/floorplanServerData.d.ts

@@ -118,11 +118,24 @@ export interface FloorplanServerObserver {
     position: FloorplanServerPosition;
     position_in_image: FloorplanServerImagePosition;
 }
+export interface FloorplanServerDoorPosition {
+    x: number;
+    y: number;
+    z: number;
+}
+export interface FloorplanServerDoorItem {
+    id: string;
+    localName: string;
+    name: string;
+    position: FloorplanServerDoorPosition;
+    rad: number;
+}
 export interface FloorplanServerComputedData {
     floor_datas: FloorplanServerFloorData[];
     entrance: FloorplanServerEntrance | null;
     bounding: FloorplanServerBounding;
     observers: FloorplanServerObserver[];
+    doors: FloorplanServerDoorItem[];
 }
 /** 原始输入的户型图数据 */
 export interface FloorplanServerData {

package/dist/index.d.ts

@@ -14,4 +14,5 @@ export * from './PanoSpatialTagPlugin';
 export * from './ModelItemLabelPlugin';
 export * from './ModelTVVideoPlugin';
 export * from './ItemLabelPlugin';
-export declare const DnalogelVersion = "2.0.0-alpha.38";
+export * from './PanoDoorLabelPlugin';
+export declare const DnalogelVersion = "2.0.0-alpha.43";