@realsee/dnalogel 2.26.2 → 2.27.0-dev.1

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -1,18 +1,19 @@
-var y = Object.defineProperty;
-var D = (c, u, e) => u in c ? y(c, u, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[u] = e;
-var l = (c, u, e) => (D(c, typeof u != "symbol" ? u + "" : u, e), e);
-import { objectAssignDeepExports as T } from "../../vendor/object-assign-deep/objectAssignDeep.js";
-import * as P from "three";
-import { DefaultConfig as C } from "../tag.config.js";
-import { anyPositionToVector3 as w, arrayPositionToVector3 as h } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
-import { planeNormal as p } from "../utils/planeNormal.js";
-import { tagPosition as M, getTagPosition as E } from "../utils/tagPosition.js";
-import { normalPositionToPositions as k } from "../utils/normalPositionToPositions.js";
-import { TagCache as b } from "./TagCache.js";
-import { writable as I } from "../../vendor/svelte/src/runtime/store/index.js";
-import { isIOSWX as A } from "../../shared-utils/device.js";
-import { isMediaPlaneTag as S, isMediaModelTag as g, isPlaneTag as V, isPoint3DTag as F } from "../utils/tag/tagCheck.js";
-import { VideoPlane as L } from "../utils/model/mediaPlane.js";
+var P = Object.defineProperty;
+var w = (h, c, e) => c in h ? P(h, c, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[c] = e;
+var u = (h, c, e) => (w(h, typeof c != "symbol" ? c + "" : c, e), e);
+import { defaultGlobalConfig as M } from "../typings/tag/TagConfig.js";
+import { objectAssignDeepExports as p } from "../../vendor/object-assign-deep/objectAssignDeep.js";
+import * as b from "three";
+import { DefaultConfig as E } from "../tag.config.js";
+import { anyPositionToVector3 as k, arrayPositionToVector3 as g } from "../../shared-utils/positionToVector3.js";
+import { planeNormal as v } from "../utils/planeNormal.js";
+import { getTagCenterPosition as D } from "../utils/tagPosition.js";
+import { normalPositionToPositions as I } from "../utils/normalPositionToPositions.js";
+import { TagCache as S } from "./TagCache.js";
+import { writable as A } from "../../vendor/svelte/src/runtime/store/index.js";
+import { isIOSWX as V } from "../../shared-utils/device.js";
+import { isMediaPlaneTag as F, isMediaModelTag as T, isPlaneTag as L, isPoint3DTag as O } from "../utils/tag/tagCheck.js";
+import { VideoPlane as W } from "../utils/model/mediaPlane.js";
 import { FiveDomEvents as R } from "../../shared-utils/five/FiveDomEvents.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../../base/BasePlugin.js";
@@ -41,36 +42,36 @@ import "../Assets/Icon.js";
 import "../../shared-utils/three/getPositionsByObjectFit.js";
 import "../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../../shared-utils/threex/domevents/index.js";
-class Pe extends b {
+class Me extends S {
   constructor(e) {
     super(e);
-    l(this, "tags", []);
-    l(this, "config", C);
-    l(this, "mediaStore", I({
+    u(this, "tags", []);
+    u(this, "config", E);
+    u(this, "mediaStore", A({
       currentMediaElement: null
     }));
     /** css3DRenderPlugin */
-    l(this, "css3DRenderPlugin");
-    l(this, "store", {
+    u(this, "css3DRenderPlugin");
+    u(this, "store", {
       disposers: [],
       disposed: !1,
       resizeObserverDisposerAdding: !1,
       css3DRenderDisposer: /* @__PURE__ */ new Map()
     });
-    l(this, "domEvents", new R(this.five));
-    l(this, "mouseInfo");
-    l(this, "preventWhenMouseDown", () => {
+    u(this, "domEvents", new R(this.five));
+    u(this, "mouseInfo");
+    u(this, "preventWhenMouseDown", () => {
       var e;
       if ((e = this.mouseInfo) != null && e.isDown)
-        return !1;
+        return console.debug("preventWhenMouseDown 2"), !1;
     });
-    this.five.on("wantsMoveToPano", this.preventWhenMouseDown), this.five.on("wantsTapGesture", this.preventWhenMouseDown), this.mediaStore.subscribe(({ currentMediaElement: i }) => {
-      this.tags.forEach((t) => {
-        var o;
-        if (t.mediaPlane instanceof L && i !== t.mediaPlane.videoInstance) {
-          if (!((o = t.mediaPlane.videoInstance) != null && o.src) || i === t.mediaPlane.videoInstance)
+    this.five.on("wantsMoveToPano", this.preventWhenMouseDown), this.five.on("wantsTapGesture", this.preventWhenMouseDown), this.mediaStore.subscribe(({ currentMediaElement: t }) => {
+      this.tags.forEach((o) => {
+        var i;
+        if (o.mediaPlane instanceof W && t !== o.mediaPlane.videoInstance) {
+          if (!((i = o.mediaPlane.videoInstance) != null && i.src) || t === o.mediaPlane.videoInstance)
             return;
-          t.mediaPlane.pause();
+          o.mediaPlane.pause();
         }
       });
     }), this.store.disposers.push(() => {
@@ -81,12 +82,12 @@ class Pe extends b {
     return this.five.currentMode === "Panorama";
   }
   getTagById(e) {
-    const i = this.tags.find((t) => t.id === e);
-    if (!i) {
-      console.warn(`error: can not find tag id ${e} by getTagById()`);
+    const t = this.tags.find((o) => o.id === e);
+    if (!t) {
+      console.warn(`getTagById Error: can't find tag id: ${e}`);
       return;
     }
-    return i;
+    return t;
   }
   /** 暂停当前标签内进行的所有多媒体 */
   pauseCurrentMedia() {
@@ -94,191 +95,211 @@ class Pe extends b {
   }
   /**
    * @description: 获取merge后的配置
-   * TODO: 缓存
    */
-  getTagConfig(e) {
-    var o, d;
+  getTagConfig(e, t = { useCache: !0 }) {
+    var a, d, r;
     if (!e)
-      return (o = this.config.globalConfig) != null ? o : {};
-    const i = {};
-    this.config.contentTypeConfig && Object.keys(this.config.contentTypeConfig).forEach((a) => {
-      const r = a;
-      if (i[r])
+      return (a = this.config.globalConfig) != null ? a : {};
+    if (t.useCache && ((d = e.config) != null && d.isMerged))
+      return e.config;
+    const o = {};
+    this.config.contentTypeConfig && Object.keys(this.config.contentTypeConfig).forEach((l) => {
+      const n = l;
+      if (o[n])
         return;
-      const f = r.split("-");
-      if (f.length === 1) {
-        const [s] = f;
-        e.contentType === s && (i[r] = this.config.contentTypeConfig[r]);
+      const s = n.split("-");
+      if (s.length === 1) {
+        const [f] = s;
+        e.contentType === f && (o[n] = this.config.contentTypeConfig[n]);
       }
-      if (f.length === 2) {
-        const [s = "Any", n = "Any"] = f;
-        s === "Mixin" && e.contentType === n && (i[r] = this.config.contentTypeConfig[r]), (e.stickType === s || s === "Any") && (e.contentType === n || n === "Any") && (i[r] = this.config.contentTypeConfig[r]);
+      if (s.length === 2) {
+        const [f = "Any", m = "Any"] = s;
+        f === "Mixin" && e.contentType === m && (o[n] = this.config.contentTypeConfig[n]), (e.stickType === f || f === "Any") && (e.contentType === m || m === "Any") && (o[n] = this.config.contentTypeConfig[n]);
       }
-      if (f.length === 3) {
-        const [s = "Any", n, m] = f;
-        if (n === "Audio" && e.contentType === "Audio") {
-          const v = e;
-          (v.stickType === s || s === "Any") && v.data.appearance === m && (i[r] = this.config.contentTypeConfig[r]);
+      if (s.length === 3) {
+        const [f = "Any", m, C] = s;
+        if (m === "Audio" && e.contentType === "Audio") {
+          const y = e;
+          (y.stickType === f || f === "Any") && y.data.appearance === C && (o[n] = this.config.contentTypeConfig[n]);
         }
       }
     });
-    const t = T({}, this.config.globalConfig, ...Object.values(i), e.config);
-    return typeof t.unfoldedConfig == "object" && (t.unfoldedConfig.disableFold && (t.unfoldedConfig = { keep: "unfolded" }), t.unfoldedConfig.disableUnfold && (t.unfoldedConfig = { keep: "folded" }), t.unfoldedConfig.keep && (t.unfoldedConfig = { keep: t.unfoldedConfig.keep })), typeof t.visibleConfig == "object" && t.visibleConfig.keep && (t.visibleConfig = { keep: t.visibleConfig.keep, visibleFiveMode: (d = t.visibleConfig) == null ? void 0 : d.visibleFiveMode }), t;
+    const i = p(
+      {},
+      M,
+      this.config.globalConfig,
+      ...Object.values(o),
+      e.config
+    );
+    return typeof i.visibleConfig == "object" && i.visibleConfig.keep && (i.visibleConfig = { keep: i.visibleConfig.keep, visibleFiveMode: (r = i.visibleConfig) == null ? void 0 : r.visibleFiveMode }), 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 })), i.isMerged = !0, i;
+  }
+  /**
+   * @description 获取标签当前状态
+   */
+  getCurrentVisibleState(e) {
+    return !(!this.state.enabled || !this.state.visible || !e.enabled || !e.state.visible);
   }
   loadVideoFirstFrame() {
-    A && this.hooks.emit("loadVideoFirstFrame");
+    V && this.hooks.emit("loadVideoFirstFrame");
   }
-  updateTagConfig(e) {
-    e != null && e.force && this.clearCache(), this.tags.forEach((i) => {
-      const t = this.getTagConfig(i);
-      i.config = t, i.data = T({}, t.initialData, i.data);
+  updateTagConfig() {
+    this.clearCache(), this.tags.forEach((e) => {
+      const t = this.getTagConfig(e, { useCache: !1 });
+      e.config = t;
+      const o = JSON.parse(JSON.stringify(e.data));
+      e.data = t.initialData.important ? p(e.data, o, t.initialData) : p(e.data, t.initialData, o);
     });
   }
-  can(e, i) {
-    const t = i, o = this.getTagConfig(t);
-    if (!o || typeof o != "object")
+  can(e, t) {
+    const o = t, i = this.getTagConfig(o);
+    if (!i || typeof i != "object")
       return !0;
     if (e === "show" || e === "hide") {
-      if (!o.visibleConfig || typeof o.visibleConfig != "object")
+      if (!i.visibleConfig || typeof i.visibleConfig != "object")
         return !0;
-      if (e === "show" && o.visibleConfig.keep === "hidden" || e === "hide" && (o.visibleConfig.keep === "visible" || o.visibleConfig.alwaysShowWhenMovePano))
+      if (e === "show" && i.visibleConfig.keep === "hidden" || e === "hide" && (i.visibleConfig.keep === "visible" || i.visibleConfig.alwaysShowWhenMovePano))
         return !1;
     }
     if (e === "fold" || e === "unfold") {
-      if (!o.unfoldedConfig || typeof o.unfoldedConfig != "object")
+      if (!i.unfoldedConfig || typeof i.unfoldedConfig != "object")
         return !0;
-      if (e === "fold" && o.unfoldedConfig.keep === "unfolded" || e === "unfold" && o.unfoldedConfig.keep === "folded")
+      if (e === "fold" && i.unfoldedConfig.keep === "unfolded" || e === "unfold" && i.unfoldedConfig.keep === "folded")
         return !1;
     }
     return !0;
   }
   getRenderType(e) {
-    const i = (() => {
+    const t = (() => {
       if (e.stickType === "3DPoint")
         return "Dom";
-      const t = this.getTagConfig(e);
-      if (!t || typeof t != "object" || !t.renderType)
+      const o = this.getTagConfig(e);
+      if (!o || typeof o != "object" || !o.renderType)
         return;
-      const o = e.data.mediaData;
-      if (!(!o || o.length === 0) && t.renderType === "Mesh") {
-        if (S(e)) {
-          if (o.length === 1 && (o[0].type === "Image" || o[0].type === "Video"))
+      const i = e.data.mediaData;
+      if (!(!i || i.length === 0) && o.renderType === "Mesh") {
+        if (F(e)) {
+          if (i.length === 1 && (i[0].type === "Image" || i[0].type === "Video"))
             return "Mesh";
-        } else if (g(e))
-          return o.length === 1 && o[0].type === "Image" ? "Mesh" : "BehindDom";
+        } else if (T(e))
+          return i.length === 1 && i[0].type === "Image" ? "Mesh" : "BehindDom";
       }
     })();
-    return i != null ? i : "Dom";
+    return t != null ? t : "Dom";
   }
   /**
    * @description: 获取角度
    */
-  getAngle(e, i) {
-    var d, a;
-    const t = i != null ? i : this.five.getCurrentState().panoIndex;
-    if (t === void 0)
-      throw new Error(`getDistance(): fivePanoIndex is ${t}`);
-    const o = this.getCache({ panoIndex: i, id: e.id });
-    if (o.angle !== void 0)
-      return o.angle;
+  getAngle(e, t) {
+    var a, d;
+    const o = t != null ? t : this.five.getCurrentState().panoIndex;
+    if (o === void 0)
+      throw new Error(`getDistance(): fivePanoIndex is ${o}`);
+    const i = this.getCache({ panoIndex: t, id: e.id });
+    if (i.angle !== void 0)
+      return i.angle;
     {
-      const r = (a = (d = this.five.work) == null ? void 0 : d.observers[t]) == null ? void 0 : a.position;
+      const r = (d = (a = this.five.work) == null ? void 0 : a.observers[o]) == null ? void 0 : d.position;
       if (r === void 0)
         throw new Error(`getAngleRange(): observerPosition is ${r}`);
-      const f = (() => e.stickType === "3DPoint" ? w(e.normal) : p(e.position))();
-      if (!f)
+      const l = (() => e.stickType === "3DPoint" ? k(e.normal) : v(e.position))();
+      if (!l)
         return;
-      const s = M(e.position);
-      if (!s)
+      const n = D(e);
+      if (!n)
         return;
-      const n = new P.Vector3().copy(r).sub(s), m = f.angleTo(n) * 180 / Math.PI;
-      return o.angle = m, o.angle;
+      const s = new b.Vector3().copy(r).sub(n), f = l.angleTo(s) * 180 / Math.PI;
+      return i.angle = f, i.angle;
     }
   }
   /**
    * @description: 获取距离
    */
-  getDistance(e, i) {
-    var d, a;
-    const t = i != null ? i : this.five.getCurrentState().panoIndex;
-    if (t === void 0)
-      throw new Error(`getDistance(): fivePanoIndex is ${t}`);
-    const o = this.getCache({ panoIndex: i, id: e.id });
-    if (o.distance !== void 0)
-      return o.distance;
+  getDistance(e, t) {
+    var a, d;
+    const o = t != null ? t : this.five.getCurrentState().panoIndex;
+    if (o === void 0)
+      throw new Error(`getDistance(): fivePanoIndex is ${o}`);
+    const i = this.getCache({ panoIndex: t, id: e.id });
+    if (i.distance !== void 0)
+      return i.distance;
     {
-      const r = (a = (d = this.five.work) == null ? void 0 : d.observers[t]) == null ? void 0 : a.position;
+      const r = (d = (a = this.five.work) == null ? void 0 : a.observers[o]) == null ? void 0 : d.position;
       if (r === void 0)
         throw new Error(`getDistance(): observerPosition is ${r}`);
-      const f = E(e);
-      if (!f)
+      const l = D(e);
+      if (!l)
         return -1;
-      const s = r.distanceTo(f);
-      return o.distance = s, s;
+      const n = r.distanceTo(l);
+      return i.distance = n, n;
     }
   }
   getPositions(e) {
-    if (V(e))
+    if (L(e))
       return e.position;
-    if (g(e))
+    if (T(e))
       return e.data.mediaPosition;
-    if (F(e))
-      return k(this.five.camera.position, h(e.position), h(e.normal));
+    if (O(e))
+      return I(this.five.camera.position, g(e.position), g(e.normal));
   }
-  addObjectClickHandler(e, i, t) {
-    if (!i || !this.domEvents)
+  addObjectClickHandler(e, t, o) {
+    if (!t || !this.domEvents)
       return () => {
       };
-    const o = () => !(!e.state.visible || !this.state.visible || g(e) && !e.mediaVisible), d = (s) => {
-      if (!o()) {
+    const i = () => !(!this.getCurrentVisibleState(e) || T(e) && !e.mediaVisible), a = (n) => {
+      if (!i()) {
         this.mouseInfo = void 0;
         return;
       }
-      const n = s.origDomEvent;
+      const s = n.origDomEvent;
       this.mouseInfo = {
-        x: n.clientX,
-        y: n.clientY,
+        x: s.clientX,
+        y: s.clientY,
         isDown: !0,
         mouseDownTimestamp: Date.now()
       };
-    }, a = (s) => {
-      if (!o()) {
+    }, d = (n) => {
+      if (!i()) {
         this.mouseInfo = void 0;
         return;
       }
-      const n = s.origDomEvent;
-      this.mouseInfo && (this.mouseInfo.isDown && this.mouseInfo.x === n.clientX && this.mouseInfo.y === n.clientY && Date.now() - this.mouseInfo.mouseDownTimestamp < 400 && t(n), this.mouseInfo = void 0);
-    }, r = (s) => {
-      if (!o()) {
+      if (!this.mouseInfo)
+        return;
+      const s = n.origDomEvent;
+      this.mouseInfo.isDown && this.mouseInfo.x === s.clientX && this.mouseInfo.y === s.clientY && Date.now() - this.mouseInfo.mouseDownTimestamp < 400 && o(s), this.mouseInfo = void 0;
+    }, r = (n) => {
+      if (!i()) {
         this.mouseInfo = void 0;
         return;
       }
-      const n = s.origDomEvent;
+      const s = n.origDomEvent;
       this.mouseInfo = {
-        x: Math.floor(n.touches[0].clientX),
-        y: Math.floor(n.touches[0].clientY),
+        x: Math.floor(s.touches[0].clientX),
+        y: Math.floor(s.touches[0].clientY),
         isDown: !0,
         mouseDownTimestamp: Date.now()
       };
-    }, f = (s) => {
-      if (!o()) {
+    }, l = (n) => {
+      if (!i()) {
         this.mouseInfo = void 0;
         return;
       }
-      const n = s.origDomEvent;
-      this.mouseInfo && (this.mouseInfo.isDown && this.mouseInfo.x === Math.floor(n.changedTouches[n.changedTouches.length - 1].clientX) && this.mouseInfo.y === Math.floor(n.changedTouches[n.changedTouches.length - 1].clientY) && Date.now() - this.mouseInfo.mouseDownTimestamp < 400 && t(n), this.mouseInfo = void 0);
+      if (!this.mouseInfo)
+        return;
+      const s = n.origDomEvent;
+      this.mouseInfo.isDown && this.mouseInfo.x === Math.floor(s.changedTouches[s.changedTouches.length - 1].clientX) && this.mouseInfo.y === Math.floor(s.changedTouches[s.changedTouches.length - 1].clientY) && Date.now() - this.mouseInfo.mouseDownTimestamp < 400 && o(s), this.mouseInfo = void 0;
     };
-    return this.domEvents.addEventListener(i, "mousedown", d, !1), this.domEvents.addEventListener(i, "mouseup", a, !1), this.domEvents.addEventListener(i, "touchstart", r, !1), this.domEvents.addEventListener(i, "touchend", f, !1), () => {
-      this.domEvents && (this.mouseInfo = void 0, this.domEvents.removeEventListener(i, "mousedown", d), this.domEvents.removeEventListener(i, "mouseup", a), this.domEvents.removeEventListener(i, "touchstart", r), this.domEvents.removeEventListener(i, "touchend", f));
+    return this.domEvents.addEventListener(t, "mousedown", a, !1), this.domEvents.addEventListener(t, "mouseup", d, !1), this.domEvents.addEventListener(t, "touchstart", r, !1), this.domEvents.addEventListener(t, "touchend", l, !1), () => {
+      var n, s, f, m;
+      this.mouseInfo = void 0, (n = this.domEvents) == null || n.removeEventListener(t, "mousedown", a), (s = this.domEvents) == null || s.removeEventListener(t, "mouseup", d), (f = this.domEvents) == null || f.removeEventListener(t, "touchstart", r), (m = this.domEvents) == null || m.removeEventListener(t, "touchend", l);
     };
   }
   getTagNormal(e) {
     if (e.normal)
-      return h(e.normal);
+      return g(e.normal);
     if (e.stickType === "Plane")
-      return p(e.position);
+      return v(e.position);
     if (e.stickType === "Model")
-      return p(this.getPositions(e));
+      return v(this.getPositions(e));
   }
   // TODO: 优化点：下面这些函数，调用比较频繁，可以按点位加缓存
   get filterPointTag() {
@@ -287,9 +308,6 @@ class Pe extends b {
   get filter2DPointTag() {
     return this.tags.filter((e) => e.stickType === "2DPoint").filter((e) => e.position);
   }
-  get filter3DPointTag() {
-    return this.tags.filter((e) => e.stickType === "3DPoint").filter((e) => e.position);
-  }
   get filterImagePlane() {
     return this.tags.filter(
       (e) => e.contentType === "MediaPlane" && e.stickType === "Plane" && this.getRenderType(e) === "Mesh"
@@ -298,15 +316,12 @@ class Pe extends b {
   get filterMediaModel() {
     return this.tags.filter((e) => e.stickType === "Model" && e.contentType === "MediaModel");
   }
-  get filterModelTag() {
-    return this.tags.filter((e) => e.stickType === "Model");
-  }
   get filterCSS3DTag() {
     return this.tags.filter(
-      (i) => i.stickType === "3DPoint" || i.stickType === "Plane" || i.stickType === "Model" && i.contentType === "MediaModel"
-    ).filter((i) => {
-      const t = this.getRenderType(i);
-      return t === "BehindDom" || t === "Dom";
+      (t) => t.stickType === "3DPoint" || t.stickType === "Plane" || t.stickType === "Model" && t.contentType === "MediaModel"
+    ).filter((t) => {
+      const o = this.getRenderType(t);
+      return o === "BehindDom" || o === "Dom";
     });
   }
   /**
@@ -318,5 +333,5 @@ class Pe extends b {
   }
 }
 export {
-  Pe as TagUtil
+  Me as TagUtil
 };

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

@@ -1,5 +1,5 @@
-import type { Tag, TagId, Tags, TagInstance, State, AddTagConfig, LoadTagConfig, ContentTypeConfigKey, TagConfig } from '../typings';
-import type { PickTagContentTypeInContentTypeConfigKey, TagContentType } from '..';
+import type { Tag, TagId, Tags, TagInstance, State, AddTagConfig, LoadTagConfig, ContentTypeConfigKey } from '../typings';
+import type { TagConfigByKey, TagContentType } from '..';
 import type { ArrayPosition } from '../typings';
 import { type Five } from '@realsee/five';
 import { TagRender } from './TagRender';
@@ -38,7 +38,7 @@ declare class PanoTagPluginController extends TagRender {
     /**
      * @description: 改变类型配置
      */
-    changeContentTypeConfig<T extends ContentTypeConfigKey>(key: ContentTypeConfigKey, contentTypeConfig: PickTagContentTypeInContentTypeConfigKey<T> extends TagContentType ? TagConfig<PickTagContentTypeInContentTypeConfigKey<T>> : unknown, merge?: boolean): void;
+    changeContentTypeConfig<T extends ContentTypeConfigKey>(key: T, contentTypeConfig: TagConfigByKey<T>, merge?: boolean): void;
     show(params?: {
         userAction?: boolean;
         withAnimation?: boolean;