@realsee/dnalogel 2.6.2 → 2.6.3-dev.0

package/libs/PanoTagPlugin/controller/TagComputer.js

@@ -1,22 +1,22 @@
-var U = Object.defineProperty, j = Object.defineProperties;
-var w = Object.getOwnPropertyDescriptors;
-var m = Object.getOwnPropertySymbols;
-var A = Object.prototype.hasOwnProperty, B = Object.prototype.propertyIsEnumerable;
-var P = (u, c, e) => c in u ? U(u, c, { enumerable: !0, configurable: !0, writable: !0, value: e }) : u[c] = e, k = (u, c) => {
+var j = Object.defineProperty, w = Object.defineProperties;
+var $ = Object.getOwnPropertyDescriptors;
+var k = Object.getOwnPropertySymbols;
+var R = Object.prototype.hasOwnProperty, A = Object.prototype.propertyIsEnumerable;
+var P = (g, c, e) => c in g ? j(g, c, { enumerable: !0, configurable: !0, writable: !0, value: e }) : g[c] = e, x = (g, c) => {
   for (var e in c || (c = {}))
-    A.call(c, e) && P(u, e, c[e]);
-  if (m)
-    for (var e of m(c))
-      B.call(c, e) && P(u, e, c[e]);
-  return u;
-}, x = (u, c) => j(u, w(c));
-var b = (u, c, e) => (P(u, typeof c != "symbol" ? c + "" : c, e), e);
+    R.call(c, e) && P(g, e, c[e]);
+  if (k)
+    for (var e of k(c))
+      A.call(c, e) && P(g, e, c[e]);
+  return g;
+}, I = (g, c) => w(g, $(c));
+var b = (g, c, e) => (P(g, typeof c != "symbol" ? c + "" : c, e), e);
 import D from "object-assign-deep";
-import * as I from "three";
-import { DefaultConfig as E } from "../tag.config.js";
-import { is3DTag as R, isPointTag as V } from "../utils/tag/tagCheck.js";
+import * as U from "three";
+import { DefaultConfig as B } from "../tag.config.js";
+import { is3DTag as E, isPointTag as V } from "../utils/tag/tagCheck.js";
 import { arrayPositionToVector3 as M, anyPositionToVector3 as S } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
-import { planeNormal as $ } from "../utils/planeNormal.js";
+import { planeNormal as _ } from "../utils/planeNormal.js";
 import { tagPosition as T } from "../utils/tagPosition.js";
 import { checkRange as y } from "../utils/checkRange.js";
 import { TagCacheController as z } from "./TagCacheController.js";
