@realsee/dnalogel 2.13.2 → 2.14.0-dev.0

package/libs/PanoTagPlugin/Components/TagItem.js

@@ -1,8 +1,10 @@
-import { SvelteComponent as M, init as N, safe_not_equal as O, append_styles as Q, element as P, space as U, attr as u, set_style as S, toggle_class as b, insert as L, append as j, transition_out as T, check_outros as B, transition_in as z, detach as I, getContext as W, group_outros as E, noop as A, create_component as G, mount_component as H, destroy_component as J } from "../../vendor/svelte/internal/index.js";
-import X from "./Tag/index.js";
+import { SvelteComponent as K, init as M, safe_not_equal as N, append_styles as O, element as A, space as Q, attr as u, set_style as k, toggle_class as g, insert as C, append as j, transition_out as h, check_outros as B, transition_in as y, detach as P, getContext as U, group_outros as E, noop as v, create_component as G, mount_component as H, destroy_component as J } from "../../vendor/svelte/internal/index.js";
+import W from "./Tag/index.js";
 import "three";
 import { noTypecheck as F } from "../utils/noTypecheck.js";
-import Y from "./Common/TagPoint.js";
+import "@realsee/five/gltf-loader";
+import "../../shared-utils/three/loadTexture.js";
+import X from "./Common/TagPoint.js";
 import "./Tag/TextTag/index.js";
 import "./Tag/TextTag/TextTag.js";
 import "./Common/Line/Straight.js";
@@ -61,7 +63,7 @@ import "./Tag/MarketingTag.js";
 import "hammerjs";
 import "@realsee/five";
 import "@tweenjs/tween.js";
-import "../../CSS3DRenderPlugin/CSS3DRender.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
 import "../../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
@@ -90,29 +92,29 @@ import "./Tag/LinkTag.js";
 import "./Common/Icon/Icon.js";
 import "../utils/getImageInfo.js";
 import "./Tag/CustomTag.js";
