@realsee/dnalogel 2.0.0-alpha.10 → 2.0.0-alpha.13

package/libs/floorplan/utils/formatData.js

@@ -1,21 +1,34 @@
+var __awaiter = (this && this.__awaiter) || function (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());
+    });
+};
 import { FLOORPLAN_EXTRA_OBJECT_IMAGE } from '../Assets/floorplanExtraObject';
 import { floorplanPosition2ImagePosition, getFloorIndexFromModelPosition, modelPosition2FloorplanPosition, } from './formatPosition';
-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,
+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;
+            });
         };
-        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;
+        const svgOutlineItems = yield Promise.all(outlines.map(getOutlineItem));
+        return svgOutlineItems;
+    });
 }
 function formatRoom(data) {
     const floorplanRoomItem = {
@@ -61,19 +74,21 @@ function formatFloorplanEntrance(data) {
     };
     return floorplanEntrance;
 }
-export default 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;
+export default 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;
+    });
 }
 export function formatExtraObjects(data, five, floorplanData) {
     const extraObjects = data.map((object) => {

package/libs/floorplan/utils/formatPosition.js

@@ -9,7 +9,7 @@ export function pathD(points, options = {}) {
             d += 'M' + point;
             return d;
         }
-        if (needA?.[index]) {
+        if (needA === null || needA === void 0 ? void 0 : needA[index]) {
             d += 'A' + needA[index] + ',' + point;
             return d;
         }

package/libs/index.d.ts

@@ -24,3 +24,4 @@ export type { PluginReturns, PluginEvent, LineJson, PointJson } from './PanoMeas
 export { default as PanoMeasurePlugin } from './PanoMeasurePlugin';
 export type { PanoSpatialTagPluginParameterType, PanoSpatialTagPluginData, PanoSpatialTagPluginExportType } from './PanoSpatialTagPlugin';
 export { default as PanoSpatialTagPlugin } from './PanoSpatialTagPlugin';
+export { default as ModelItemLabelPlugin } from './ModelItemLabelPlugin';

package/libs/index.js

@@ -14,3 +14,5 @@ export { default as PanoRulerPlugin } from './PanoRulerPlugin';
 export { default as PanoCompassPlugin } from './PanoCompassPlugin';
 export { default as PanoMeasurePlugin } from './PanoMeasurePlugin';
 export { default as PanoSpatialTagPlugin } from './PanoSpatialTagPlugin';
+// 模型物品标签插件
+export { default as ModelItemLabelPlugin } from './ModelItemLabelPlugin';

package/libs/shared-utils/Subscribe.js

@@ -1,3 +1,4 @@
+var _a;
 /* eslint-disable  @typescript-eslint/no-explicit-any */
 const __EVENT__ = '__events__';
 /**
@@ -5,8 +6,13 @@ const __EVENT__ = '__events__';
  * 观察者模式（供前端使用），Node端推荐<a href="https://nodejs.org/api/events.html#events_class_eventemitter">EventEmitter</a>。
  */
 export default class Subscribe {
-    [__EVENT__];
     constructor() {
+        Object.defineProperty(this, _a, {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this[__EVENT__] = {};
     }
     /**
@@ -99,3 +105,4 @@ export default class Subscribe {
         return canceled;
     }
 }
+_a = __EVENT__;

package/libs/shared-utils/animationFrame/BetterTween.js

@@ -1,24 +1,53 @@
 import TWEEN from '@tweenjs/tween.js';
 import { requestAnimationFrameInterval } from './index';
 export class BetterTween extends TWEEN.Tween {
-    disposeMethods = [];
-    animationFrameDisposer;
-    onDispose = (callback) => {
-        this.disposeMethods.push(callback);
-        return this;
-    };
-    play = () => {
-        this.start(0);
-        this.animationFrameDisposer = requestAnimationFrameInterval((time) => this.update(time));
-        return this;
-    };
-    dispose = () => {
-        this.stop();
-        this.animationFrameDisposer?.();
-        this.disposeMethods.forEach((fn) => fn());
-        this.disposeMethods = [];
-        TWEEN.remove(this);
-    };
+    constructor() {
+        super(...arguments);
+        Object.defineProperty(this, "disposeMethods", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: []
+        });
+        Object.defineProperty(this, "animationFrameDisposer", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "onDispose", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (callback) => {
+                this.disposeMethods.push(callback);
+                return this;
+            }
+        });
+        Object.defineProperty(this, "play", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                this.start(0);
+                this.animationFrameDisposer = requestAnimationFrameInterval((time) => this.update(time));
+                return this;
+            }
+        });
+        Object.defineProperty(this, "dispose", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                var _a;
+                this.stop();
+                (_a = this.animationFrameDisposer) === null || _a === void 0 ? void 0 : _a.call(this);
+                this.disposeMethods.forEach((fn) => fn());
+                this.disposeMethods = [];
+                TWEEN.remove(this);
+            }
+        });
+    }
 }
 export function tweenProgress(duration, easing = TWEEN.Easing.Linear.None) {
     const tween = new BetterTween({ progress: 0 }).to({ progress: 1 });

package/libs/shared-utils/createCanvasTextTexture.js

@@ -1,10 +1,11 @@
 import { CanvasTexture } from 'three';
 export default function createCanvasTextTexture(text, config) {
-    const size = config?.size ?? 512;
-    const fontSize = config?.fontSize ?? size * (35 / 256) * 1.2;
-    const backgroundColor = config?.backgroundColor ?? 'rgba(0,0,0,0)';
-    const fontColor = config?.fontColor ?? '#fff';
-    const textAlign = config?.textAlign ?? 'center';
+    var _a, _b, _c, _d, _e;
+    const size = (_a = config === null || config === void 0 ? void 0 : config.size) !== null && _a !== void 0 ? _a : 512;
+    const fontSize = (_b = config === null || config === void 0 ? void 0 : config.fontSize) !== null && _b !== void 0 ? _b : size * (35 / 256) * 1.2;
+    const backgroundColor = (_c = config === null || config === void 0 ? void 0 : config.backgroundColor) !== null && _c !== void 0 ? _c : 'rgba(0,0,0,0)';
+    const fontColor = (_d = config === null || config === void 0 ? void 0 : config.fontColor) !== null && _d !== void 0 ? _d : '#fff';
+    const textAlign = (_e = config === null || config === void 0 ? void 0 : config.textAlign) !== null && _e !== void 0 ? _e : 'center';
     const canvas = document.createElement('canvas');
     canvas.setAttribute('width', size + '');
     canvas.setAttribute('height', size + '');

package/libs/shared-utils/five/changeMode.js

@@ -1,15 +1,26 @@
+var __awaiter = (this && this.__awaiter) || function (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());
+    });
+};
 import to from '../to';
-export default async function changeMode(five, ...changeModeParams) {
-    const [changeModeError] = await to(five.changeMode(...changeModeParams));
-    if (changeModeError)
-        throw changeModeError;
-    await new Promise((reslove, reject) => {
-        five.once('initAnimationEnded', reslove);
-        const handleModeChange = (mode) => {
-            if (mode !== changeModeParams[0])
-                reject('changeMode 被中断');
-            five.off('modeChange', handleModeChange);
-        };
-        five.on('modeChange', handleModeChange);
+export default function changeMode(five, ...changeModeParams) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const [changeModeError] = yield to(five.changeMode(...changeModeParams));
+        if (changeModeError)
+            throw changeModeError;
+        yield new Promise((reslove, reject) => {
+            five.once('initAnimationEnded', reslove);
+            const handleModeChange = (mode) => {
+                if (mode !== changeModeParams[0])
+                    reject('changeMode 被中断');
+                five.off('modeChange', handleModeChange);
+            };
+            five.on('modeChange', handleModeChange);
+        });
     });
 }

package/libs/shared-utils/getPxmm.js

@@ -16,7 +16,7 @@ export default function getPxmm(five, container, floorIndex, options) {
     function getY() {
         const currentFloorY = getFloorY(floorIndex);
         const nextFloorY = getFloorY(floorIndex + 1);
-        const attachedTo = options?.attachedTo || FLOOR_PLAN_ATTACHED_TO.BOUNDING_CENTER;
+        const attachedTo = (options === null || options === void 0 ? void 0 : options.attachedTo) || FLOOR_PLAN_ATTACHED_TO.BOUNDING_CENTER;
         if (attachedTo === FLOOR_PLAN_ATTACHED_TO.BOUNDING_CENTER)
             return (five.model.bounding.max.y + five.model.bounding.min.y) / 2;
         else if (attachedTo === FLOOR_PLAN_ATTACHED_TO.CEILING)

package/libs/shared-utils/math/evenNumber.js

@@ -1,4 +1,4 @@
 export default function evenNumber(num, config) {
     const roundNum = Math.round(num);
-    return roundNum % 2 === 0 ? roundNum : roundNum + Number(config?.smaller ? -1 : 1);
+    return roundNum % 2 === 0 ? roundNum : roundNum + Number((config === null || config === void 0 ? void 0 : config.smaller) ? -1 : 1);
 }

package/libs/shared-utils/three/loadFbxObj.js

@@ -1,13 +1,24 @@
+var __awaiter = (this && this.__awaiter) || function (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());
+    });
+};
 import { FBXLoader } from 'three/examples/jsm/loaders/FBXLoader';
 const loader = new FBXLoader();
-export async function loadFbxObj(url) {
-    return new Promise((resolve, reject) => {
-        function onLoad(object) {
-            resolve(object);
-        }
-        function onError(error) {
-            reject(error);
-        }
-        loader.load(url, onLoad, undefined, onError);
+export function loadFbxObj(url) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise((resolve, reject) => {
+            function onLoad(object) {
+                resolve(object);
+            }
+            function onError(error) {
+                reject(error);
+            }
+            loader.load(url, onLoad, undefined, onError);
+        });
     });
 }

package/libs/shared-utils/three/loadTexture.js

@@ -1,10 +1,21 @@
+var __awaiter = (this && this.__awaiter) || function (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());
+    });
+};
 import * as THREE from 'three';
 const textureLoader = new THREE.TextureLoader();
-export async function loadTexture(url) {
-    return new Promise((resolve, reject) => {
-        textureLoader.load(url, resolve, undefined, reject);
-    }).then((texture) => {
-        texture.encoding = THREE.sRGBEncoding;
-        return texture;
+export function loadTexture(url) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise((resolve, reject) => {
+            textureLoader.load(url, resolve, undefined, reject);
+        }).then((texture) => {
+            texture.encoding = THREE.sRGBEncoding;
+            return texture;
+        });
     });
 }

package/libs/shared-utils/three/transfromToMeshBasicMaterial.js

@@ -1,12 +1,13 @@
 import { MeshBasicMaterial } from 'three';
 export default function transfromToMeshBasicMaterial(object, options) {
     object.traverse((ele) => {
+        var _a;
         if (ele.type === 'Mesh') {
             const mesh = ele;
             const materialConf = Object.assign({ map: mesh.material.map || {} }, options);
             mesh.material = new MeshBasicMaterial(materialConf);
             mesh.renderOrder = 1;
-            if (ele.parent?.type === 'Mesh') {
+            if (((_a = ele.parent) === null || _a === void 0 ? void 0 : _a.type) === 'Mesh') {
                 ele.renderOrder = ele.parent.renderOrder + 1;
             }
         }

package/libs/shared-utils/tinyEJSrender.js

@@ -25,13 +25,43 @@ export default function render(template, data) {
     return templ.compileFunction()(data);
 }
 class Template {
-    templateText;
-    mode = null;
-    truncate = false;
-    currentLine = 1;
-    source = '';
-    regex = new RegExp(REGEX_STRING);
     constructor(text) {
+        Object.defineProperty(this, "templateText", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "mode", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
+        Object.defineProperty(this, "truncate", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+        Object.defineProperty(this, "currentLine", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 1
+        });
+        Object.defineProperty(this, "source", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: ''
+        });
+        Object.defineProperty(this, "regex", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new RegExp(REGEX_STRING)
+        });
         this.templateText = text;
     }
     compileFunction() {

package/libs/shared-utils/to.js

@@ -1,18 +1,29 @@
+var __awaiter = (this && this.__awaiter) || function (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());
+    });
+};
 /**
  * 传入一个 Promise
  * 无异常，返回 [null, data]
  * 有异常，则返回 [Error, undefined]
  * 用于替代 try&catch 处理 await 异常的方案
  */
-export async function to(promise) {
-    try {
-        const data = await promise;
-        return [null, data];
-    }
-    catch (error) {
-        if (error instanceof Error)
-            return [error, null];
-        return [new Error(''), null];
-    }
+export function to(promise) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const data = yield promise;
+            return [null, data];
+        }
+        catch (error) {
+            if (error instanceof Error)
+                return [error, null];
+            return [new Error(''), null];
+        }
+    });
 }
 export default to;

package/libs/shared-utils/useDebounce.js

@@ -16,7 +16,7 @@ export const useDebounce = (callback, waitFor = 200) => {
             clearTimeout(timer.current);
             timer.current = null;
         }
-        timer.current = setTimeout(() => savedFunc.current?.(...args), waitFor);
+        timer.current = setTimeout(() => { var _a; return (_a = savedFunc.current) === null || _a === void 0 ? void 0 : _a.call(savedFunc, ...args); }, waitFor);
     }, []);
 };
 export default useDebounce;

package/libs/shared-utils/useThrottle.js

@@ -12,9 +12,10 @@ export const useThrottle = (callback, waitFor) => {
         savedFunc.current = callback;
     }, [waitFor]);
     return useCallback((...args) => {
+        var _a;
         if (timer.current)
             return;
-        savedFunc.current?.(...args);
+        (_a = savedFunc.current) === null || _a === void 0 ? void 0 : _a.call(savedFunc, ...args);
         timer.current = setTimeout(() => {
             if (timer.current)
                 clearTimeout(timer.current);

package/package.json

@@ -6,7 +6,7 @@
   "author": "REALSEE-DEVELOPER",
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "private": false,
-  "version": "2.0.0-alpha.10",
+  "version": "2.0.0-alpha.13",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "build": "yarn run tsb && yarn run build:rollup && yarn build:docs",
@@ -26,7 +26,7 @@
   ],
   "devDependencies": {
     "@babel/core": "^7.17.5",
-    "@realsee/five": "^5.0.0-alpha.98",
+    "@realsee/five": "^5.0.0-alpha.120",
     "@rollup/plugin-alias": "^3.1.9",
     "@rollup/plugin-commonjs": "^21.1.0",
     "@rollup/plugin-typescript": "^8.3.2",

package/CHANGELOG.md

@@ -1,34 +0,0 @@
-# CHANGELOG
-
-## 2.0.0-alpha.10
-- 1.feat: 新增空间三维标签插件 PanoSpatialTagPlugin
-- 2.feat: 新增轻量 ejs 渲染模板函数 shared-utils/tinyEJSrender.js
-
-## 2.0.0-alpha.9
-- 1.refactor: 增加插件独立 js 输出及对 svelte 的编译。
-
-## 2.0.0-alpha.8
-- 1.fix: 修复 ModelViewPlugin 实景 VR 模型不居中问题；
-- 2.fix: 修复 ModelRoomLabelPlugin fov 更新未 rerender 问题；
-- 2.fix: 修复 ModelRoomLabelPlugin enable 判断问题；
-- 4.fix: 修改 ModelFloorplanPlugin 在全景态满足户型图的俯仰角时会自动切换户型图问题。
-
-## 2.0.0-alpha.7
-- 1.fix: PanoCompassPlugin 向下兼容；
-- 2.feat: 新增 PC 全景测量插件：PanoMeasurePlugin；
-- 3.docs: 修改 README.md；
-
-## 2.0.0-alpha.6
-- 1.fix: 标尺插件 PanoRulerPlugin 所有标尺仅展示一次问题；
-- 2.fix: TopviewFloorplanPlugin && ModelFloorplanPlugin 插件小雷达位置显示不正确问题；
-- 3.feat: 为 TopviewFloorplanPlugin && ModelFloorplanPlugin 插件新增线框图吸附位置配置选项。 
-  - 可选地板、天花板、模型中心，默认吸附选项为模型中心。
-
-## 2.0.0-alpha.5
-1.修复全景指南针插件 PanoCompassPlugin 默认导出 name
-
-## 2.0.0-alpha.4
-1.新增全景标尺插件 PanoRulerPlugin
-
-## 2.0.0-alpha.3
-1.新增全景指南针插件 PanoCompassPlugin