@realsee/dnalogel 3.76.1-alpha.2 → 3.76.1-alpha.4

package/libs/floorplan/ModelFloorplanPlugin/Controller.js

@@ -1,31 +1,31 @@
-var A = Object.defineProperty, E = Object.defineProperties;
-var C = Object.getOwnPropertyDescriptors;
+var P = Object.defineProperty, C = Object.defineProperties;
+var x = Object.getOwnPropertyDescriptors;
 var w = Object.getOwnPropertySymbols;
-var x = Object.prototype.hasOwnProperty, M = Object.prototype.propertyIsEnumerable;
-var v = (l, a, t) => a in l ? A(l, a, { enumerable: !0, configurable: !0, writable: !0, value: t }) : l[a] = t, d = (l, a) => {
+var E = Object.prototype.hasOwnProperty, M = Object.prototype.propertyIsEnumerable;
+var v = (l, a, t) => a in l ? P(l, a, { enumerable: !0, configurable: !0, writable: !0, value: t }) : l[a] = t, d = (l, a) => {
   for (var t in a || (a = {}))
-    x.call(a, t) && v(l, t, a[t]);
+    E.call(a, t) && v(l, t, a[t]);
   if (w)
     for (var t of w(a))
       M.call(a, t) && v(l, t, a[t]);
   return l;
-}, g = (l, a) => E(l, C(a));
+}, g = (l, a) => C(l, x(a));
 var o = (l, a, t) => (v(l, typeof a != "symbol" ? a + "" : a, t), t);
 var u = (l, a, t) => new Promise((e, i) => {
-  var r = (n) => {
+  var s = (n) => {
     try {
-      s(t.next(n));
+      r(t.next(n));
     } catch (m) {
       i(m);
     }
   }, h = (n) => {
     try {
-      s(t.throw(n));
+      r(t.throw(n));
     } catch (m) {
       i(m);
     }
-  }, s = (n) => n.done ? e(n.value) : Promise.resolve(n.value).then(r, h);
-  s((t = t.apply(l, a)).next());
+  }, r = (n) => n.done ? e(n.value) : Promise.resolve(n.value).then(s, h);
+  r((t = t.apply(l, a)).next());
 });
 import * as b from "three";
 import { to as I } from "../../shared-utils/to.js";
@@ -38,8 +38,8 @@ import { getPxmm as D, getAttachedY as T } from "../../shared-utils/getPxmm.js";
 import { FLOOR_PLAN_ATTACHED_TO as R } from "../constant.js";
 import { Controller as k } from "../../base/BasePluginWithData.js";
 import { correctFiveState as H } from "../utils/correctFiveState.js";
-import { changeModelCanvasOpacity as S } from "../../shared-utils/changeModelCanvasOpacity.js";
-import { FIVE_CAMERA_DEFAULT_FOV as W, FloorplanErrorType as c, SHOW_ANIME_DURATION as G } from "../utils/constant.js";
+import { changeModelCanvasOpacity as A } from "../../shared-utils/changeModelCanvasOpacity.js";
+import { FIVE_CAMERA_DEFAULT_FOV as W, FloorplanErrorType as f, SHOW_ANIME_DURATION as G } from "../utils/constant.js";
 import "../../shared-utils/tag.js";
 import "../../vendor/hammerjs/hammer.js";
 import "../../shared-utils/three/PointSelector/index.js";