-function Z(o) {
-  Q(o, "svelte-pzwdws", ".tag.withAnimation.svelte-pzwdws{transition:opacity 0.3s linear}.tag.hide.svelte-pzwdws{opacity:0;pointer-events:none}.tag.hide.svelte-pzwdws *{pointer-events:none !important}.tag.unClickable.svelte-pzwdws{pointer-events:none !important}.tag.unClickable.svelte-pzwdws *{pointer-events:none !important}.tag.disable.svelte-pzwdws{display:none}.wrapper.svelte-pzwdws{position:absolute;width:0rem;height:0rem;overflow:visible;pointer-events:auto}");
+function Y(o) {
+  O(o, "svelte-pzwdws", ".tag.withAnimation.svelte-pzwdws{transition:opacity 0.3s linear}.tag.hide.svelte-pzwdws{opacity:0;pointer-events:none}.tag.hide.svelte-pzwdws *{pointer-events:none !important}.tag.unClickable.svelte-pzwdws{pointer-events:none !important}.tag.unClickable.svelte-pzwdws *{pointer-events:none !important}.tag.disable.svelte-pzwdws{display:none}.wrapper.svelte-pzwdws{position:absolute;width:0rem;height:0rem;overflow:visible;pointer-events:auto}");
 }
-function x(o) {
+function Z(o) {
   let e;
   return {
     c() {
-      e = P("div"), u(e, "data-info", "tag content is disable");
+      e = A("div"), u(e, "data-info", "tag content is disable");
     },
     m(t, i) {
-      L(t, e, i);
+      C(t, e, i);
     },
-    p: A,
-    i: A,
-    o: A,
+    p: v,
+    i: v,
+    o: v,
     d(t) {
-      t && I(e);
+      t && P(e);
     }
   };
 }
-function $(o) {
+function x(o) {
   let e, t;
-  return e = new X({
+  return e = new W({
     props: {
       mediaStore: o[2],
       withAnimation: o[0],
@@ -129,40 +131,40 @@ function $(o) {
       H(e, i, n), t = !0;
     },
     p(i, n) {
-      const a = {};
-      n & 4 && (a.mediaStore = i[2]), n & 1 && (a.withAnimation = i[0]), n & 2 && (a.tag = F(i[1])), n & 8 && (a.state = i[3]), n & 16 && (a.temporaryState = i[4]), e.$set(a);
+      const l = {};
+      n & 4 && (l.mediaStore = i[2]), n & 1 && (l.withAnimation = i[0]), n & 2 && (l.tag = F(i[1])), n & 8 && (l.state = i[3]), n & 16 && (l.temporaryState = i[4]), e.$set(l);
     },
     i(i) {
-      t || (z(e.$$.fragment, i), t = !0);
+      t || (y(e.$$.fragment, i), t = !0);
     },
     o(i) {
-      T(e.$$.fragment, i), t = !1;
+      h(e.$$.fragment, i), t = !1;
     },
     d(i) {
       J(e, i);
     }
   };
 }
-function tt(o) {
+function $(o) {
   let e;
   return {
     c() {
-      e = P("div"), u(e, "data-info", "tag point is disable");
+      e = A("div"), u(e, "data-info", "tag point is disable");
     },
     m(t, i) {
-      L(t, e, i);
+      C(t, e, i);
     },
-    p: A,
-    i: A,
-    o: A,
+    p: v,
+    i: v,
+    o: v,
     d(t) {
-      t && I(e);
+      t && P(e);
     }
   };
 }
-function et(o) {
+function tt(o) {
   let e, t;
-  return e = new Y({ props: { tag: o[1] } }), {
+  return e = new X({ props: { tag: o[1] } }), {
     c() {
       G(e.$$.fragment);
     },
@@ -170,102 +172,93 @@ function et(o) {
       H(e, i, n), t = !0;
     },
     p(i, n) {
-      const a = {};
-      n & 2 && (a.tag = i[1]), e.$set(a);
+      const l = {};
+      n & 2 && (l.tag = i[1]), e.$set(l);
     },
     i(i) {
-      t || (z(e.$$.fragment, i), t = !0);
+      t || (y(e.$$.fragment, i), t = !0);
     },
     o(i) {
-      T(e.$$.fragment, i), t = !1;
+      h(e.$$.fragment, i), t = !1;
     },
     d(i) {
       J(e, i);
     }
   };
 }
-function it(o) {
-  let e, t, i, n, a, l, f, k, s;
-  const C = [$, x], c = [];
-  function v(r, p) {
+function et(o) {
+  let e, t, i, n, l, s, d, w, f;
+  const S = [x, Z], c = [];
+  function T(r, a) {
     return r[12] ? 0 : 1;
   }
-  i = v(o), n = c[i] = C[i](o);
-  const h = [et, tt], d = [];
-  function y(r, p) {
+  i = T(o), n = c[i] = S[i](o);
+  const p = [tt, $], _ = [];
+  function z(r, a) {
     return r[13] ? 0 : 1;
   }
-  return l = y(o), f = d[l] = h[l](o), {
+  return s = z(o), d = _[s] = p[s](o), {
     c() {
-      e = P("div"), t = P("div"), n.c(), a = U(), f.c(), u(t, "class", "wrapper svelte-pzwdws"), u(t, "data-tag-unfolded", o[8]), u(t, "data-tag-id", o[11]), u(t, "data-content-type", k = o[1].contentType), S(t, "left", o[7]), S(t, "top", o[6]), S(t, "z-index", o[5]), u(e, "class", "tag svelte-pzwdws"), u(e, "data-tag-id", o[11]), b(e, "unClickable", o[1].mergedConfig.clickable === !1), b(e, "disable", o[10]), b(e, "hide", o[9]), b(e, "withAnimation", o[0]);
+      e = A("div"), t = A("div"), n.c(), l = Q(), d.c(), u(t, "class", "wrapper svelte-pzwdws"), u(t, "data-tag-unfolded", o[8]), u(t, "data-tag-id", o[11]), u(t, "data-content-type", w = o[1].contentType), k(t, "left", o[7]), k(t, "top", o[6]), k(t, "z-index", o[5]), u(e, "class", "tag svelte-pzwdws"), u(e, "data-tag-id", o[11]), g(e, "unClickable", o[1].mergedConfig.clickable === !1), g(e, "disable", o[10]), g(e, "hide", o[9]), g(e, "withAnimation", o[0]);
     },
-    m(r, p) {
-      L(r, e, p), j(e, t), c[i].m(t, null), j(t, a), d[l].m(t, null), s = !0;
+    m(r, a) {
+      C(r, e, a), j(e, t), c[i].m(t, null), j(t, l), _[s].m(t, null), f = !0;
     },
-    p(r, [p]) {
-      let g = i;
-      i = v(r), i === g ? c[i].p(r, p) : (E(), T(c[g], 1, 1, () => {
-        c[g] = null;
-      }), B(), n = c[i], n ? n.p(r, p) : (n = c[i] = C[i](r), n.c()), z(n, 1), n.m(t, a));
-      let w = l;
-      l = y(r), l === w ? d[l].p(r, p) : (E(), T(d[w], 1, 1, () => {
-        d[w] = null;
-      }), B(), f = d[l], f ? f.p(r, p) : (f = d[l] = h[l](r), f.c()), z(f, 1), f.m(t, null)), (!s || p & 256) && u(t, "data-tag-unfolded", r[8]), (!s || p & 2048) && u(t, "data-tag-id", r[11]), (!s || p & 2 && k !== (k = r[1].contentType)) && u(t, "data-content-type", k), p & 128 && S(t, "left", r[7]), p & 64 && S(t, "top", r[6]), p & 32 && S(t, "z-index", r[5]), (!s || p & 2048) && u(e, "data-tag-id", r[11]), (!s || p & 2) && b(e, "unClickable", r[1].mergedConfig.clickable === !1), (!s || p & 1024) && b(e, "disable", r[10]), (!s || p & 512) && b(e, "hide", r[9]), (!s || p & 1) && b(e, "withAnimation", r[0]);
+    p(r, [a]) {
+      let m = i;
+      i = T(r), i === m ? c[i].p(r, a) : (E(), h(c[m], 1, 1, () => {
+        c[m] = null;
+      }), B(), n = c[i], n ? n.p(r, a) : (n = c[i] = S[i](r), n.c()), y(n, 1), n.m(t, l));
+      let b = s;
+      s = z(r), s === b ? _[s].p(r, a) : (E(), h(_[b], 1, 1, () => {
+        _[b] = null;
+      }), B(), d = _[s], d ? d.p(r, a) : (d = _[s] = p[s](r), d.c()), y(d, 1), d.m(t, null)), (!f || a & 256) && u(t, "data-tag-unfolded", r[8]), (!f || a & 2048) && u(t, "data-tag-id", r[11]), (!f || a & 2 && w !== (w = r[1].contentType)) && u(t, "data-content-type", w), a & 128 && k(t, "left", r[7]), a & 64 && k(t, "top", r[6]), a & 32 && k(t, "z-index", r[5]), (!f || a & 2048) && u(e, "data-tag-id", r[11]), (!f || a & 2) && g(e, "unClickable", r[1].mergedConfig.clickable === !1), (!f || a & 1024) && g(e, "disable", r[10]), (!f || a & 512) && g(e, "hide", r[9]), (!f || a & 1) && g(e, "withAnimation", r[0]);
     },
     i(r) {
-      s || (z(n), z(f), s = !0);
+      f || (y(n), y(d), f = !0);
     },
     o(r) {
-      T(n), T(f), s = !1;
+      h(n), h(d), f = !1;
     },
     d(r) {
-      r && I(e), c[i].d(), d[l].d();
+      r && P(e), c[i].d(), _[s].d();
     }
   };
 }
-function ot(o, e, t) {
-  let i, n, a, l, f, k, s, C, c;
-  var v, h, d, y, r, p, g, w;
-  let { withAnimation: q = !1 } = e, { tag: m } = e, { mediaStore: D } = e, { state: R } = e, { temporaryState: V } = e;
-  const K = W("hooks");
-  return o.$$set = (_) => {
-    "withAnimation" in _ && t(0, q = _.withAnimation), "tag" in _ && t(1, m = _.tag), "mediaStore" in _ && t(2, D = _.mediaStore), "state" in _ && t(3, R = _.state), "temporaryState" in _ && t(4, V = _.temporaryState);
+function it(o, e, t) {
+  let i, n, l, s, d, w, f, S, c, { withAnimation: T = !1 } = e, { tag: p } = e, { mediaStore: _ } = e, { state: z } = e, { temporaryState: r } = e;
+  const a = U("hooks");
+  return o.$$set = (m) => {
+    "withAnimation" in m && t(0, T = m.withAnimation), "tag" in m && t(1, p = m.tag), "mediaStore" in m && t(2, _ = m.mediaStore), "state" in m && t(3, z = m.state), "temporaryState" in m && t(4, r = m.temporaryState);
   }, o.$$.update = () => {
-    o.$$.dirty & 2 && t(13, i = (() => !(m.contentType === "Sticker" || m.contentType === "Link" || m.contentType === "VRLink" || m.contentType === "PanoLink" || m.contentType === "Audio" && m.data.appearance === "plane"))()), o.$$.dirty & 2 && t(12, n = (() => m.stickType === "2DPoint")()), o.$$.dirty & 2 && t(11, a = m.id), o.$$.dirty & 98306 && t(10, l = !(!(t(15, v = m.pointTagStyle) === null || v === void 0) && v.leftPercent) || !(!(t(16, h = m.pointTagStyle) === null || h === void 0) && h.topPercent) || m.enabled === !1 || !m.state), o.$$.dirty & 393218 && t(9, f = !(!(t(17, d = m.state) === null || d === void 0) && d.visible) || (t(18, y = m.temporaryState) === null || y === void 0 ? void 0 : y.visible) === !1), o.$$.dirty & 524290 && t(8, k = t(19, r = m.state) === null || r === void 0 ? void 0 : r.unfolded), o.$$.dirty & 1048578 && t(7, s = (t(20, p = m.pointTagStyle) === null || p === void 0 ? void 0 : p.leftPercent) + "%"), o.$$.dirty & 2097154 && t(6, C = (t(21, g = m.pointTagStyle) === null || g === void 0 ? void 0 : g.topPercent) + "%"), o.$$.dirty & 4194306 && t(5, c = !(t(22, w = m.state) === null || w === void 0) && w.unfolded ? 1 : 0);
+    var m, b, L, I, q, D, R, V;
+    o.$$.dirty & 2 && t(13, i = (() => !(p.contentType === "Sticker" || p.contentType === "Link" || p.contentType === "VRLink" || p.contentType === "PanoLink" || p.contentType === "Audio" && p.data.appearance === "plane"))()), o.$$.dirty & 2 && t(12, n = (() => p.stickType === "2DPoint")()), o.$$.dirty & 2 && t(11, l = p.id), o.$$.dirty & 2 && t(10, s = !((m = p.pointTagStyle) != null && m.leftPercent) || !((b = p.pointTagStyle) != null && b.topPercent) || p.enabled === !1 || !p.state), o.$$.dirty & 2 && t(9, d = !((L = p.state) != null && L.visible) || ((I = p.temporaryState) == null ? void 0 : I.visible) === !1), o.$$.dirty & 2 && t(8, w = (q = p.state) == null ? void 0 : q.unfolded), o.$$.dirty & 2 && t(7, f = ((D = p.pointTagStyle) == null ? void 0 : D.leftPercent) + "%"), o.$$.dirty & 2 && t(6, S = ((R = p.pointTagStyle) == null ? void 0 : R.topPercent) + "%"), o.$$.dirty & 2 && t(5, c = (V = p.state) != null && V.unfolded ? 1 : 0);
   }, [
-    q,
-    m,
-    D,
-    R,
-    V,
+    T,
+    p,
+    _,
+    z,
+    r,
     c,
-    C,
-    s,
-    k,
+    S,
     f,
+    w,
+    d,
+    s,
     l,
-    a,
     n,
     i,
-    K,
-    v,
-    h,
-    d,
-    y,
-    r,
-    p,
-    g,
-    w
+    a
   ];
 }
-class Ke extends M {
+class Me extends K {
   constructor(e) {
-    super(), N(
+    super(), M(
       this,
       e,
-      ot,
       it,
-      O,
+      et,
+      N,
       {
         withAnimation: 0,
         tag: 1,
@@ -273,10 +266,10 @@ class Ke extends M {
         state: 3,
         temporaryState: 4
       },
-      Z
+      Y
     );
   }
 }
 export {
-  Ke as default
+  Me as default
 };

package/libs/PanoTagPlugin/controller/TagComputer.d.ts

@@ -1,6 +1,6 @@
 import type { Five, Mode } from '@realsee/five';
 import * as THREE from 'three';
-import type { Tag } from '../typings';
+import type { Tag, TagElement } from '../typings';
 import { Raycaster } from 'three';
 import { TagUtil } from './TagUtil';
 export declare abstract class TagComputer extends TagUtil {
@@ -12,10 +12,15 @@ export declare abstract class TagComputer extends TagUtil {
     getVisibleByPanoIndex(tag: Tag<any, any>, panoIndex?: number): boolean;
     getVisibleByFiveMode(tag: Tag<any, any>, mode: Mode): boolean;
     /** 检测是否匹配当前楼层 */
-    getVisibleByFloorIndex(tag: Tag<any, any>): boolean;
-    getVisible(tag: Tag<any, any>): boolean;
+    getVisibleByFloorIndex(tag: TagElement<any, any>): boolean;
+    /**
+     * @description 获取标签当前状态
+     * @return (this.state.visible && tag.state.visible) ?? true
+     */
+    getCurrentVisibleState(tag: TagElement<any, any>): boolean;
+    getVisible(tag: TagElement<any, any>): boolean;
     /** 获取当前点位上模型中的多媒体是否应该展示 */
-    getModelMedialVisibleByPanoIndex(tag: Tag<any, any>): boolean;
+    getModelMedialVisibleByPanoIndex(tag: TagElement<any, any>): boolean;
     /**
      * @description: 获取是否展开
      */

package/libs/PanoTagPlugin/controller/TagComputer.js

@@ -1,30 +1,32 @@
 var B = Object.defineProperty, U = Object.defineProperties;
-var V = Object.getOwnPropertyDescriptors;
+var M = Object.getOwnPropertyDescriptors;
 var x = Object.getOwnPropertySymbols;
-var M = Object.prototype.hasOwnProperty, D = Object.prototype.propertyIsEnumerable;
+var R = Object.prototype.hasOwnProperty, D = Object.prototype.propertyIsEnumerable;
 var y = (d, f, e) => f in d ? B(d, f, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[f] = e, I = (d, f) => {
   for (var e in f || (f = {}))
-    M.call(f, e) && y(d, e, f[e]);
+    R.call(f, e) && y(d, e, f[e]);
   if (x)
     for (var e of x(f))
       D.call(f, e) && y(d, e, f[e]);
   return d;
-}, P = (d, f) => U(d, V(f));
+}, P = (d, f) => U(d, M(f));
 var T = (d, f, e) => (y(d, typeof f != "symbol" ? f + "" : f, e), e);
-import * as R from "three";
+import * as C from "three";
 import { isMediaModelTag as h, is3DTag as j } from "../utils/tag/tagCheck.js";
-import { tagPosition as C, getTagPosition as k } from "../utils/tagPosition.js";
+import { tagPosition as V } from "../utils/tagPosition.js";
 import { checkRange as g } from "../utils/checkRange.js";
 import "hammerjs";
 import "@realsee/five";
 import "@tweenjs/tween.js";
-import "../../CSS3DRenderPlugin/CSS3DRender.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import { notNil as S } from "../../shared-utils/isNil.js";
+import { notNil as k } from "../../shared-utils/isNil.js";
 import "../../shared-utils/animationFrame/BetterTween.js";
-import { TagUtil as $ } from "./TagUtil.js";
+import { TagUtil as S } from "./TagUtil.js";
 import "../../CSS3DRenderPlugin/utils/positionToVector3.js";
 import "../../shared-utils/three/centerPoint.js";
+import "@realsee/five/gltf-loader";
+import "../../shared-utils/three/loadTexture.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
 import "../../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
@@ -39,15 +41,17 @@ import "../../shared-utils/animationFrame/index.js";
 import "object-assign-deep";
 import "../tag.config.js";
 import "../utils/planeNormal.js";
+import "../utils/normalPositionToPositions.js";
 import "./TagCache.js";
 import "../../base/BasePlugin.js";
 import "../../vendor/svelte/store/index.js";
 import "../../vendor/svelte/internal/index.js";
 import "../utils/device.js";
-class be extends $ {
+import "../../shared-utils/threex/domevents/index.js";
+class he extends S {
   constructor(e) {
     super(e);
-    T(this, "raycaster", new R.Raycaster());
+    T(this, "raycaster", new C.Raycaster());
   }
   getVisibleByPanoIndex(e, i) {
     var t;
@@ -59,44 +63,47 @@ class be extends $ {
     {
       const l = (() => {
         var v, p, a;
-        const o = (v = this.getTagConfig(e).visibleConfig) != null ? v : {}, u = this.getDistance(e);
-        if (typeof o == "function")
-          return { value: o(this.five, { tag: e, distance: u }), reason: "config function result" };
-        if (o.keep === "hidden")
+        const r = (v = this.getTagConfig(e).visibleConfig) != null ? v : {}, u = this.getDistance(e);
+        if (typeof r == "function")
+          return { value: r(this.five, { tag: e, distance: u }), reason: "config function result" };
+        if (r.keep === "hidden")
           return { value: !1, reason: "config.keep is hidden" };
-        if (o.keep === "visible")
+        if (r.keep === "visible")
           return { value: !0, reason: "config.keep is visible" };
-        if (o.visiblePanoIndex !== void 0 && o.visiblePanoIndex !== "all" && s !== void 0) {
-          if (Array.isArray(o.visiblePanoIndex) && !o.visiblePanoIndex.includes(s))
+        if (r.visiblePanoIndex !== void 0 && r.visiblePanoIndex !== "all" && s !== void 0) {
+          if (Array.isArray(r.visiblePanoIndex) && !r.visiblePanoIndex.includes(s))
             return {
               value: !1,
-              reason: `current panoIndex is not included in visiblePano. currentPanoIndex: ${s}, visiblePanoIndex: ${o.visiblePanoIndex}`
+              reason: `current panoIndex is not included in visiblePano. currentPanoIndex: ${s}, visiblePanoIndex: ${r.visiblePanoIndex}`
             };
-          if (o.visiblePanoIndex === "current" && s !== ((p = e.fiveState) == null ? void 0 : p.panoIndex))
+          if (r.visiblePanoIndex === "current" && s !== ((p = e.fiveState) == null ? void 0 : p.panoIndex))
             return {
               value: !1,
               reason: `current panoIndex is not equal to tag.panoIndex. currentPanoIndex: ${s}, tag.panoIndex: ${(a = e.fiveState) == null ? void 0 : a.panoIndex}`
             };
         }
-        if (o.visibleDistance !== void 0 && o.visibleDistance !== "unLimited" && g(u, o.visibleDistance) === !1)
+        if (r.visibleDistance !== void 0 && r.visibleDistance !== "unLimited" && g(u, r.visibleDistance) === !1)
           return {
             value: !1,
-            reason: `distance is not in visibleDistance. distance: ${u}, visibleDistance: ${o.visibleDistance}`
+            reason: `distance is not in visibleDistance. distance: ${u}, visibleDistance: ${r.visibleDistance}`
           };
-        if (o.intersectRaycaster !== !1 && (typeof o.intersectRaycaster != "object" || o.intersectRaycaster.enabled !== !1)) {
+        if (r.intersectRaycaster !== !1 && (typeof r.intersectRaycaster != "object" || r.intersectRaycaster.enabled !== !1)) {
           if (s === void 0)
             return {
               value: !1,
               reason: `intersectRaycaster check failed: fivePanoIndex is ${s}`
             };
-          const r = this.getRaycasterFromPanoIndex(e, s), c = this.getTagEnableByIntersect(e, r);
+          const o = this.getRaycasterFromPanoIndex(e, s);
+          if (!o)
+            return { value: !1, reason: `intersectRaycaster check failed: raycaster is ${o}` };
+          const c = this.getTagEnableByIntersect(e, o);
           if (c.value === !1)
             return c;
         }
-        if (o.angleRange && j(e)) {
-          const r = this.getAngle(e);
-          if (g(r, o.angleRange) === !1)
-            return { value: !1, reason: `angle is not in angleRange. angle: ${r}, angleRange: ${o.angleRange}` };
+        if (r.angleRange && j(e)) {
+          const o = this.getAngle(e);
+          if (g(o, r.angleRange) === !1)
+            return { value: !1, reason: `angle is not in angleRange. angle: ${o}, angleRange: ${r.angleRange}` };
         }
         return {
           value: !0,
@@ -122,15 +129,24 @@ class be extends $ {
     const n = i.panoIndex, s = (l = this.five.work.observers[n]) == null ? void 0 : l.floorIndex, t = this.five.model.shownFloor;
     return t === null || t === s;
   }
+  getCurrentVisibleState(e) {
+    var i;
+    return (i = this.state.visible && e.state.visible) != null ? i : !0;
+  }
   getVisible(e) {
     const i = this.five.getCurrentState(), n = this.getVisibleByFiveMode(e, i.mode), s = h(e) ? this.getVisibleByFloorIndex(e) : !0, t = i.mode === "Panorama" ? this.getVisibleByPanoIndex(e, i.panoIndex) : !0;
     return n && t && s;
   }
   getModelMedialVisibleByPanoIndex(e) {
+    if (!this.getCurrentVisibleState(e))
+      return !1;
     const i = this.five.getCurrentState().panoIndex, n = this.getCache({ panoIndex: i, id: e.id });
     if (n.modelMedialVisible !== void 0)
       return n.modelMedialVisible;
-    const s = this.getRaycasterFromPanoIndex(e, i), t = this.getTagEnableByIntersect(e, s);
+    const s = this.getRaycasterFromPanoIndex(e, i);
+    if (!s)
+      return !1;
+    const t = this.getTagEnableByIntersect(e, s);
     return n.modelMedialVisible = t.value, n.__debug_visible_reason__ = t, t.value !== !1;
   }
   getUnfoldedByPanoIndex(e, i) {
@@ -155,8 +171,8 @@ class be extends $ {
           return !1;
       })();
       s.unfolded = l;
-      const o = this.getUnfoldedByCamera(e);
-      return o !== void 0 ? o : s.unfolded;
+      const r = this.getUnfoldedByCamera(e);
+      return r !== void 0 ? r : s.unfolded;
     }
   }
   getUnfoldedByCamera(e) {
@@ -173,24 +189,24 @@ class be extends $ {
         if (t.autoUnfold === void 0 || t.autoUnfold === !1 || t.autoUnfold.enable === !1 || !t.autoUnfold.strategy)
           return;
         if (t.autoUnfold.strategy === "ScreenPostion") {
-          const o = this.getTagProject(e);
-          if (o && g(o.x, t.autoUnfold.autoUnfoldProjectX) === !1)
+          const r = this.getTagProject(e);
+          if (r && g(r.x, t.autoUnfold.autoUnfoldProjectX) === !1)
             return !1;
         }
         if (t.autoUnfold.strategy === "MinimumDistance") {
           const v = this.filterPointTag.filter((a) => this.getVisibleByPanoIndex(a)).filter((a) => {
-            const r = this.getTagProject(a);
-            if (!r)
+            const o = this.getTagProject(a);
+            if (!o)
               return !1;
-            const { x: c, y: b, z: m } = r;
+            const { x: c, y: b, z: m } = o;
             return !(Math.abs(m) > 1 || Math.abs(c) > 1 || Math.abs(b) > 1);
-          }).map((a) => ({ tag: a, id: a.id, tagConfig: this.getTagConfig(a).unfoldedConfig })).filter(({ tag: a, tagConfig: r }) => {
+          }).map((a) => ({ tag: a, id: a.id, tagConfig: this.getTagConfig(a).unfoldedConfig })).filter(({ tag: a, tagConfig: o }) => {
             var c, b;
-            return !(typeof r != "object" || r.keep || r.autoUnfold === !1 || ((c = r.autoUnfold) == null ? void 0 : c.enable) === !1 || ((b = r.autoUnfold) == null ? void 0 : b.strategy) !== "MinimumDistance");
-          }).map((a) => P(I({}, a), { distance: this.getDistance(a.tag) })).filter(({ distance: a, tagConfig: r }) => {
+            return !(typeof o != "object" || o.keep || o.autoUnfold === !1 || ((c = o.autoUnfold) == null ? void 0 : c.enable) === !1 || ((b = o.autoUnfold) == null ? void 0 : b.strategy) !== "MinimumDistance");
+          }).map((a) => P(I({}, a), { distance: this.getDistance(a.tag) })).filter(({ distance: a, tagConfig: o }) => {
             var c, b;
-            return !(a === void 0 || typeof r != "object" || r.autoUnfold === !1 || ((c = r.autoUnfold) == null ? void 0 : c.enable) === !1 || ((b = r.autoUnfold) == null ? void 0 : b.strategy) !== "MinimumDistance" || r.autoUnfold.distance && g(a, r.autoUnfold.distance) === !1);
-          }).sort((a, r) => a.distance - r.distance).findIndex((a) => a.id === e.id);
+            return !(a === void 0 || typeof o != "object" || o.autoUnfold === !1 || ((c = o.autoUnfold) == null ? void 0 : c.enable) === !1 || ((b = o.autoUnfold) == null ? void 0 : b.strategy) !== "MinimumDistance" || o.autoUnfold.distance && g(a, o.autoUnfold.distance) === !1);
+          }).sort((a, o) => a.distance - o.distance).findIndex((a) => a.id === e.id);
           if (v === -1 || v <= ((l = t.autoUnfold.maxNumber) != null ? l : 1) - 1 === !1)
             return !1;
         }
@@ -250,9 +266,12 @@ class be extends $ {
     });
   }
   getTagProject(e) {
-    if (!this.getVisibleByPanoIndex(e) || !e.position)
+    if (!this.getVisibleByPanoIndex(e))
+      return;
+    const n = V(e.position);
+    if (!n)
       return;
-    const n = C(e.position), { x: s, y: t, z: l } = n.project(this.five.camera);
+    const { x: s, y: t, z: l } = n.project(this.five.camera);
     if (!(l > 1))
       return { x: s, y: t, z: l };
   }
@@ -261,30 +280,33 @@ class be extends $ {
     const n = (v = this.getTagConfig(e).visibleConfig) != null ? v : {}, s = this.getDistance(e), [t] = this.five.model.intersectRaycaster(i), l = (() => {
       if (!h(e))
         return;
-      const r = this.tags.filter(h).map((b) => {
+      const o = this.tags.filter(h).map((b) => {
         var m;
         return (m = b.model) == null ? void 0 : m.object;
-      }).filter(S);
-      return i.intersectObjects(r, !0)[0];
-    })(), o = (() => {
-      var r;
-      return typeof n == "object" && typeof n.intersectRaycaster == "object" && (r = n.intersectRaycaster.distanceAccuracy) != null ? r : 0.01;
-    })();
-    return Math.min((p = t == null ? void 0 : t.distance) != null ? p : 1 / 0, (a = l == null ? void 0 : l.distance) != null ? a : 1 / 0) + o < s ? {
+      }).filter(k);
+      return i.intersectObjects(o, !0)[0];
+    })(), r = (() => {
+      var o;
+      return typeof n == "object" && typeof n.intersectRaycaster == "object" && (o = n.intersectRaycaster.distanceAccuracy) != null ? o : 0.01;
+    })(), u = Math.min((p = t == null ? void 0 : t.distance) != null ? p : 1 / 0, (a = l == null ? void 0 : l.distance) != null ? a : 1 / 0);
+    return u + r < s ? {
       value: !1,
-      reason: `intersectRaycaster check failed: distance is ${s}, intersection.point is ${t == null ? void 0 : t.point.toArray()},
-        customModelIntersection.point is ${l == null ? void 0 : l.point.toArray()} distanceError is ${o}`
+      reason: `intersectRaycaster check failed: distance is ${s}, intersection.distance is ${t == null ? void 0 : t.distance}, intersection.point is ${t == null ? void 0 : t.point.toArray()},
+        customModelIntersection.point is ${l == null ? void 0 : l.point.toArray()}, minIntersectionDistance is ${u}`
     } : { value: !0, reason: "" };
   }
   getRaycasterFromPanoIndex(e, i) {
-    var t;
-    const n = (t = this.five.work.observers[i]) == null ? void 0 : t.position;
+    var l;
+    const n = (l = this.five.work.observers[i]) == null ? void 0 : l.position;
     if (n === void 0)
       throw new Error(`getVisible(): observerPosition is ${n}`);
-    const s = k(e).sub(n).normalize();
-    return this.raycaster.set(n, s), this.raycaster;
+    const s = V(e.position);
+    if (!s)
+      return;
+    const t = s.sub(n).normalize();
+    return this.raycaster.set(n, t), this.raycaster;
   }
 }
 export {
-  be as TagComputer
+  he as TagComputer
 };

package/libs/PanoTagPlugin/controller/TagRender.d.ts

@@ -20,11 +20,14 @@ export declare abstract class TagRender extends TagComputer {
      * @description: 更新所有标签
      */
     protected updateRenderAllTags(): void;
-    protected updateRenderImageModel(): void;
+    /**
+     * @description: 渲染图片贴片
+     */
+    protected updateRenderImagePlane(): void;
     /**
      * @description: 渲染3D贴片
      */
-    protected updateRenderPlaneTag(): void;
+    protected updateRender3DDomTag(): void;
     /** 更新所有模型标签
      *
      * 1. 移除不应该在场景中的模型
@@ -37,7 +40,6 @@ export declare abstract class TagRender extends TagComputer {
     /** 更新标签中多媒体面片的位置
      * @param tag 标签
      * @param model 模型
-     * @param scale css3DObject 原始缩放比例
      */
     protected updateTagCss3DObjectMatrix<S extends 'Model' | 'Plane' = 'Model'>(tag: TagElement<any, S>, model: Object3D): void;
     /** 添加模型标签 */
@@ -54,5 +56,4 @@ export declare abstract class TagRender extends TagComputer {
     protected clearUnusedPanelTag(): void;
     /** 加载外部模型 */
     protected loadModel: (tag: TagElement<'MediaModel', 'Model'>) => Promise<TagGLTFObject>;
-    private updateTagCss3DObjectVisible;
 }