@realsee/dnalogel 3.44.2 → 3.44.3

package/libs/CurrentPanoImagePlugin/Controller.js

@@ -1,32 +1,32 @@
 var m = Object.defineProperty;
 var p = Object.getOwnPropertySymbols;
 var v = Object.prototype.hasOwnProperty, b = Object.prototype.propertyIsEnumerable;
-var g = (h, o, e) => o in h ? m(h, o, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[o] = e, l = (h, o) => {
+var g = (r, o, e) => o in r ? m(r, o, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[o] = e, a = (r, o) => {
   for (var e in o || (o = {}))
-    v.call(o, e) && g(h, e, o[e]);
+    v.call(o, e) && g(r, e, o[e]);
   if (p)
     for (var e of p(o))
-      b.call(o, e) && g(h, e, o[e]);
-  return h;
+      b.call(o, e) && g(r, e, o[e]);
+  return r;
 };
-var n = (h, o, e) => (g(h, typeof o != "symbol" ? o + "" : o, e), e);
-var f = (h, o, e) => new Promise((i, t) => {
+var n = (r, o, e) => (g(r, typeof o != "symbol" ? o + "" : o, e), e);
+var u = (r, o, e) => new Promise((i, t) => {
   var s = (d) => {
     try {
-      u(e.next(d));
+      f(e.next(d));
     } catch (c) {
       t(c);
     }
-  }, a = (d) => {
+  }, l = (d) => {
     try {
-      u(e.throw(d));
+      f(e.throw(d));
     } catch (c) {
       t(c);
     }
-  }, u = (d) => d.done ? i(d.value) : Promise.resolve(d.value).then(s, a);
-  u((e = e.apply(h, o)).next());
+  }, f = (d) => d.done ? i(d.value) : Promise.resolve(d.value).then(s, l);
+  f((e = e.apply(r, o)).next());
 });
-import * as r from "three";
+import * as h from "three";
 import { Controller as M } from "../base/BasePlugin.js";
 import { tweenProgress as A } from "../shared-utils/animationFrame/BetterTween.js";
 import "hammerjs";
@@ -34,8 +34,8 @@ import "three/examples/jsm/renderers/CSS3DRenderer";
 import "@realsee/five/line";
 import "../shared-utils/three/THREESphere.js";
 import "animejs";
-import { equal as w } from "../shared-utils/equal.js";
-import { loadTexture as P } from "../shared-utils/three/loadTexture.js";
+import { equal as P } from "../shared-utils/equal.js";
+import { loadTexture as w } from "../shared-utils/three/loadTexture.js";
 import "../shared-utils/Subscribe.js";
 import "../shared-utils/Utils/FiveUtil.js";
 import "../shared-utils/Utils/BaseUtil.js";
@@ -62,7 +62,7 @@ class E extends M {
       pluginHidden: ""
     });
     // ==================== private properties ====================
-    n(this, "group", new r.Group());
+    n(this, "group", new h.Group());
     n(this, "mesh");
     n(this, "textureLoadingPromise");
     n(this, "opacityAnimeTween");
@@ -120,20 +120,20 @@ class E extends M {
       visible: !0
     };
     this.state = Object.assign(t, i == null ? void 0 : i.initialState);
-    const s = l({
+    const s = a({
       width: 1.4,
       yOffset: 0.01,
       yRotate: 0,
       imageURL: this.absoluteUrl("/release/web/logo.7febb17f.png")
     }, i == null ? void 0 : i.config);
-    this._config = s, this.group.name = "current-pano-image-plugin-group", this.mesh = new r.Mesh(
-      new r.PlaneBufferGeometry(this.config.width, this.config.width),
-      new r.MeshBasicMaterial({ transparent: !0, opacity: 0, depthTest: !1 })
+    this._config = s, this.group.name = "current-pano-image-plugin-group", this.mesh = new h.Mesh(
+      new h.PlaneBufferGeometry(this.config.width, this.config.width),
+      new h.MeshBasicMaterial({ transparent: !0, opacity: 0, depthTest: !1 })
     ), this.mesh.visible = !1, this.group.add(this.mesh), this.updateMeshQuaternion(this.config.yRotate), this.state.visible || (this.checkMsg.pluginHidden = "初始值设置为隐藏"), this.state.enabled || (this.checkMsg.pluginDisabled = "初始值设置为禁用"), this.state.enabled && this._enable({ userAction: !1 }), this.five.once("dispose", this.dispose);
   }
   /** 插件配置项 */
   get config() {
-    return l({}, this._config);
+    return a({}, this._config);
   }
   /** 是否已经被销毁 */
   get disposed() {
@@ -166,12 +166,12 @@ class E extends M {
    * @param `options.userAction` `<boolean> | <undefined>` 是否是用户操作。默认是 true。
    */
   show(e) {
-    return f(this, null, function* () {
+    return u(this, null, function* () {
       if (this.state.visible)
         return Promise.resolve();
       if (this.disposed)
         return Promise.reject(new Error("不能在已销毁的插件上调用 show"));
-      const i = l({ userAction: !0 }, e);
+      const i = a({ userAction: !0 }, e);
       this.updateState({ visible: !0 }, i.userAction), this.checkMsg.pluginHidden = "", this._show(i);
     });
   }
@@ -180,10 +180,10 @@ class E extends M {
    * @param `options.userAction` `<boolean> | <undefined>` 是否是用户操作。默认是 true。
    */
   hide(e) {
-    return f(this, null, function* () {
+    return u(this, null, function* () {
       if (this.state.visible === !1)
         return;
-      const i = l({ userAction: !0 }, e);
+      const i = a({ userAction: !0 }, e);
       this.updateState({ visible: !1 }, i.userAction), this.checkMsg.pluginDisabled = "调用 hide 隐藏", this._hide(i);
     });
   }
@@ -194,12 +194,12 @@ class E extends M {
    */
   setState(e, i = {}) {
     const t = this.state;
-    if (w(e, t, { deep: !0 }))
+    if (P(e, t, { deep: !0 }))
       return;
     const s = i.userAction !== void 0 ? i.userAction : !0;
     if (this.updateState(e, s), e.enabled !== void 0 && t.enabled !== e.enabled && (e.enabled ? this.checkMsg.pluginDisabled = "" : this.checkMsg.pluginDisabled = "调用 setState 禁用", e.enabled ? this._enable({ userAction: s }) : this._disable({ userAction: s })), e.visible !== void 0 && t.visible !== e.visible) {
-      const a = { userAction: s, anime: { duration: 500 } };
-      e.visible ? this.checkMsg.pluginHidden = "" : this.checkMsg.pluginHidden = "调用 setState 隐藏", e.visible ? this._show(a) : this._hide(a);
+      const l = { userAction: s, anime: { duration: 500 } };
+      e.visible ? this.checkMsg.pluginHidden = "" : this.checkMsg.pluginHidden = "调用 setState 隐藏", e.visible ? this._show(l) : this._hide(l);
     }
   }
   /** 更改插件 Config
@@ -207,9 +207,9 @@ class E extends M {
    * @param `options` `<Option> | <undefined>`
    */
   updateConfig(e, i = {}) {
-    var a;
-    const t = this.config, s = l(l({}, t), e);
-    this._config = s, t.imageURL !== s.imageURL && this.reloadTexture(s.imageURL), t.yOffset !== s.yOffset && this.updateMeshPosition(this.five.getCurrentState().panoIndex), t.yRotate !== s.yRotate && this.updateMeshQuaternion(s.yRotate), t.width !== s.width && (this.mesh.geometry = new r.PlaneBufferGeometry(s.width, s.width)), this.hooks.emit("configChange", { prevConfig: t, config: s, userAction: (a = i.userAction) != null ? a : !0 });
+    var l;
+    const t = this.config, s = a(a({}, t), e);
+    this._config = s, t.imageURL !== s.imageURL && this.reloadTexture(s.imageURL), t.yOffset !== s.yOffset && this.updateMeshPosition(this.five.getCurrentState().panoIndex), t.yRotate !== s.yRotate && this.updateMeshQuaternion(s.yRotate), t.width !== s.width && (this.mesh.geometry = new h.PlaneBufferGeometry(s.width, s.width)), this.hooks.emit("configChange", { prevConfig: t, config: s, userAction: (l = i.userAction) != null ? l : !0 });
   }
   /** 问什么看不到模型 */
   __whyCantSeeMesh() {
@@ -224,7 +224,7 @@ class E extends M {
   }
   updateState(e, i) {
     const t = this.state;
-    this.state = l(l({}, this.state), e), this.hooks.emit("stateChange", { state: this.state, prevState: t, userAction: i });
+    this.state = a(a({}, this.state), e), this.hooks.emit("stateChange", { state: this.state, prevState: t, userAction: i });
   }
   /** 根据各种条件更新 Mesh 的可见性 */
   updateMeshVisible() {
@@ -233,30 +233,34 @@ class E extends M {
   }
   /** 根据点位更新 Mesh 坐标 */
   updateMeshPosition(e) {
-    var s, a, u;
-    const i = (u = (a = (s = this.five.work) == null ? void 0 : s.observers) == null ? void 0 : a[e]) == null ? void 0 : u.standingPosition, t = i == null ? void 0 : i.clone().setY(i.y + this.config.yOffset);
+    const i = this.workUtil.getObserverStandingPosition(e);
+    if (!i) {
+      console.warn("CurrentPanoImagePlugin: 无法获取到当前点位的 standingPosition");
+      return;
+    }
+    const t = i.clone().setY(i.y + this.config.yOffset);
     t && this.mesh.position.copy(t);
   }
   /** 重新加载贴图，调用时会先清除已有的贴图 */
   reloadTexture(e) {
-    return f(this, null, function* () {
+    return u(this, null, function* () {
       if (this.mesh.material.map = null, e !== "") {
-        const i = P(e);
+        const i = w(e);
         this.textureLoadingPromise = i;
         const t = yield i;
-        t.minFilter = r.LinearFilter, this.textureLoadingPromise === i && (this.onTextureLoaded(t), this.textureLoadingPromise = null);
+        t.minFilter = h.LinearFilter, this.textureLoadingPromise === i && (this.onTextureLoaded(t), this.textureLoadingPromise = null);
       }
       this.updateMeshVisible();
     });
   }
   /** north_rad 变化时，需要更新模型的旋转角度 */
   updateMeshQuaternion(e) {
-    const i = new r.Quaternion();
+    const i = new h.Quaternion();
     i.multiplyQuaternions(
       // 沿着自身 X 轴旋转 -90 度
-      new r.Quaternion().setFromAxisAngle(new r.Vector3(1, 0, 0), -Math.PI / 2),
+      new h.Quaternion().setFromAxisAngle(new h.Vector3(1, 0, 0), -Math.PI / 2),
       // 沿着自身 Z 轴旋转 rad 弧度
-      new r.Quaternion().setFromAxisAngle(new r.Vector3(0, 0, 1), e)
+      new h.Quaternion().setFromAxisAngle(new h.Vector3(0, 0, 1), e)
     ), this.mesh.quaternion.copy(i);
   }
   _enable(e) {

package/libs/base/BasePlugin.js

@@ -16,7 +16,7 @@ let c = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    e(this, "VERSION", "3.44.2");
+    e(this, "VERSION", "3.44.3");
     e(this, "NAME");
     e(this, "five");
     e(this, "workUtil");

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.44.2",
+    "%c %c@realsee/dnalogel %cv3.44.3",
     [
       "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.44.2",
+  "version": "3.44.3",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",