@@ -156,7 +156,7 @@ function B(l) {
 }
 class ii extends k {
   constructor(t, e) {
-    var n, m, f;
+    var n, m, c;
     super(t);
     // =============== public properties =================
     o(this, "name", "modelFloorplanPlugin");
@@ -220,8 +220,8 @@ class ii extends k {
     o(this, "updateSize", () => {
       if (!this.data || !this.container || !this.wrapper)
         return !1;
-      const { min: t, max: e } = this.data.bounding, i = e.x - t.x, r = e.y - t.y, h = this.getPxmmWithRotation(), s = Math.ceil(i * h), n = Math.ceil(r * h);
-      return this.size.width === s && this.size.height === n || (this.container.style.width = s + "px", this.container.style.height = n + "px", this.size = { width: s, height: n }), !0;
+      const { min: t, max: e } = this.data.bounding, i = e.x - t.x, s = e.y - t.y, h = this.getPxmmWithRotation(), r = Math.ceil(i * h), n = Math.ceil(s * h);
+      return this.size.width === r && this.size.height === n || (this.container.style.width = r + "px", this.container.style.height = n + "px", this.size = { width: r, height: n }), !0;
     });
     o(this, "highlight", (t) => {
       this.state.config.highlightEnable && (this.highlightData = t, this.render());
@@ -240,9 +240,9 @@ class ii extends k {
       this.showState = d(d({}, this.showState), t);
     });
     o(this, "_disable", (t) => {
-      var i, r, h;
+      var i, s, h;
       const { userAction: e } = t;
-      this.hooks.emit("disable", { userAction: e }), (i = this.showRejection) == null || i.call(this, c.BreakOffByDisable), this.showPromise = void 0, (r = this.app) == null || r.$destroy(), this.app = void 0, (h = this.container) == null || h.remove(), this.removeEventListener();
+      this.hooks.emit("disable", { userAction: e }), (i = this.showRejection) == null || i.call(this, f.BreakOffByDisable), this.showPromise = void 0, (s = this.app) == null || s.$destroy(), this.app = void 0, (h = this.container) == null || h.remove(), this.removeEventListener();
     });
     o(this, "_enable", (t) => {
       const { userAction: e } = t;
@@ -253,9 +253,9 @@ class ii extends k {
       if (!this.state.enabled)
         return;
       if (!((h = this.five.model) != null && h.loaded))
-        throw new Error(c.ModelNotLoaded);
+        throw new Error(f.ModelNotLoaded);
       if (!this.data)
-        throw new Error(c.DataNotLoaded);
+        throw new Error(f.DataNotLoaded);
       if (this.showPromise)
         return this.showPromise;
       const e = {
@@ -264,41 +264,41 @@ class ii extends k {
         immediately: !1,
         isAutoShow: !1,
         userAction: !0
-      }, i = d(d({}, e), t), r = () => u(this, null, function* () {
+      }, i = d(d({}, e), t), s = () => u(this, null, function* () {
         this.hooks.emit("show", { userAction: i.userAction, auto: i.isAutoShow });
-        let s = !1, n;
+        let r = !1, n;
         this.showRejection = (p) => {
-          s = !0, n = p;
+          r = !0, n = p;
         };
         const [m] = yield I(H(this.five, this.showState, i.userAction));
         if (m)
           throw m;
-        if (s)
-          throw n ? new Error(n) : new Error(c.UnknownError);
+        if (r)
+          throw n ? new Error(n) : new Error(f.UnknownError);
         if (!this.updateSize())
-          throw new Error(c.UpdateSizeError);
+          throw new Error(f.UpdateSizeError);
         this.floorIndex = i.floorIndex, this.five.model.show(this.floorIndex);
       });
-      return this.isHiddenByHideFunc = !1, this.showPromise = r().then(() => {
+      return this.isHiddenByHideFunc = !1, this.showPromise = s().then(() => {
         this.showPromise = void 0, this.showRejection = void 0;
-        const s = i.modelOpacity, n = i.immediately ? 0 : G;
-        S(this.five, s, n), this.render(n), this.hooks.emit("showAnimationEnded", {
+        const r = i.modelOpacity, n = i.immediately ? 0 : G;
+        A(this.five, r, n), this.render(n), this.hooks.emit("showAnimationEnded", {
           auto: i.isAutoShow,
           userAction: i.userAction
         });
-      }).catch((s) => {
-        if (this.showPromise = void 0, this.showRejection = void 0, this.updateState({ visible: !1 }, i.userAction), !i.isAutoShow && s instanceof Error)
-          throw s;
+      }).catch((r) => {
+        if (this.showPromise = void 0, this.showRejection = void 0, this.updateState({ visible: !1 }, i.userAction), !i.isAutoShow && r instanceof Error)
+          throw r;
       }), this.showPromise;
     }));
     o(this, "_hide", (t) => {
-      var r;
-      (r = this.showRejection) == null || r.call(this, c.BreakOffByHide), this.showPromise = void 0;
+      var s;
+      (s = this.showRejection) == null || s.call(this, f.BreakOffByHide), this.showPromise = void 0;
       const i = d(d({}, {
         userAction: !0,
         isAutoHide: !1
       }), t);
-      S(this.five, 1, 0), this.hooks.emit("hide", { auto: i.isAutoHide, userAction: i.userAction }), this.render();
+      A(this.five, 1, 0), this.hooks.emit("hide", { auto: i.isAutoHide, userAction: i.userAction }), this.render();
     });
     o(this, "handleClick", () => {
       if (!this.state.visible)
@@ -374,7 +374,7 @@ class ii extends k {
       imageURL: N(e == null ? void 0 : e.staticPrefix, z),
       imageWidth: 200,
       imageHeight: 120,
-      text: (f = (m = e.i18n) == null ? void 0 : m.call(e, "暂无平面图")) != null ? f : "暂无平面图",
+      text: (c = (m = e.i18n) == null ? void 0 : m.call(e, "暂无平面图")) != null ? c : "暂无平面图",
       textFontSize: 14
     };
     const i = {
@@ -398,19 +398,19 @@ class ii extends k {
       missingFloorConfig: d(d({}, this.defaultMissingFloorConfig), e.missingFloorConfig),
       i18n: (p) => p,
       getRoomAreaText: (p) => (p / 1e6).toFixed(1) + "㎡",
-      getRoomDimensionText: (p, P) => (p / 1e3).toFixed(1) + "m × " + (P / 1e3).toFixed(1) + "m",
+      getRoomDimensionText: (p, S) => (p / 1e3).toFixed(1) + "m × " + (S / 1e3).toFixed(1) + "m",
       getRuleDistanceText: (p) => p.toString()
-    }, r = e ? O(e, ["selector", "scale"]) : {}, h = d(d({}, i.missingFloorConfig), r.missingFloorConfig), s = g(d(d({}, i), r), { missingFloorConfig: h });
-    this.state = { enabled: !0, visible: !1, config: s }, this.panoIndex = t.getCurrentState().panoIndex, this.initContainer(), t.once("dispose", this.dispose), this.addEventListener();
+    }, s = e ? O(e, ["selector", "scale"]) : {}, h = d(d({}, i.missingFloorConfig), s.missingFloorConfig), r = g(d(d({}, i), s), { missingFloorConfig: h });
+    this.state = { enabled: !0, visible: !1, config: r }, this.panoIndex = t.getCurrentState().panoIndex, this.initContainer(), t.once("dispose", this.dispose), this.addEventListener();
   }
   load(t, e, i = !0) {
     return u(this, null, function* () {
-      function r(f) {
-        return Object.prototype.hasOwnProperty.apply(f, ["version"]);
+      function s(c) {
+        return Object.prototype.hasOwnProperty.apply(c, ["version"]);
       }
       const h = t;
       h && U(h.version) && console.warn("传入 serverData.data 的方式后续可能不再支持，请把 serverData 整体传入 load 函数");
-      const s = JSON.parse(JSON.stringify(t)), n = r(s) ? s.data : s, m = this.data;
+      const r = JSON.parse(JSON.stringify(t)), n = s(r) ? r.data : r, m = this.data;
       this.data = yield F(n), this.hooks.emit("dataLoaded", this.data), this.hooks.emit("dataChange", this.data, m), e && this.updateState(e, i), this.render();
     });
   }
@@ -435,9 +435,9 @@ class ii extends k {
   }
   /** 更改插件 State */
   setState(t, e = {}) {
-    const i = this.state, r = e.userAction !== void 0 ? e.userAction : !0;
-    if (this.updateState(t, r), t.enabled !== void 0 && i.enabled !== t.enabled && (t.enabled ? this._enable({ userAction: r }) : this._disable({ userAction: r })), t.visible !== void 0 && i.visible !== t.visible) {
-      const h = { userAction: r };
+    const i = this.state, s = e.userAction !== void 0 ? e.userAction : !0;
+    if (this.updateState(t, s), t.enabled !== void 0 && i.enabled !== t.enabled && (t.enabled ? this._enable({ userAction: s }) : this._disable({ userAction: s })), t.visible !== void 0 && i.visible !== t.visible) {
+      const h = { userAction: s };
       t.visible ? this._show(h) : this._hide(h);
     }
     this.render();
@@ -446,20 +446,22 @@ class ii extends k {
     this.updateState({ config: t }, e), this.render();
   }
   /** 根据旋转角度计算 pxmm
-   * @description 当 longitude 大于 45° 或小于 -45°（相对于基准方向）时，使用欧几里得距离计算
+   * @description 当 longitude 大于 45° 或小于 -45°（相对于基准方向）时，使用 Z 轴计算
    */
   getPxmmWithRotation() {
     if (!this.wrapper)
       return 0;
     const t = this.state.config.attachedTo ? { attachedTo: this.state.config.attachedTo } : void 0, e = this.showState.longitude, i = Math.abs((e % (2 * Math.PI) + 2 * Math.PI) % (2 * Math.PI));
-    return i > Math.PI / 4 && i < 3 * Math.PI / 4 || i > 5 * Math.PI / 4 && i < 7 * Math.PI / 4 ? this.getPxmmEuclidean(t) : D(this.five, this.wrapper, this.floorIndex, t);
+    return i > Math.PI / 4 && i < 3 * Math.PI / 4 || i > 5 * Math.PI / 4 && i < 7 * Math.PI / 4 ? this.getPxmmZAxis(t) : D(this.five, this.wrapper, this.floorIndex, t);
   }
-  /** 使用欧几里得距离计算 pxmm */
-  getPxmmEuclidean(t) {
+  /** 使用 Z 轴计算 pxmm
+   * @description 当相机旋转导致 X 轴接近垂直于屏幕时，改用 Z 轴计算
+   */
+  getPxmmZAxis(t) {
     if (!this.wrapper)
       return 0;
-    const e = T(this.five, this.floorIndex, t == null ? void 0 : t.attachedTo), i = new b.Vector3(0, e, 0), r = new b.Vector3(1, e, 0), h = i.clone().project(this.five.camera), s = r.clone().project(this.five.camera), n = s.x - h.x, m = s.y - h.y;
-    return Math.sqrt(n * n + m * m) / 1e3 * (this.wrapper.getBoundingClientRect().width / 2);
+    const e = T(this.five, this.floorIndex, t == null ? void 0 : t.attachedTo), i = new b.Vector3(0, e, 0), s = new b.Vector3(0, e, 1), h = i.clone().project(this.five.camera), r = s.clone().project(this.five.camera);
+    return Math.abs((r.x - h.x) / 1e3) * (this.wrapper.getBoundingClientRect().width / 2);
   }
   formatData(t) {
     return u(this, null, function* () {
@@ -467,8 +469,8 @@ class ii extends k {
     });
   }
   updateState(t, e) {
-    var s;
-    const i = this.state, r = (s = t.config) != null && s.missingFloorConfig ? d(d({}, i.config.missingFloorConfig), t.config.missingFloorConfig) : i.config.missingFloorConfig, h = t.config ? g(d(d({}, i.config), t.config), { missingFloorConfig: r }) : i.config;
+    var r;
+    const i = this.state, s = (r = t.config) != null && r.missingFloorConfig ? d(d({}, i.config.missingFloorConfig), t.config.missingFloorConfig) : i.config.missingFloorConfig, h = t.config ? g(d(d({}, i.config), t.config), { missingFloorConfig: s }) : i.config;
     this.state = g(d(d({}, this.state), t), { config: h }), !y(this.state, i, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: i, userAction: e });
   }
   /** 如果用户是通过 selector 设置父容器，需要在 modelLoaded 之后把 container 自动放到父容器里

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.76.1-alpha.2",
+    "%c %c@realsee/dnalogel %cv3.76.1-alpha.4",
     [
       "background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAMCAMAAACHgmeRAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABLFBMVEUAAAAapPoap/oaqvkbrfkbr/gZnfwZoPsaqfnD4v/E4/8Ylv0clPm93/+/4P/B4f8Yj/683/8Wif+33P8Uhv+x2f8ShP+s1v8Pgf+n0/8Nf/+h0f8Lff8Lff8Nf/9dl/+czv8KfP8KfP+Lxf+Uyv+Xy/+Hwv+Jw/+Mxf+Oxv+RyP8aovsapfoap/oZmfwZm/wZnvsYnPsYkf4YlP0NePsDYfgYcfi43f+63v8Xiv8Xjf4EWfwCV/sWZ/qz2v+02/8Vh/8WiP8EUf8CTf4WXv2u1/+v2P8Thf8Thv8ETf8CR/8VV/+o1f+q1f8Qgv8Rg/8DSv8BRf8UVP+j0v+k0v8OgP8Pgf8DR/8DQv9Nhf+dzv+fz/+Kv/+Vyv+Xy/+azf+Oxv+Qx/+SyP////8MUhLdAAAAK3RSTlMACEWQ2bd98uQECPXxqO7c+Pb49vj2+Pb49vj23Oul8fMHA+TwerXXjEIG2P+bHgAAAAFiS0dEY1y+LaoAAAB+SURBVAjXY2BgZGJmYWVgYGBgY9fW0eVg4ORi4NbTNzDk4eXjZxAwMjYxNTO3EGQQsrSytrG1sxdmEHFwdHJ2cXUTZRBz9/D08vbxFWeQ8PMPCAwKDpFkkAoNC4+IjIqWZpCRlZOPiY2LV2BQVGJQTkhMUlEFWaOmrqGpxQAAyg0S9Dq+VPYAAAAASUVORK5CYII=')",
       "background-repeat: no-repeat",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.76.1-alpha.2",
+  "version": "3.76.1-alpha.4",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",