@realsee/dnalogel 3.0.0-0 → 3.0.0-10

package/libs/PanoTagPlugin/controller/TagComputer.js

@@ -1,19 +1,19 @@
-var E = Object.defineProperty, $ = Object.defineProperties;
+var $ = Object.defineProperty, E = Object.defineProperties;
 var L = Object.getOwnPropertyDescriptors;
 var k = Object.getOwnPropertySymbols;
 var _ = Object.prototype.hasOwnProperty, z = Object.prototype.propertyIsEnumerable;
-var M = (v, e, i) => e in v ? E(v, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : v[e] = i, y = (v, e) => {
+var M = (p, e, i) => e in p ? $(p, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : p[e] = i, y = (p, e) => {
   for (var i in e || (e = {}))
-    _.call(e, i) && M(v, i, e[i]);
+    _.call(e, i) && M(p, i, e[i]);
   if (k)
     for (var i of k(e))
-      z.call(e, i) && M(v, i, e[i]);
-  return v;
-}, D = (v, e) => $(v, L(e));
-import * as F from "three";
+      z.call(e, i) && M(p, i, e[i]);
+  return p;
+}, D = (p, e) => E(p, L(e));
+import * as j from "three";
 import { is3DTag as O, isMediaModelTag as R } from "../utils/tag/tagCheck.js";
 import { getTagCenterPosition as I, getTagPosition as Z } from "../utils/tagPosition.js";
-import { checkRange as h } from "../utils/checkRange.js";
+import { checkRange as g } from "../utils/checkRange.js";
 import { isPanoramaLike as b, isModelLike as H } from "../../shared-utils/five/mode.js";
 import "hammerjs";
 import "@realsee/five";
@@ -35,6 +35,7 @@ import "../../CSS3DRenderPlugin/utils/even.js";
 import "../../shared-utils/Subscribe.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
 import "../../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
+import "../../shared-utils/three/getObjectVisible.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
 import "../typings/tag/TagConfig.js";
@@ -44,7 +45,7 @@ import "../utils/planeNormal.js";
 import "../utils/normalPositionToPositions.js";
 import "./TagCache.js";
 import "../../base/BasePlugin.js";
-import "../../shared-utils/absoluteUrl.js";
+import "../../shared-utils/url/absoluteUrl.js";
 import "../../vendor/svelte/store/index.js";
 import "../../vendor/svelte/internal/index.js";
 import "../../shared-utils/device.js";
@@ -56,12 +57,13 @@ import "../../shared-utils/three/loadVideoTexture.js";
 import "../Assets/Icon.js";
 import "../../shared-utils/three/getPositionsByObjectFit.js";
 import "../../shared-utils/three/FragmentTransparencyMaterial.js";
+import "../../shared-utils/three/getNormal.js";
 import "../../shared-utils/five/FiveDomEvents.js";
-import "../../shared-utils/three/getObjectVisible.js";
 import "../utils/tag/adaptConfig.js";
 import "../../shared-utils/typescript/entries.js";
-const T = new F.Raycaster();
-class We extends q {
+import "../../shared-utils/url/getUrl.js";
+const T = new j.Raycaster();
+class Ge extends q {
   constructor(e) {
     super(e);
   }
@@ -83,8 +85,9 @@ class We extends q {
         if (s.keep === "visible")
           return { value: !0, checkedList: o, reason: "config.keep is visible" };
         if (s.visibleFiveMode !== void 0) {
-          let a = !1;
-          if (Array.isArray(s.visibleFiveMode) ? a = s.visibleFiveMode.includes(n) : s.visibleFiveMode === "ModelLike" ? a = H(n) : s.visibleFiveMode === "PanoramaLike" ? a = !b(n) : s.visibleFiveMode === "all" ? a = !0 : typeof s.visibleFiveMode == "string" && (a = s.visibleFiveMode === n), a === !1)
+          const a = typeof s.visibleFiveMode == "function" ? s.visibleFiveMode(e) : s.visibleFiveMode;
+          let v = !1;
+          if (Array.isArray(a) ? v = a.includes(n) : a === "ModelLike" ? v = H(n) : a === "PanoramaLike" ? v = !b(n) : a === "all" ? v = !0 : typeof a == "string" && (v = a === n), v === !1)
             return {
               value: !1,
               checkedList: o,
@@ -111,7 +114,7 @@ class We extends q {
         }
         if (b(n) && s.visibleDistance !== void 0 && (o.push("visibleDistance"), s.visibleDistance !== "unLimited")) {
           const a = this.getDistance(e);
-          if (h(a, s.visibleDistance) === !1)
+          if (g(a, s.visibleDistance) === !1)
             return {
               value: !1,
               checkedList: o,
@@ -121,7 +124,7 @@ class We extends q {
         if (b(n) && s.angleRange && O(e)) {
           o.push("angleRange");
           const a = this.getAngle(e);
-          if (h(a, s.angleRange) === !1)
+          if (g(a, s.angleRange) === !1)
             return { value: !1, checkedList: o, reason: `angle is not in angleRange. angle: ${a}, angleRange: ${s.angleRange}` };
         }
         if (s.intersectRaycaster !== !1 && (typeof s.intersectRaycaster != "object" || s.intersectRaycaster.enabled !== !1)) {
@@ -164,7 +167,7 @@ class We extends q {
           return !1;
         if (n.keep === "unfolded")
           return !0;
-        if (n.unfoldDistance && h(this.getDistance(e), n.unfoldDistance) === !1)
+        if (n.unfoldDistance && g(this.getDistance(e), n.unfoldDistance) === !1)
           return !1;
       })();
       t.unfolded = d;
@@ -190,7 +193,7 @@ class We extends q {
           return;
         if (t.autoUnfold.strategy === "ScreenPostion") {
           const d = this.getTagProject(e);
-          if (d && h(d.x, t.autoUnfold.autoUnfoldProjectX) === !1)
+          if (d && g(d.x, t.autoUnfold.autoUnfoldProjectX) === !1)
             return !1;
         }
         if (t.autoUnfold.strategy === "MinimumDistance") {
@@ -198,14 +201,14 @@ class We extends q {
             const f = this.getTagProject(r);
             if (!f)
               return !1;
-            const { x: u, y: a, z: m } = f;
-            return !(Math.abs(m) > 1 || Math.abs(u) > 1 || Math.abs(a) > 1);
+            const { x: u, y: a, z: v } = f;
+            return !(Math.abs(v) > 1 || Math.abs(u) > 1 || Math.abs(a) > 1);
           }).map((r) => ({ tag: r, id: r.id, tagConfig: this.getTagConfig(r).unfoldedConfig })).filter(({ tag: r, tagConfig: f }) => {
             var u, a;
             return !(typeof f == "function" || f.keep || f.autoUnfold === !1 || ((u = f.autoUnfold) == null ? void 0 : u.enable) === !1 || ((a = f.autoUnfold) == null ? void 0 : a.strategy) !== "MinimumDistance");
           }).map((r) => D(y({}, r), { distance: this.getDistance(r.tag) })).filter(({ distance: r, tagConfig: f }) => {
             const u = f.autoUnfold.distance;
-            return !(u && h(r, u) === !1);
+            return !(u && g(r, u) === !1);
           }).sort((r, f) => r.distance - f.distance).findIndex((r) => r.id === e.id);
           if (c === -1 || c <= ((n = t.autoUnfold.maxNumber) != null ? n : 1) - 1 === !1)
             return !1;
@@ -215,9 +218,7 @@ class We extends q {
     })() : void 0;
   }
   setTagZIndex(e) {
-    return e.forEach((i) => {
-      i.zIndex = this.calculateTagZIndex(i);
-    });
+    console.log("🐶 ==> setTagZIndex:");
   }
   calculateTagZIndex(e) {
     const i = this.getDistance(e);
@@ -274,22 +275,22 @@ class We extends q {
   }
   /** 通过射线检测标签可用性 */
   getTagEnableByIntersect(e, i) {
-    var s, r, f, u, a, m;
+    var s, r, f, u, a, v;
     const l = U(U((s = this.getTagConfig(e).visibleConfig) != null ? s : {}).intersectRaycaster), t = i != null ? i : this.five.getCurrentState().panoIndex, n = b(this.five.getCurrentState().mode) ? (r = this.five.work.observers[t]) == null ? void 0 : r.position : this.five.camera.position;
     if (n === void 0)
       return { value: !1, reason: { type: "startPosition is undefined", fivePanoIndex: t } };
     const d = X(
       (() => {
-        var g;
-        const p = (g = l.checkPoints) != null ? g : "center";
-        return p === "center" ? I(e) : p === "corner" ? Z(e) : Array.isArray(p) ? p : [];
+        var h;
+        const m = (h = l.checkPoints) != null ? h : "center";
+        return m === "center" ? I(e) : m === "corner" ? Z(e) : Array.isArray(m) ? m : [];
       })()
     );
     let o = 0, c = 0;
-    for (const p of d) {
-      const g = new F.Vector3().subVectors(p, n).normalize();
-      T.set(n, g);
-      const j = n.distanceTo(p), [P] = this.five.model.intersectRaycaster(T), x = (() => {
+    for (const m of d) {
+      const h = new j.Vector3().subVectors(m, n).normalize();
+      T.set(n, h);
+      const F = n.distanceTo(m), [P] = this.five.model.intersectRaycaster(T), x = (() => {
         if (!R(e))
           return;
         const B = this.tags.filter(R).map((A) => {
@@ -298,8 +299,8 @@ class We extends q {
         }).filter(N), [w] = T.intersectObjects(B, !0);
         return w;
       })(), S = (f = l.distanceAccuracy) != null ? f : 0.01;
-      Math.min((u = P == null ? void 0 : P.distance) != null ? u : 1 / 0, (a = x == null ? void 0 : x.distance) != null ? a : 1 / 0) + S >= j ? o++ : c++;
-      const V = (m = l.needPassed) != null ? m : 1;
+      Math.min((u = P == null ? void 0 : P.distance) != null ? u : 1 / 0, (a = x == null ? void 0 : x.distance) != null ? a : 1 / 0) + S >= F ? o++ : c++;
+      const V = (v = l.needPassed) != null ? v : 1;
       if (o >= V)
         return { value: !0 };
     }
@@ -326,5 +327,5 @@ class We extends q {
   }
 }
 export {
-  We as TagComputer
+  Ge as TagComputer
 };

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -46,11 +46,13 @@ import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
 import "../../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
+import "../../shared-utils/util.js";
 import "../../CSS3DRenderPlugin/utils/createResizeObserver.js";
 import "../../CSS3DRenderPlugin/utils/even.js";
 import "../../shared-utils/Subscribe.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
 import "../../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
+import "../../shared-utils/three/getObjectVisible.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
@@ -63,17 +65,16 @@ import "../utils/planeNormal.js";
 import "../utils/normalPositionToPositions.js";
 import "./TagCache.js";
 import "../../base/BasePlugin.js";
-import "../../shared-utils/absoluteUrl.js";
+import "../../shared-utils/url/absoluteUrl.js";
 import "../../vendor/svelte/store/index.js";
 import "../../vendor/svelte/internal/index.js";
 import "../../shared-utils/device.js";
 import "../../shared-utils/five/FiveDomEvents.js";
-import "../../shared-utils/three/getObjectVisible.js";
 import "../utils/tag/adaptConfig.js";
 import "../../shared-utils/typescript/entries.js";
+import "../../shared-utils/url/getUrl.js";
 import "../../shared-utils/five/getFloorIndex.js";
 import "../../shared-utils/safeObj.js";
-import "../../shared-utils/util.js";
 import "../../shared-utils/three/loadTexture.js";
 import "../../shared-utils/three/Quadrangle.js";
 import "../../shared-utils/math/pointIsRectangle.js";
@@ -81,6 +82,7 @@ import "../../shared-utils/three/loadVideoTexture.js";
 import "../Assets/Icon.js";
 import "../../shared-utils/three/getPositionsByObjectFit.js";
 import "../../shared-utils/three/FragmentTransparencyMaterial.js";
+import "../../shared-utils/three/getNormal.js";
 import "../Components/TagItem.js";
 import "../utils/noTypecheck.js";
 import "../Components/Common/TagPoint.js";
@@ -155,7 +157,7 @@ import "../../CSS3DRenderPlugin/Controller.js";
 import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 import "@realsee/five/gltf-loader";
 const B = /* @__PURE__ */ new Map(), N = /* @__PURE__ */ new Map();
-class pi extends O {
+class hi extends O {
   constructor(t) {
     super(t);
     b(this, "group", new R());
@@ -462,5 +464,5 @@ class pi extends O {
   }
 }
 export {
-  pi as TagRender
+  hi as TagRender
 };

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -1,49 +1,52 @@
-var z = Object.defineProperty, H = Object.defineProperties;
-var J = Object.getOwnPropertyDescriptors;
-var F = Object.getOwnPropertySymbols;
-var _ = Object.prototype.hasOwnProperty, U = Object.prototype.propertyIsEnumerable;
-var k = (a, r, e) => r in a ? z(a, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[r] = e, C = (a, r) => {
+var U = Object.defineProperty, X = Object.defineProperties;
+var q = Object.getOwnPropertyDescriptors;
+var R = Object.getOwnPropertySymbols;
+var K = Object.prototype.hasOwnProperty, Q = Object.prototype.propertyIsEnumerable;
+var w = (a, r, e) => r in a ? U(a, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[r] = e, C = (a, r) => {
   for (var e in r || (r = {}))
-    _.call(r, e) && k(a, e, r[e]);
-  if (F)
-    for (var e of F(r))
-      U.call(r, e) && k(a, e, r[e]);
+    K.call(r, e) && w(a, e, r[e]);
+  if (R)
+    for (var e of R(r))
+      Q.call(r, e) && w(a, e, r[e]);
   return a;
-}, L = (a, r) => H(a, J(r));
-var d = (a, r, e) => (k(a, typeof r != "symbol" ? r + "" : r, e), e);
-import { defaultGlobalConfig as X } from "../typings/tag/TagConfig.js";
-import { objectAssignDeepExports as b } from "../../vendor/object-assign-deep/objectAssignDeep.js";
-import * as q from "three";
-import { DefaultConfig as K } from "../tag.config.js";
-import { anyPositionToVector3 as Q, arrayPositionToVector3 as w } from "../../shared-utils/positionToVector3.js";
-import { planeNormal as E } from "../utils/planeNormal.js";
-import { getTagCenterPosition as R } from "../utils/tagPosition.js";
-import { normalPositionToPositions as Y } from "../utils/normalPositionToPositions.js";
-import { TagCache as Z } from "./TagCache.js";
-import { writable as ee } from "../../vendor/svelte/store/index.js";
-import { isIOSWX as ie } from "../../shared-utils/device.js";
-import { Five as te } from "@realsee/five";
-import { isMediaPlaneTag as oe, isMediaModelTag as x, isPlaneTag as ne, isPoint3DTag as re } from "../utils/tag/tagCheck.js";
-import { VideoPlane as se } from "../utils/model/mediaPlane.js";
-import { FiveDomEvents as fe } from "../../shared-utils/five/FiveDomEvents.js";
-import B from "../utils/tag/adaptConfig.js";
-import { isPanoramaLike as W, isModelLike as N } from "../../shared-utils/five/mode.js";
+}, B = (a, r) => X(a, q(r));
+var d = (a, r, e) => (w(a, typeof r != "symbol" ? r + "" : r, e), e);
+import { defaultGlobalConfig as Y } from "../typings/tag/TagConfig.js";
+import { objectAssignDeepExports as P } from "../../vendor/object-assign-deep/objectAssignDeep.js";
+import * as Z from "three";
+import { DefaultConfig as ee } from "../tag.config.js";
+import { anyPositionToVector3 as ie, arrayPositionToVector3 as E } from "../../shared-utils/positionToVector3.js";
+import { planeNormal as W } from "../utils/planeNormal.js";
+import { getTagCenterPosition as N } from "../utils/tagPosition.js";
+import { normalPositionToPositions as te } from "../utils/normalPositionToPositions.js";
+import { TagCache as oe } from "./TagCache.js";
+import { writable as ne } from "../../vendor/svelte/store/index.js";
+import { isIOSWX as re } from "../../shared-utils/device.js";
+import { Five as se } from "@realsee/five";
+import { isMediaPlaneTag as fe, isMediaModelTag as G, isPlaneTag as ae, isPoint3DTag as ce } from "../utils/tag/tagCheck.js";
+import { VideoPlane as le } from "../utils/model/mediaPlane.js";
+import { FiveDomEvents as de } from "../../shared-utils/five/FiveDomEvents.js";
+import _ from "../utils/tag/adaptConfig.js";
+import { isPanoramaLike as j, isModelLike as $ } from "../../shared-utils/five/mode.js";
 import "hammerjs";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import { entries as G } from "../../shared-utils/typescript/entries.js";
+import { entries as z } from "../../shared-utils/typescript/entries.js";
+import { getUrlExt as H } from "../../shared-utils/url/getUrl.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../../base/BasePlugin.js";
 import "../../shared-utils/Subscribe.js";
-import "../../shared-utils/absoluteUrl.js";
+import "../../shared-utils/url/absoluteUrl.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
 import "../../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
+import "../../shared-utils/util.js";
 import "../../CSS3DRenderPlugin/utils/createResizeObserver.js";
 import "../../CSS3DRenderPlugin/utils/even.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
 import "../../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
+import "../../shared-utils/three/getObjectVisible.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
 import "../../vendor/svelte/internal/index.js";
@@ -54,13 +57,13 @@ import "../../shared-utils/three/loadVideoTexture.js";
 import "../Assets/Icon.js";
 import "../../shared-utils/three/getPositionsByObjectFit.js";
 import "../../shared-utils/three/FragmentTransparencyMaterial.js";
-import "../../shared-utils/three/getObjectVisible.js";
-class Ye extends Z {
+import "../../shared-utils/three/getNormal.js";
+class ri extends oe {
   constructor(e) {
     super(e);
     d(this, "tags", []);
-    d(this, "config", K);
-    d(this, "mediaStore", ee({
+    d(this, "config", ee);
+    d(this, "mediaStore", ne({
       currentMediaElement: null
     }));
     /** css3DRenderPlugin */
@@ -71,10 +74,10 @@ class Ye extends Z {
       resizeObserverDisposerAdding: !1,
       css3DRenderDisposer: /* @__PURE__ */ new Map()
     });
-    d(this, "domEvents", new fe(this.five));
+    d(this, "domEvents", new de(this.five));
     d(this, "mouseInfo");
     d(this, "loadVideoFirstFrame", () => {
-      ie && this.hooks.emit("loadVideoFirstFrame");
+      re && this.hooks.emit("loadVideoFirstFrame");
     });
     d(this, "preventWhenMouseDown", () => {
       var e;
@@ -84,7 +87,7 @@ class Ye extends Z {
     this.five.on("wantsMoveToPano", this.preventWhenMouseDown), this.five.on("wantsTapGesture", this.preventWhenMouseDown), this.mediaStore.subscribe(({ currentMediaElement: i }) => {
       this.tags.forEach((o) => {
         var t;
-        if (o.mediaPlane instanceof se && i !== o.mediaPlane.videoInstance) {
+        if (o.mediaPlane instanceof le && i !== o.mediaPlane.videoInstance) {
           if (!((t = o.mediaPlane.videoInstance) != null && t.src) || i === o.mediaPlane.videoInstance)
             return;
           o.mediaPlane.pause();
@@ -122,11 +125,12 @@ class Ye extends Z {
   }
   updateTagConfig() {
     this.clearCache(), this.tags.forEach((e) => {
-      var t;
+      var o;
       const i = this.getTagConfig(e, { useCache: !1 });
-      e.config = i;
-      const o = JSON.parse(JSON.stringify(e.data));
-      e.data = (t = i.initialData) != null && t.important ? b(e.data, o, i.initialData) : b(e.data, i.initialData, o);
+      if (e.config = i, e.config.initialData) {
+        const t = JSON.parse(JSON.stringify(e.data));
+        e.data = (o = i.initialData) != null && o.important ? P(e.data, t, i.initialData) : P(e.data, i.initialData, t);
+      }
     });
   }
   can(e, i) {
@@ -156,11 +160,15 @@ class Ye extends Z {
         return;
       const t = e.data.mediaData;
       if (!(!t || t.length === 0) && o.renderType === "Mesh") {
-        if (oe(e)) {
-          if (t.length === 1 && (t[0].type === "Image" || t[0].type === "Video"))
-            return "Mesh";
-        } else if (x(e))
-          return t.length === 1 && t[0].type === "Image" ? "Mesh" : "BehindDom";
+        if (fe(e)) {
+          if (t.length === 1) {
+            if (t[0].type === "Video")
+              return "Mesh";
+            if (t[0].type === "Image")
+              return H(t[0].url) === "gif" ? "Dom" : "Mesh";
+          }
+        } else if (G(e))
+          return t.length === 1 && t[0].type === "Image" ? H(t[0].url) === "gif" ? "Dom" : "Mesh" : "BehindDom";
       }
     })();
     return i != null ? i : "Dom";
@@ -180,44 +188,44 @@ class Ye extends Z {
       const f = (n = (s = this.five.work) == null ? void 0 : s.observers[o]) == null ? void 0 : n.position;
       if (f === void 0)
         throw new Error(`getAngle(): observerPosition is ${f}`);
-      const l = (() => e.stickType === "3DPoint" ? Q(e.normal) : E(e.position))();
-      if (!l)
+      const u = (() => e.stickType === "3DPoint" ? ie(e.normal) : W(e.position))();
+      if (!u)
         return;
-      const g = R(e);
+      const g = N(e);
       if (!g)
         return;
-      const u = new q.Vector3().copy(f).sub(g), v = l.angleTo(u) * 180 / Math.PI;
-      return t.angle = v, t.angle;
+      const l = new Z.Vector3().copy(f).sub(g), T = u.angleTo(l) * 180 / Math.PI;
+      return t.angle = T, t.angle;
     }
   }
   /**
    * @description: 获取距离
    */
   getDistance(e, i) {
-    var l, g;
-    const o = C(C({}, this.five.getCurrentState()), i), { panoIndex: t, mode: s } = o, n = W(s) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
+    var u, g;
+    const o = C(C({}, this.five.getCurrentState()), i), { panoIndex: t, mode: s } = o, n = j(s) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
     if ((n == null ? void 0 : n.distance) !== void 0)
       return n.distance;
-    const f = R(e);
+    const f = N(e);
     if (!f)
       return -1;
-    if (W(s)) {
-      const u = (g = (l = this.five.work) == null ? void 0 : l.observers[t]) == null ? void 0 : g.position;
-      if (u === void 0)
+    if (j(s)) {
+      const l = (g = (u = this.five.work) == null ? void 0 : u.observers[t]) == null ? void 0 : g.position;
+      if (l === void 0)
         return -1;
-      const v = u.distanceTo(f);
-      return n && (n.distance = v), v;
+      const T = l.distanceTo(f);
+      return n && (n.distance = T), T;
     }
-    if (N(s))
+    if ($(s))
       return this.five.camera.position.distanceTo(f);
   }
   getPositions(e) {
-    if (ne(e))
+    if (ae(e))
       return e.position;
-    if (x(e))
+    if (G(e))
       return e.data.mediaPosition;
-    if (re(e))
-      return Y(this.five.camera.position, w(e.position), w(e.normal));
+    if (ce(e))
+      return te(this.five.camera.position, E(e.position), E(e.normal));
   }
   addObjectClickHandler(e, i, o) {
     if (!i || !this.domEvents)
@@ -235,11 +243,11 @@ class Ye extends Z {
   }
   getTagNormal(e) {
     if (e.normal)
-      return w(e.normal);
+      return E(e.normal);
     if (e.stickType === "Plane")
-      return E(e.position);
+      return W(e.position);
     if (e.stickType === "Model")
-      return E(this.getPositions(e));
+      return W(this.getPositions(e));
   }
   // TODO: 优化点：下面这些函数，调用比较频繁，可以按点位加缓存
   get filterPointTag() {
@@ -275,52 +283,46 @@ class Ye extends Z {
    * @description: 获取merge后的配置
    */
   calculateTagConfig(e, i) {
-    var v, j, A;
-    const o = (v = i == null ? void 0 : i.useCache) != null ? v : !0;
+    var A, I, S, O;
+    const o = (A = i == null ? void 0 : i.useCache) != null ? A : !0;
     if (!e)
-      return (j = this.config.globalConfig) != null ? j : {};
-    if (o && ((A = e.config) != null && A._isMerged))
+      return (I = this.config.globalConfig) != null ? I : {};
+    if (o && ((S = e.config) != null && S._isMerged))
       return e.config;
     const t = {}, s = {}, n = {};
     this.config.contentTypeConfig && Object.entries(this.config.contentTypeConfig).forEach(([p, h]) => {
-      var I, O;
-      const c = p, D = c.split("-"), S = p.startsWith("["), y = S ? D[0].slice(1, -1) : void 0, T = S ? D.slice(1) : D, M = y ? ["PanoramaLike", "ModelLike"].includes(y) ? (I = s[y]) != null ? I : s[y] = {} : (O = n[y]) != null ? O : n[y] = {} : t;
+      var F, L;
+      const c = p, k = c.split("-"), V = p.startsWith("["), y = V ? k[0].slice(1, -1) : void 0, v = V ? k.slice(1) : k, M = y ? ["PanoramaLike", "ModelLike"].includes(y) ? (F = s[y]) != null ? F : s[y] = {} : (L = n[y]) != null ? L : n[y] = {} : t;
       if (!M[c]) {
-        if (T.length === 0 && (M[c] = h), T.length === 1) {
-          const [m] = T;
+        if (v.length === 0 && (M[c] = h), v.length === 1) {
+          const [m] = v;
           (e.contentType === m || m === "Any") && (M[c] = h);
         }
-        if (T.length === 2) {
-          const [m = "Any", P = "Any"] = T;
-          m === "Mixin" && e.contentType === P && (M[c] = h), (e.stickType === m || m === "Any") && (e.contentType === P || P === "Any") && (M[c] = h);
+        if (v.length === 2) {
+          const [m = "Any", b = "Any"] = v;
+          m === "Mixin" && e.contentType === b && (M[c] = h), (e.stickType === m || m === "Any") && (e.contentType === b || b === "Any") && (M[c] = h);
         }
-        if (T.length === 3) {
-          const [m = "Any", P, $] = T;
-          if (P === "Audio" && e.contentType === "Audio") {
-            const V = e;
-            (V.stickType === m || m === "Any") && V.data.appearance === $ && (M[c] = h);
+        if (v.length === 3) {
+          const [m = "Any", b, J] = v;
+          if (b === "Audio" && e.contentType === "Audio") {
+            const x = e;
+            (x.stickType === m || m === "Any") && x.data.appearance === J && (M[c] = h);
           }
         }
       }
     });
-    const f = b(
-      {},
-      X,
-      this.config.globalConfig,
-      ...Object.values(t),
-      e.config
-    ), l = {}, g = Object.values(te.Mode);
-    G(s).forEach(([p, h]) => {
-      g.forEach((c) => {
-        (p === "PanoramaLike" && W(c) || p === "ModelLike" && N(c)) && (l[c] = b({}, f, ...Object.values(h)));
+    const f = (O = e.config) != null && O._isMerged ? e.initialConfig : e.config, u = P({}, Y, this.config.globalConfig, ...Object.values(t)), g = P({}, u, f), l = {}, T = Object.values(se.Mode);
+    z(s).forEach(([p, h]) => {
+      T.forEach((c) => {
+        (p === "PanoramaLike" && j(c) || p === "ModelLike" && $(c)) && (l[c] = P({}, u, ...Object.values(h), f));
       });
-    }), G(n).forEach(([p, h]) => {
-      l[p] = b({}, f, ...Object.values(h));
+    }), z(n).forEach(([p, h]) => {
+      l[p] = P({}, u, ...Object.values(h), f);
     });
-    const u = L(C({}, f), { configWithFiveMode: l });
-    return B(u, e), Object.values(l).forEach((p) => B(p, e)), u._isMerged = !0, u;
+    const D = B(C({}, g), { configWithFiveMode: l });
+    return _(D, e), Object.values(l).forEach((p) => _(p, e)), D._isMerged = !0, D;
   }
 }
 export {
-  Ye as TagUtil
+  ri as TagUtil
 };