@@ -27,89 +27,118 @@ class Y extends z {
   constructor(e) {
     super(e);
     b(this, "tags", []);
-    b(this, "config", E);
-    b(this, "raycaster", new I.Raycaster());
+    b(this, "config", B);
+    b(this, "raycaster", new U.Raycaster());
   }
   get isPanorama() {
     return this.five.currentMode === "Panorama";
   }
   getTagById(e) {
-    const t = this.tags.find((i) => i.id === e);
-    if (!t) {
-      console.error(`getTagById(): tag is ${t}, id is ${e}`);
+    const n = this.tags.find((i) => i.id === e);
+    if (!n) {
+      console.error(`getTagById(): tag is ${n}, id is ${e}`);
       return;
     }
-    return t;
+    return n;
   }
-  changeContentTypeConfig(e, t, i = !0) {
-    this.config.contentTypeConfig || (this.config.contentTypeConfig = {}), i ? this.config.contentTypeConfig[e] = D({}, this.config.contentTypeConfig[e], t) : this.config.contentTypeConfig[e] = t, this.clearCache();
+  changeContentTypeConfig(e, n, i = !0) {
+    this.config.contentTypeConfig || (this.config.contentTypeConfig = {}), i ? this.config.contentTypeConfig[e] = D({}, this.config.contentTypeConfig[e], n) : this.config.contentTypeConfig[e] = n, this.clearCache();
   }
-  getVisibleByPanoIndex(e, t) {
+  getVisibleByPanoIndex(e, n) {
     var o;
-    const i = this.getCaches({ panoIndex: t, id: e.id }), s = (o = this.five.panoIndex) != null ? o : t;
+    const i = this.getCache({ panoIndex: n, id: e.id }), s = (o = this.five.panoIndex) != null ? o : n;
     if (i.visible !== void 0)
       return i.visible;
     {
-      const f = (() => {
-        var d, g, r;
-        const n = (d = this.getTagConfig(e).visibleConfig) != null ? d : {}, l = this.getDistance(e);
-        if (typeof n == "function")
-          return n(this.five, { tag: e, distance: l });
-        if (n.keep === "hidden")
-          return !1;
-        if (n.keep === "visible")
-          return !0;
-        if (n.visiblePanoIndex !== void 0 && n.visiblePanoIndex !== "all" && s !== void 0 && (Array.isArray(n.visiblePanoIndex) && !n.visiblePanoIndex.includes(s) || n.visiblePanoIndex === "current" && s !== ((g = e.fiveState) == null ? void 0 : g.panoIndex)) || n.visibleDistance !== void 0 && n.visibleDistance !== "unLimited" && y(l, n.visibleDistance) === !1)
-          return !1;
-        if (n.intersectRaycaster !== !1 && (typeof n.intersectRaycaster != "object" || n.intersectRaycaster.enabled !== !1)) {
+      const a = (() => {
+        var d, h, f, l;
+        const t = (d = this.getTagConfig(e).visibleConfig) != null ? d : {}, r = this.getDistance(e);
+        if (typeof t == "function")
+          return { value: t(this.five, { tag: e, distance: r }), reason: "config function result" };
+        if (t.keep === "hidden")
+          return { value: !1, reason: "config.keep is hidden" };
+        if (t.keep === "visible")
+          return { value: !0, reason: "config.keep is visible" };
+        if (t.visiblePanoIndex !== void 0 && t.visiblePanoIndex !== "all" && s !== void 0) {
+          if (Array.isArray(t.visiblePanoIndex) && !t.visiblePanoIndex.includes(s))
+            return {
+              value: !1,
+              reason: `current panoIndex is not included in visiblePano. currentPanoIndex: ${s}, visiblePanoIndex: ${t.visiblePanoIndex}`
+            };
+          if (t.visiblePanoIndex === "current" && s !== ((h = e.fiveState) == null ? void 0 : h.panoIndex))
+            return {
+              value: !1,
+              reason: `current panoIndex is not equal to tag.panoIndex. currentPanoIndex: ${s}, tag.panoIndex: ${(f = e.fiveState) == null ? void 0 : f.panoIndex}`
+            };
+        }
+        if (t.visibleDistance !== void 0 && t.visibleDistance !== "unLimited" && y(r, t.visibleDistance) === !1)
+          return {
+            value: !1,
+            reason: `distance is not in visibleDistance. distance: ${r}, visibleDistance: ${t.visibleDistance}`
+          };
+        if (t.intersectRaycaster !== !1 && (typeof t.intersectRaycaster != "object" || t.intersectRaycaster.enabled !== !1)) {
           if (s === void 0)
-            return !1;
-          const a = (r = this.five.work.observers[s]) == null ? void 0 : r.position;
-          if (a === void 0)
-            throw new Error(`getVisible(): observerPosition is ${a}`);
-          const p = T(e.position).sub(a).normalize();
-          this.raycaster.set(a, p);
-          const [h] = this.five.model.intersectRaycaster(this.raycaster), v = (() => {
-            var C;
-            return typeof n.intersectRaycaster == "object" && (C = n.intersectRaycaster.distanceAccuracy) != null ? C : 0.01;
+            return {
+              value: !1,
+              reason: `intersectRaycaster check failed: fivePanoIndex is ${s}`
+            };
+          const u = (l = this.five.work.observers[s]) == null ? void 0 : l.position;
+          if (u === void 0)
+            throw new Error(`getVisible(): observerPosition is ${u}`);
+          const p = T(e.position).sub(u).normalize();
+          this.raycaster.set(u, p);
+          const [v] = this.five.model.intersectRaycaster(this.raycaster), C = (() => {
+            var m;
+            return typeof t.intersectRaycaster == "object" && (m = t.intersectRaycaster.distanceAccuracy) != null ? m : 0.01;
           })();
-          if (h && h.distance + v < l)
-            return !1;
+          if (v && v.distance + C < r)
+            return {
+              value: !1,
+              reason: `intersectRaycaster check failed: distance is ${r}, intersection.distance is ${v.distance}, distanceError is ${C}`
+            };
+        }
+        if (t.angleRange && E(e)) {
+          const u = this.getAngle(e);
+          if (y(u, t.angleRange) === !1)
+            return { value: !1, reason: `angle is not in angleRange. angle: ${u}, angleRange: ${t.angleRange}` };
         }
-        return !(n.angleRange && R(e) && y(this.getAngle(e), n.angleRange) === !1);
+        return {
+          value: !0,
+          reason: "all check passed"
+        };
       })();
-      return i.visible = f, i.visible;
+      return i.visible = a.value, i.__debug_visiblereason__ = a, i.visible;
     }
   }
-  getUnfoldedByPanoIndex(e, t) {
+  getUnfoldedByPanoIndex(e, n) {
     if (!this.getVisibleByPanoIndex(e))
       return;
-    const s = this.getCaches({ panoIndex: t, id: e.id });
+    const s = this.getCache({ panoIndex: n, id: e.id });
     if (s.unfolded !== void 0)
       return s.unfolded;
     {
       const o = this.getTagConfig(e).unfoldedConfig;
       if (!o)
         return;
-      const f = (() => {
-        const l = this.getDistance(e);
+      const a = (() => {
+        const r = this.getDistance(e);
         if (typeof o == "function")
-          return o(this.five, { tag: e, distance: l });
+          return o(this.five, { tag: e, distance: r });
         if (o.keep === "folded")
           return !1;
         if (o.keep === "unfolded")
           return !0;
-        if (o.unfoldDistance && y(l, o.unfoldDistance) === !1)
+        if (o.unfoldDistance && y(r, o.unfoldDistance) === !1)
           return !1;
       })();
-      s.unfolded = f;
-      const n = this.getUnfoldedByCamera(e);
-      return n !== void 0 ? n : s.unfolded;
+      s.unfolded = a;
+      const t = this.getUnfoldedByCamera(e);
+      return t !== void 0 ? t : s.unfolded;
     }
   }
   getUnfoldedByCamera(e) {
     return this.getVisibleByPanoIndex(e) ? (() => {
-      var f;
+      var a;
       const s = this.getDistance(e), o = this.getTagConfig(e).unfoldedConfig;
       if (!!o) {
         if (typeof o == "function")
@@ -121,97 +150,97 @@ class Y extends z {
         if (o.autoUnfold === void 0 || o.autoUnfold === !1 || o.autoUnfold.enable === !1)
           return;
         if (o.autoUnfold.strategy === "ScreenPostion") {
-          const n = this.getTagProject(e);
-          if (n && y(n.x, o.autoUnfold.autoUnfoldProjectX) === !1)
+          const t = this.getTagProject(e);
+          if (t && y(t.x, o.autoUnfold.autoUnfoldProjectX) === !1)
             return !1;
         }
         if (o.autoUnfold.strategy === "MinimumDistance") {
-          const d = this.filterPointTag().filter((r) => this.getVisibleByPanoIndex(r)).filter((r) => {
-            const a = this.getTagProject(r);
-            if (!a)
+          const d = this.filterPointTag().filter((f) => this.getVisibleByPanoIndex(f)).filter((f) => {
+            const l = this.getTagProject(f);
+            if (!l)
               return !1;
-            const { x: p, y: h, z: v } = a;
-            return !(Math.abs(v) > 1 || Math.abs(p) > 1 || Math.abs(h) > 1);
-          }).map((r) => ({ tag: r, id: r.id, tagConfig: this.getTagConfig(r).unfoldedConfig })).filter(({ tag: r, tagConfig: a }) => {
-            var p, h;
-            return !(typeof a != "object" || a.keep || a.autoUnfold === !1 || ((p = a.autoUnfold) == null ? void 0 : p.enable) === !1 || ((h = a.autoUnfold) == null ? void 0 : h.strategy) !== "MinimumDistance");
-          }).map((r) => x(k({}, r), { distance: this.getDistance(r.tag) })).filter(({ distance: r, tagConfig: a }) => {
-            var p, h;
-            return !(r === void 0 || typeof a != "object" || a.autoUnfold === !1 || ((p = a.autoUnfold) == null ? void 0 : p.enable) === !1 || ((h = a.autoUnfold) == null ? void 0 : h.strategy) !== "MinimumDistance" || a.autoUnfold.distance && y(r, a.autoUnfold.distance) === !1);
-          }).sort((r, a) => r.distance - a.distance).findIndex((r) => r.id === e.id);
-          if (d === -1 || d <= ((f = o.autoUnfold.maxNumber) != null ? f : 1) - 1 === !1)
+            const { x: u, y: p, z: v } = l;
+            return !(Math.abs(v) > 1 || Math.abs(u) > 1 || Math.abs(p) > 1);
+          }).map((f) => ({ tag: f, id: f.id, tagConfig: this.getTagConfig(f).unfoldedConfig })).filter(({ tag: f, tagConfig: l }) => {
+            var u, p;
+            return !(typeof l != "object" || l.keep || l.autoUnfold === !1 || ((u = l.autoUnfold) == null ? void 0 : u.enable) === !1 || ((p = l.autoUnfold) == null ? void 0 : p.strategy) !== "MinimumDistance");
+          }).map((f) => I(x({}, f), { distance: this.getDistance(f.tag) })).filter(({ distance: f, tagConfig: l }) => {
+            var u, p;
+            return !(f === void 0 || typeof l != "object" || l.autoUnfold === !1 || ((u = l.autoUnfold) == null ? void 0 : u.enable) === !1 || ((p = l.autoUnfold) == null ? void 0 : p.strategy) !== "MinimumDistance" || l.autoUnfold.distance && y(f, l.autoUnfold.distance) === !1);
+          }).sort((f, l) => f.distance - l.distance).findIndex((f) => f.id === e.id);
+          if (d === -1 || d <= ((a = o.autoUnfold.maxNumber) != null ? a : 1) - 1 === !1)
             return !1;
         }
         return !0;
       }
     })() : void 0;
   }
-  getDistance(e, t) {
-    var o, f, n;
-    const i = (o = this.five.panoIndex) != null ? o : t;
+  getDistance(e, n) {
+    var o, a, t;
+    const i = (o = this.five.panoIndex) != null ? o : n;
     if (i === void 0)
       throw new Error(`getDistance(): fivePanoIndex is ${i}`);
-    const s = this.getCaches({ panoIndex: t, id: e.id });
+    const s = this.getCache({ panoIndex: n, id: e.id });
     if (s.distance !== void 0)
       return s.distance;
     {
-      const l = (n = (f = this.five.work) == null ? void 0 : f.observers[i]) == null ? void 0 : n.position;
-      if (l === void 0)
-        throw new Error(`getDistance(): observerPosition is ${l}`);
-      const d = (() => V(e) ? M(e == null ? void 0 : e.position) : T(e.position))(), g = l.distanceTo(d);
-      return s.distance = g, g;
+      const r = (t = (a = this.five.work) == null ? void 0 : a.observers[i]) == null ? void 0 : t.position;
+      if (r === void 0)
+        throw new Error(`getDistance(): observerPosition is ${r}`);
+      const d = (() => V(e) ? M(e == null ? void 0 : e.position) : T(e.position))(), h = r.distanceTo(d);
+      return s.distance = h, h;
     }
   }
-  getAngle(e, t) {
-    var o, f, n;
-    const i = (o = this.five.panoIndex) != null ? o : t;
+  getAngle(e, n) {
+    var o, a, t;
+    const i = (o = this.five.panoIndex) != null ? o : n;
     if (i === void 0)
       throw new Error(`getDistance(): fivePanoIndex is ${i}`);
-    const s = this.getCaches({ panoIndex: t, id: e.id });
+    const s = this.getCache({ panoIndex: n, id: e.id });
     if (s.angle !== void 0)
       return s.angle;
     {
-      const l = (n = (f = this.five.work) == null ? void 0 : f.observers[i]) == null ? void 0 : n.position;
-      if (l === void 0)
-        throw new Error(`getAngleRange(): observerPosition is ${l}`);
-      const d = (() => e.stickType === "3DPoint" ? S(e.normal) : $(e.position))();
+      const r = (t = (a = this.five.work) == null ? void 0 : a.observers[i]) == null ? void 0 : t.position;
+      if (r === void 0)
+        throw new Error(`getAngleRange(): observerPosition is ${r}`);
+      const d = (() => e.stickType === "3DPoint" ? S(e.normal) : _(e.position))();
       if (!d)
         return;
-      const g = new I.Vector3().copy(l).sub(T(e.position)), r = d.angleTo(g) * 180 / Math.PI;
-      return s.angle = r, s.angle;
+      const h = new U.Vector3().copy(r).sub(T(e.position)), f = d.angleTo(h) * 180 / Math.PI;
+      return s.angle = f, s.angle;
     }
   }
   getTagConfig(e) {
     var s;
     if (!e)
       return (s = this.config.globalConfig) != null ? s : {};
-    const t = {};
+    const n = {};
     this.config.contentTypeConfig && Object.keys(this.config.contentTypeConfig).forEach((o) => {
-      const f = o;
-      if (t[f])
+      const a = o;
+      if (n[a])
         return;
-      const n = f.split("-");
-      if (n.length === 1) {
-        const [l] = n;
-        e.contentType === l && (t[f] = this.config.contentTypeConfig[f]);
+      const t = a.split("-");
+      if (t.length === 1) {
+        const [r] = t;
+        e.contentType === r && (n[a] = this.config.contentTypeConfig[a]);
       }
-      if (n.length === 2) {
-        const [l = "Any", d = "Any"] = n;
-        (e.stickType === l || l === "Any") && (e.contentType === d || d === "Any") && (t[f] = this.config.contentTypeConfig[f]);
+      if (t.length === 2) {
+        const [r = "Any", d = "Any"] = t;
+        (e.stickType === r || r === "Any") && (e.contentType === d || d === "Any") && (n[a] = this.config.contentTypeConfig[a]);
       }
-      if (n.length === 3) {
-        const [l = "Any", d, g] = n;
+      if (t.length === 3) {
+        const [r = "Any", d, h] = t;
         if (d === "Audio" && e.contentType === "Audio") {
-          const r = e;
-          (r.stickType === l || l === "Any") && r.data.appearance === g && (t[f] = this.config.contentTypeConfig[f]);
+          const f = e;
+          (f.stickType === r || r === "Any") && f.data.appearance === h && (n[a] = this.config.contentTypeConfig[a]);
         }
       }
     });
-    const i = D({}, this.config.globalConfig, ...Object.values(t), e.config);
+    const i = D({}, this.config.globalConfig, ...Object.values(n), e.config);
     return typeof i.unfoldedConfig == "object" && (i.unfoldedConfig.disableFold && (i.unfoldedConfig = { keep: "unfolded" }), i.unfoldedConfig.disableUnfold && (i.unfoldedConfig = { keep: "folded" }), i.unfoldedConfig.keep && (i.unfoldedConfig = { keep: i.unfoldedConfig.keep })), typeof i.visibleConfig == "object" && i.visibleConfig.keep && (i.visibleConfig = { keep: i.visibleConfig.keep }), i;
   }
-  can(e, t) {
-    const i = this.getTagConfig(t);
+  can(e, n) {
+    const i = this.getTagConfig(n);
     if (!i || typeof i != "object")
       return !0;
     if (e === "show" || e === "hide") {
@@ -229,37 +258,37 @@ class Y extends z {
     return !0;
   }
   sort(e) {
-    return e.sort((t, i) => {
-      const s = this.getDistance(t), o = this.getDistance(i);
+    return e.sort((n, i) => {
+      const s = this.getDistance(n), o = this.getDistance(i);
       return s === void 0 || o === void 0 ? 0 : o - s;
     });
   }
   setPointTagPosition() {
     const e = this.filterPointTag();
-    e.length !== 0 && e.forEach((t) => {
+    e.length !== 0 && e.forEach((n) => {
       var s;
-      if (!((s = t.state) != null && s.visible)) {
-        t.pointTagStyle = void 0;
+      if (!((s = n.state) != null && s.visible)) {
+        n.pointTagStyle = null;
         return;
       }
-      const i = this.getTagProject(t);
+      const i = this.getTagProject(n);
       if (!i) {
-        t.pointTagStyle = void 0;
+        n.pointTagStyle = null;
         return;
       }
-      t.pointTagStyle = { leftPercent: (i.x + 1) / 2 * 100, topPercent: (-i.y + 1) / 2 * 100 };
+      n.pointTagStyle = { leftPercent: (i.x + 1) / 2 * 100, topPercent: (-i.y + 1) / 2 * 100 };
     });
   }
   setVisibleByPanoIndex() {
     this.tags.forEach((e) => {
-      const t = this.getVisibleByPanoIndex(e);
-      e.state && (e.state.visible = t);
+      const n = this.getVisibleByPanoIndex(e);
+      e.state && (e.state.visible = n);
     });
   }
   setUnfoldedByPanoIndex() {
     this.tags.forEach((e) => {
-      const t = this.getUnfoldedByPanoIndex(e);
-      if (!!e.state && (t !== void 0 && (e.state.unfolded = t), t && !e.state.visible)) {
+      const n = this.getUnfoldedByPanoIndex(e);
+      if (!!e.state && (n !== void 0 && (e.state.unfolded = n), n && !e.state.visible)) {
         const i = this.getTagConfig(e);
         typeof i.unfoldedConfig == "object" && i.unfoldedConfig.autoUnfoldWhenHide !== !1 && (e.state.unfolded = !1);
       }
@@ -268,9 +297,9 @@ class Y extends z {
   getTagProject(e) {
     if (!this.getVisibleByPanoIndex(e))
       return;
-    const i = T(e.position), { x: s, y: o, z: f } = i.project(this.five.camera);
-    if (!(f > 1))
-      return { x: s, y: o, z: f };
+    const i = T(e.position), { x: s, y: o, z: a } = i.project(this.five.camera);
+    if (!(a > 1))
+      return { x: s, y: o, z: a };
   }
   filterPointTag() {
     return this.tags.filter((e) => e.stickType === "2DPoint" || e.stickType === "3DPoint");
@@ -288,9 +317,9 @@ class Y extends z {
     return this.tags.filter((e) => e.stickType === "Plane");
   }
   updateTagConfig(e) {
-    e != null && e.force && this.clearCache(), this.tags.forEach((t) => {
-      const i = this.getTagConfig(t);
-      t.mergedConfig = i;
+    e != null && e.force && this.clearCache(), this.tags.forEach((n) => {
+      const i = this.getTagConfig(n);
+      n.mergedConfig = i;
     });
   }
 }

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

@@ -90,7 +90,7 @@ declare class PanoTagPluginController extends TagComputer {
      * @description: 改变tag任意属性
      */
     changeTagById<C extends TagContentType = any>(id: TagId, tag: PartialDeep<{
-        [P in keyof Pick<Tag<C>, 'enabled' | 'style' | 'stickType' | 'contentType' | 'data' | 'normal'>]: Tag[P];
+        [P in keyof Pick<Tag<C>, 'enabled' | 'style' | 'stickType' | 'contentType' | 'data' | 'normal' | 'config'>]: Tag[P];
     }>, deepMerge?: boolean): void;
     /**
      * @description: 销毁tag

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

@@ -73,6 +73,10 @@ export interface TagCache {
     minimumDistanceResult?: boolean;
     distance?: number;
     angle?: number;
+    __debug_visiblereason__?: {
+        value: boolean;
+        reason?: string;
+    };
 }
 export declare type TagElement<C extends TagContentType = TagContentType, S extends StickType = StickType> = Tag<C, S> & Partial<{
     pointTagStyle: {

package/libs/PanoTagPlugin/typings/tag/TagData.d.ts

@@ -9,7 +9,6 @@ export declare type MediaData = {
 };
 declare type Object = Record<string | number | symbol, any>;
 export declare type ObjectFit = 'fill' | 'contain' | 'cover' | 'none' | 'scale-down';
-/**  @deprecated 改用具体的string */
 export declare enum ContentType {
     /** 音频标签 */
     Audio = "Audio",

package/package.json

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