@realsee/dnalogel 3.8.9 → 3.8.11

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -79,10 +79,10 @@ class ci extends ne {
     d(this, "domEvents", new pe(this.five));
     d(this, "_workCode");
     d(this, "getObserverPosition", (e) => {
-      var o, t;
+      var o, t, r;
       const i = (o = this.work) == null ? void 0 : o.observers[e];
       if (i)
-        return O(i.position, (t = this.work) == null ? void 0 : t.options.transform);
+        return O(i.position, (r = (t = this.work) == null ? void 0 : t.options) == null ? void 0 : r.transform);
     });
     d(this, "loadVideoFirstFrame", () => {
       fe && this.hooks.emit("loadVideoFirstFrame");
@@ -125,9 +125,9 @@ class ci extends ne {
    * @description: 获取标签配置
    */
   getTagConfig(e, i) {
-    var r, f, c;
-    const o = this.calculateTagConfig(e, i), t = (r = i == null ? void 0 : i.fiveMode) != null ? r : this.five.getCurrentState().mode, n = (f = o.configWithFiveMode) == null ? void 0 : f[t];
-    return (c = n != null ? n : o) != null ? c : {};
+    var n, f, c;
+    const o = this.calculateTagConfig(e, i), t = (n = i == null ? void 0 : i.fiveMode) != null ? n : this.five.getCurrentState().mode, r = (f = o.configWithFiveMode) == null ? void 0 : f[t];
+    return (c = r != null ? r : o) != null ? c : {};
   }
   /**
    * @description 获取标签当前状态
@@ -196,16 +196,16 @@ class ci extends ne {
     if (t.angle !== void 0)
       return t.angle;
     {
-      const n = this.getObserverPosition(o);
-      if (n === void 0)
-        throw new Error(`getAngle(): observerPosition is ${n}`);
-      const r = (() => e.stickType === "3DPoint" ? C(e.normal) : E(e.position))();
-      if (!r)
+      const r = this.getObserverPosition(o);
+      if (r === void 0)
+        throw new Error(`getAngle(): observerPosition is ${r}`);
+      const n = (() => e.stickType === "3DPoint" ? C(e.normal) : E(e.position))();
+      if (!n)
         return;
       const f = $(e);
       if (!f)
         return;
-      const c = new te.Vector3().copy(n).sub(f), g = r.angleTo(c) * 180 / Math.PI;
+      const c = new te.Vector3().copy(r).sub(f), g = n.angleTo(c) * 180 / Math.PI;
       return t.angle = g, t.angle;
     }
   }
@@ -213,20 +213,20 @@ class ci extends ne {
    * @description: 获取距离
    */
   getDistance(e, i) {
-    const o = M(M({}, this.five.getCurrentState()), i), { panoIndex: t, mode: n } = o, r = A(n) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
-    if ((r == null ? void 0 : r.distance) !== void 0)
-      return r.distance;
+    const o = M(M({}, this.five.getCurrentState()), i), { panoIndex: t, mode: r } = o, n = A(r) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
+    if ((n == null ? void 0 : n.distance) !== void 0)
+      return n.distance;
     const f = $(e);
     if (!f)
       return -1;
-    if (A(n)) {
+    if (A(r)) {
       const c = this.getObserverPosition(t);
       if (c === void 0)
         return -1;
       const g = c.distanceTo(f);
-      return r && (r.distance = g), g;
+      return n && (n.distance = g), g;
     }
-    if (J(n))
+    if (J(r))
       return this.five.camera.position.distanceTo(f);
   }
   getPositions(e) {
@@ -241,14 +241,14 @@ class ci extends ne {
     if (!i || !this.domEvents)
       return () => {
       };
-    const t = () => !(!this.getCurrentVisibleState(e) || e.loading), n = (r) => {
+    const t = () => !(!this.getCurrentVisibleState(e) || e.loading), r = (n) => {
       if (!t())
         return !1;
-      o(r.origDomEvent);
+      o(n.origDomEvent);
     };
-    return this.domEvents.addEventListener(i, "click", n), () => {
-      var r;
-      (r = this.domEvents) == null || r.removeEventListener(i, "click", n);
+    return this.domEvents.addEventListener(i, "click", r), () => {
+      var n;
+      (n = this.domEvents) == null || n.removeEventListener(i, "click", r);
     };
   }
   getTagNormal(e) {
@@ -283,11 +283,11 @@ class ci extends ne {
     });
   }
   getTransformedPostion(e) {
-    var o;
+    var o, t;
     if (!e)
       return;
-    const i = (o = this.work) == null ? void 0 : o.options.transform;
-    return Array.isArray(e) && e.length === 4 ? e.map(C).map((t) => O(t, i)) : O(C(e), i);
+    const i = (t = (o = this.work) == null ? void 0 : o.options) == null ? void 0 : t.transform;
+    return Array.isArray(e) && e.length === 4 ? e.map(C).map((r) => O(r, i)) : O(C(e), i);
   }
   /**
    * @description 检查是否已经销毁
@@ -310,10 +310,10 @@ class ci extends ne {
       if ((W = e == null ? void 0 : e.config) != null && W._isMerged)
         return e.config;
     }
-    const t = {}, n = {}, r = {};
+    const t = {}, r = {}, n = {};
     this.config.contentTypeConfig && Object.entries(this.config.contentTypeConfig).forEach(([u, p]) => {
       var _, x;
-      const l = u, D = l.split("-"), L = u.startsWith("["), T = L ? D[0].slice(1, -1) : void 0, h = L ? D.slice(1) : D, v = T ? ["PanoramaLike", "ModelLike"].includes(T) ? (_ = n[T]) != null ? _ : n[T] = {} : (x = r[T]) != null ? x : r[T] = {} : t;
+      const l = u, D = l.split("-"), L = u.startsWith("["), T = L ? D[0].slice(1, -1) : void 0, h = L ? D.slice(1) : D, v = T ? ["PanoramaLike", "ModelLike"].includes(T) ? (_ = r[T]) != null ? _ : r[T] = {} : (x = n[T]) != null ? x : n[T] = {} : t;
       if (!v[l]) {
         if (h.length === 0 && (v[l] = p), h.length === 1) {
           const [m] = h;
@@ -333,11 +333,11 @@ class ci extends ne {
       }
     });
     const f = (V = (F = e.initialConfig) != null ? F : e.config) != null ? V : {}, c = y({}, ie, this.config.globalConfig, ...Object.values(t)), g = y({}, c, f), k = {}, X = Object.values(ae.Mode);
-    U(n).forEach(([u, p]) => {
+    U(r).forEach(([u, p]) => {
       X.forEach((l) => {
         (u === "PanoramaLike" && A(l) || u === "ModelLike" && J(l)) && (k[l] = y({}, c, ...Object.values(p), f, { _isMerged: !0 }));
       });
-    }), U(r).forEach(([u, p]) => {
+    }), U(n).forEach(([u, p]) => {
       k[u] = y({}, c, ...Object.values(p), f, { _isMerged: !0 });
     });
     const b = N(M({}, g), { configWithFiveMode: k });

package/libs/PanoTagPlugin/controller/index.js

@@ -1,15 +1,15 @@
-var E = Object.defineProperty, U = Object.defineProperties;
-var I = Object.getOwnPropertyDescriptors;
+var U = Object.defineProperty, I = Object.defineProperties;
+var R = Object.getOwnPropertyDescriptors;
 var A = Object.getOwnPropertySymbols;
-var R = Object.prototype.hasOwnProperty, B = Object.prototype.propertyIsEnumerable;
-var u = (d, a, e) => a in d ? E(d, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[a] = e, g = (d, a) => {
+var B = Object.prototype.hasOwnProperty, F = Object.prototype.propertyIsEnumerable;
+var u = (d, a, e) => a in d ? U(d, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[a] = e, g = (d, a) => {
   for (var e in a || (a = {}))
-    R.call(a, e) && u(d, e, a[e]);
+    B.call(a, e) && u(d, e, a[e]);
   if (A)
     for (var e of A(a))
-      B.call(a, e) && u(d, e, a[e]);
+      F.call(a, e) && u(d, e, a[e]);
   return d;
-}, v = (d, a) => U(d, I(a));
+}, v = (d, a) => I(d, R(a));
 var l = (d, a, e) => (u(d, typeof a != "symbol" ? a + "" : a, e), e);
 var c = (d, a, e) => new Promise((t, i) => {
   var s = (r) => {
@@ -28,14 +28,14 @@ var c = (d, a, e) => new Promise((t, i) => {
   n((e = e.apply(d, a)).next());
 });
 import * as b from "three";
-import { Subscribe as F } from "@realsee/five";
+import { Subscribe as M } from "@realsee/five";
 import { objectAssignDeepExports as f } from "../../vendor/object-assign-deep/objectAssignDeep.js";
-import { addDebugPoints as M } from "../utils/addDebugPoints.js";
+import { addDebugPoints as O } from "../utils/addDebugPoints.js";
 import { arrayPositionToVector3 as P } from "../../shared-utils/positionToVector3.js";
-import { isMediaModelTag as O, isModelTag as _ } from "../utils/tag/tagCheck.js";
-import { debounce as k } from "../utils/debounce.js";
-import { throttle as V } from "../utils/throttle.js";
-import { resizeObserver as D } from "../utils/resizeObserver.js";
+import { isMediaModelTag as _, isModelTag as k } from "../utils/tag/tagCheck.js";
+import { debounce as V } from "../utils/debounce.js";
+import { throttle as D } from "../utils/throttle.js";
+import { resizeObserver as S } from "../utils/resizeObserver.js";
 import L from "../utils/tag/format.js";
 import { generateBlankAudio as N, AudioNamespace as G } from "../../shared-utils/audio.js";
 import { TagRender as z } from "./TagRender.js";
@@ -169,7 +169,7 @@ import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 import "../../shared-utils/three/GLTFLoader.js";
 import "@realsee/five/gltf-loader";
 import "../../shared-utils/animationFrame/index.js";
-const S = "Dnalogel-PanoTagPlugin", Ui = (d) => `${S}--${d}`;
+const w = "Dnalogel-PanoTagPlugin", Ui = (d) => `${w}--${d}`;
 class Ii extends z {
   constructor(e, t) {
     super(e);
@@ -205,7 +205,7 @@ class Ii extends z {
     l(this, "updateVisible", () => {
       const e = this.five.getCurrentState().mode;
       this.tags.forEach((t) => {
-        O(t) && e !== "Panorama" && this.changeTagMode(t, "behind");
+        _(t) && e !== "Panorama" && this.changeTagMode(t, "behind");
       }), this.setVisible(), this.updateRenderAllTags();
     });
     l(this, "handleFiveWantsMoveToPano", (e) => {
@@ -247,7 +247,7 @@ class Ii extends z {
     l(this, "handleFivePanoArrived", () => c(this, null, function* () {
       this.setVisible(), this.updatePointTagPosition(), yield this.setVisibleAndUnfolded(), this.tags.forEach((e) => {
         e.temporaryState = v(g({}, e.temporaryState), { visible: !0 });
-      }), this.tags.filter(_).filter((e) => {
+      }), this.tags.filter(k).filter((e) => {
         var t;
         return (t = this.getTagConfig(e).modelConfig) == null ? void 0 : t.autoLookAtEnabled;
       }).forEach((e) => {
@@ -284,14 +284,14 @@ class Ii extends z {
   load(e, t) {
     return c(this, null, function* () {
       var s, o;
-      this.clearTags(), console.debug(S, " load:", { data: JSON.parse(JSON.stringify(e)) }), this.config = f({}, this.config, {
+      this.clearTags(), console.debug(w, " load:", { data: JSON.parse(JSON.stringify(e)) }), this.config = f({}, this.config, {
         globalConfig: (s = e.globalConfig) != null ? s : {},
         contentTypeConfig: (o = e.contentTypeConfig) != null ? o : {}
       });
       const i = yield this.addTag(e.tagList, t);
       if (this.debug)
         try {
-          M(this.five, this.tags);
+          O(this.five, this.tags);
         } catch (n) {
           console.error(n);
         }
@@ -314,11 +314,11 @@ class Ii extends z {
             visible: void 0,
             unfolded: !this.can("fold", o)
           }, p.initialState),
-          hooks: new F(),
+          hooks: new M(),
           originPosition: o.position,
           position: (() => {
             const m = this.getTransformedPostion(o.position);
-            return Array.isArray(m) ? m.map((w) => w.toArray()) : m.toArray();
+            return Array.isArray(m) ? m.map((E) => E.toArray()) : m.toArray();
           })(),
           initialConfig: r,
           computedConfig: h,
@@ -491,11 +491,11 @@ class Ii extends z {
   addEventListener() {
     const { five: e, hooks: t } = this;
     let i = !1;
-    const s = () => {
+    const s = D(() => {
       i || (i = !0, e.ready().then(() => {
         this.onFiveEveryReady(), i = !1;
       }));
-    };
+    }, 150);
     return e.on("cameraUpdate", s), this.updateVisible(), this.handleFivePanoArrived(), e.on("wantsMoveToPano", this.handleFiveWantsMoveToPano), e.on("modeChange", this.updateVisible), e.on("initAnimationEnded", this.updateVisible), e.on("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.on("cameraUpdate", this.handleFiveCameraUpdate), e.on("panoArrived", this.handleFivePanoArrived), e.on("panoArrived", this.loadVideoFirstFrame), t.on("click", this.clickhandler), () => {
       e.off("wantsMoveToPano", this.handleFiveWantsMoveToPano), e.off("modeChange", this.updateVisible), e.off("initAnimationEnded", this.updateVisible), e.off("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.off("cameraUpdate", this.handleFiveCameraUpdate), e.off("cameraUpdate", s), e.off("panoArrived", this.handleFivePanoArrived), e.off("panoArrived", this.loadVideoFirstFrame), t.off("click", this.clickhandler), this.store.eventListenerDisposer = void 0;
     };
@@ -515,13 +515,13 @@ class Ii extends z {
       this.state.enabled && (this.show(), this.updateRenderAllTags());
     }, i = () => {
       this.state.enabled && this.hide();
-    }, { observe: s, unobserve: o } = D(
-      V(() => {
+    }, { observe: s, unobserve: o } = S(
+      D(() => {
         this.store.resizeObserverDisposer && i();
       }, 500),
       e
-    ), { observe: n, unobserve: r } = D(
-      k(() => t(), 400),
+    ), { observe: n, unobserve: r } = S(
+      V(() => t(), 400),
       e
     );
     return s(), n(), () => {

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let b = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.8.9");
+    i(this, "VERSION", "3.8.11");
     i(this, "five");
     /**
      * 插件事件钩子

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

@@ -1,5 +1,5 @@
-import { transformPosition as c } from "./transformPosition.js";
-function a(t, f) {
+import { transformPosition as u } from "./transformPosition.js";
+function d(t, f) {
   if (!t)
     return 0;
   const s = t.observers;
@@ -7,9 +7,9 @@ function a(t, f) {
     return console.error("getFloorIndex: invalid arguments: ", { point: f, observer: s }), 0;
   const e = [];
   s.forEach((r) => {
-    var n, l;
+    var n, l, c;
     const o = (l = (n = r.floorIndex) != null ? n : r.floor_index) != null ? l : 0;
-    e[o] || (e[o] = []), e[o].push(c(r.position, t.options.transform).y);
+    e[o] || (e[o] = []), e[o].push(u(r.position, (c = t.options) == null ? void 0 : c.transform).y);
   });
   const i = e.map((r) => r.reduce((o, n) => o + n, 0) / r.length);
   for (let r = i.length - 1; r > 0; r--)
@@ -18,5 +18,5 @@ function a(t, f) {
   return 0;
 }
 export {
-  a as getFloorIndex
+  d as getFloorIndex
 };

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.8.9",
+    "%c %c@realsee/dnalogel %cv3.8.11",
     [
       "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

@@ -7,7 +7,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "3.8.9",
+  "version": "3.8.11",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",