@realsee/dnalogel 3.2.0-dev.8 → 3.2.1

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

@@ -1,4 +1,4 @@
-import type { TagInstance, TagContentType, StickType, TagId, TagConfig, PlaneTag, MediaStore, Position } from '../typings';
+import type { TagInstance, TagContentType, StickType, TagId, TagConfig, PlaneTag, MediaStore } from '../typings';
 import * as THREE from 'three';
 import type { Tag, Tags, PointTagInstance, Point3DTag } from '../typings';
 import { TagCache } from './TagCache';
@@ -10,9 +10,6 @@ import { FiveDomEvents } from '../../shared-utils/five/FiveDomEvents';
 export declare abstract class TagUtil extends TagCache {
     tags: TagInstance[];
     config: Pick<Tags, 'globalConfig' | 'contentTypeConfig'>;
-    set workCode(workCode: string);
-    get workCode(): string;
-    protected get work(): import("@realsee/five").Work;
     protected mediaStore: MediaStore;
     /** css3DRenderPlugin */
     protected css3DRenderPlugin?: CSS3DRenderPluginExportType;
@@ -27,7 +24,7 @@ export declare abstract class TagUtil extends TagCache {
         disposed: boolean;
     };
     protected domEvents: FiveDomEvents;
-    private _workCode;
+    private mouseInfo?;
     protected constructor(five: Five);
     getTagById<C extends TagContentType = TagContentType, S extends StickType = StickType>(id: TagId): TagInstance<C, S> | undefined;
     /** 暂停当前标签内进行的所有多媒体 */
@@ -43,7 +40,6 @@ export declare abstract class TagUtil extends TagCache {
      * @description 获取标签当前状态
      */
     getCurrentVisibleState(tag: TagInstance): boolean;
-    protected getObserverPosition: (index: number) => THREE.Vector3;
     protected loadVideoFirstFrame: () => void;
     protected updateTagConfig(): void;
     protected can<T extends Tag>(action: 'show' | 'hide' | 'fold' | 'unfold', paramsTag: T): boolean;
@@ -56,7 +52,8 @@ export declare abstract class TagUtil extends TagCache {
      * @description: 获取距离
      */
     protected getDistance(tag: TagInstance, fiveState?: Partial<FiveState>): number;
-    protected getPositions(tag: TagInstance): [Position, Position, Position, Position];
+    protected getPositions(tag: TagInstance): [THREE.Vector3, THREE.Vector3, THREE.Vector3, THREE.Vector3] | [import("../typings").ArrayPosition, import("../typings").ArrayPosition, import("../typings").ArrayPosition, import("../typings").ArrayPosition];
+    protected preventWhenMouseDown: () => false | void;
     protected addObjectClickHandler(tag: TagInstance, object: THREE.Object3D | undefined, handler: (event: Event) => any): () => void;
     protected getTagNormal(tag: TagInstance): THREE.Vector3 | undefined;
     protected get filterPointTag(): PointTagInstance[];
@@ -64,7 +61,6 @@ export declare abstract class TagUtil extends TagCache {
     protected get filterImagePlane(): TagInstance<"MediaPlane", "Plane">[];
     protected get filterMediaModel(): TagInstance<"MediaModel", "Model">[];
     protected get filterCSS3DTag(): (TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "Plane"> | TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "Model"> | TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "3DPoint">)[];
-    protected getTransformedPostion(position: Tag['position']): THREE.Vector3 | [THREE.Vector3, THREE.Vector3, THREE.Vector3, THREE.Vector3];
     /**
      * @description 检查是否已经销毁
      * @returns isDisposed; 已经销毁返回 true，否则返回 false

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -1,40 +1,39 @@
-var X = Object.defineProperty, q = Object.defineProperties;
-var K = Object.getOwnPropertyDescriptors;
+var U = Object.defineProperty, X = Object.defineProperties;
+var q = Object.getOwnPropertyDescriptors;
 var R = Object.getOwnPropertySymbols;
-var Q = Object.prototype.hasOwnProperty, Y = Object.prototype.propertyIsEnumerable;
-var w = (a, s, e) => s in a ? X(a, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[s] = e, b = (a, s) => {
-  for (var e in s || (s = {}))
-    Q.call(s, e) && w(a, e, s[e]);
+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 = {}))
+    K.call(r, e) && w(a, e, r[e]);
   if (R)
-    for (var e of R(s))
-      Y.call(s, e) && w(a, e, s[e]);
+    for (var e of R(r))
+      Q.call(r, e) && w(a, e, r[e]);
   return a;
-}, _ = (a, s) => q(a, K(s));
-var l = (a, s, e) => (w(a, typeof s != "symbol" ? s + "" : s, e), e);
-import { defaultGlobalConfig as Z } from "../typings/tag/TagConfig.js";
-import { objectAssignDeepExports as y } from "../../vendor/object-assign-deep/objectAssignDeep.js";
-import * as ee from "three";
-import { DefaultConfig as ie } from "../tag.config.js";
-import { anyPositionToVector3 as C } from "../../shared-utils/positionToVector3.js";
-import { planeNormal as E } from "../utils/planeNormal.js";
-import { getTagCenterPosition as B } from "../utils/tagPosition.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 re } from "../../vendor/svelte/store/index.js";
-import { isIOSWX as ne } from "../../shared-utils/device.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 N, isPlaneTag as ae, isPoint3DTag as ce } from "../utils/tag/tagCheck.js";
+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 A, isModelLike as z } from "../../shared-utils/five/mode.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 H } from "../../shared-utils/typescript/entries.js";
-import { getUrlExt as J } from "../../shared-utils/url/getUrl.js";
-import { transformPosition as O } from "../../shared-utils/five/transformPosition.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";
@@ -60,34 +59,33 @@ import "../../shared-utils/three/getPositionsByObjectFit.js";
 import "../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../../shared-utils/three/getNormal.js";
 import "../../shared-utils/five/calculateThreeMouse.js";
-class fi extends oe {
+class si extends oe {
   constructor(e) {
     super(e);
-    l(this, "tags", []);
-    l(this, "config", ie);
-    l(this, "mediaStore", re({
+    d(this, "tags", []);
+    d(this, "config", ee);
+    d(this, "mediaStore", ne({
       currentMediaElement: null
     }));
     /** css3DRenderPlugin */
-    l(this, "css3DRenderPlugin");
-    l(this, "store", {
+    d(this, "css3DRenderPlugin");
+    d(this, "store", {
       disposers: [],
       disposed: !1,
       resizeObserverDisposerAdding: !1,
       css3DRenderDisposer: /* @__PURE__ */ new Map()
     });
-    l(this, "domEvents", new de(this.five));
-    l(this, "_workCode");
-    l(this, "getObserverPosition", (e) => {
-      var o, t;
-      const i = (o = this.work) == null ? void 0 : o.observers[e];
-      if (i)
-        return O(i.position, (t = this.work) == null ? void 0 : t.options.transform);
+    d(this, "domEvents", new de(this.five));
+    d(this, "mouseInfo");
+    d(this, "loadVideoFirstFrame", () => {
+      re && this.hooks.emit("loadVideoFirstFrame");
     });
-    l(this, "loadVideoFirstFrame", () => {
-      ne && this.hooks.emit("loadVideoFirstFrame");
+    d(this, "preventWhenMouseDown", () => {
+      var e;
+      if ((e = this.mouseInfo) != null && e.isDown)
+        return console.debug("preventWhenMouseDown 2"), !1;
     });
-    this.mediaStore.subscribe(({ currentMediaElement: i }) => {
+    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 le && i !== o.mediaPlane.videoInstance) {
@@ -96,19 +94,10 @@ class fi extends oe {
           o.mediaPlane.pause();
         }
       });
+    }), this.store.disposers.push(() => {
+      this.five.off("wantsMoveToPano", this.preventWhenMouseDown), this.five.off("wantsTapGesture", this.preventWhenMouseDown);
     });
   }
-  set workCode(e) {
-    this._workCode = e;
-  }
-  get workCode() {
-    var e;
-    return (e = this._workCode) != null ? e : this.five.state.workCode;
-  }
-  get work() {
-    var e, i;
-    return (i = (e = this.five.works) == null ? void 0 : e.find((o) => o.workCode === this.workCode)) != null ? i : this.five.work;
-  }
   getTagById(e) {
     const i = this.tags.find((o) => o.id === e);
     if (!i) {
@@ -125,9 +114,9 @@ class fi extends oe {
    * @description: 获取标签配置
    */
   getTagConfig(e, i) {
-    var r, f;
-    const o = this.calculateTagConfig(e, i), t = (r = i == null ? void 0 : i.fiveMode) != null ? r : this.five.getCurrentState().mode, n = (f = o.configWithFiveMode) == null ? void 0 : f[t];
-    return n != null ? n : o;
+    var n, f;
+    const o = this.calculateTagConfig(e, i), t = (n = i == null ? void 0 : i.fiveMode) != null ? n : this.five.getCurrentState().mode, s = (f = o.configWithFiveMode) == null ? void 0 : f[t];
+    return s != null ? s : o;
   }
   /**
    * @description 获取标签当前状态
@@ -141,7 +130,7 @@ class fi extends oe {
       const i = this.getTagConfig(e, { useCache: !1 });
       if (e.config = i, e.config.initialData) {
         const t = JSON.parse(JSON.stringify(e.data));
-        e.data = (o = i.initialData) != null && o.important ? y(e.data, t, i.initialData) : y(e.data, i.initialData, t);
+        e.data = (o = i.initialData) != null && o.important ? P(e.data, t, i.initialData) : P(e.data, i.initialData, t);
       }
     });
   }
@@ -177,10 +166,10 @@ class fi extends oe {
             if (t[0].type === "Video")
               return "Mesh";
             if (t[0].type === "Image")
-              return J(t[0].url) === "gif" ? "Dom" : "Mesh";
+              return H(t[0].url) === "gif" ? "Dom" : "Mesh";
           }
-        } else if (N(e))
-          return t.length === 1 && t[0].type === "Image" ? J(t[0].url) === "gif" ? "Dom" : "Mesh" : "BehindDom";
+        } 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";
@@ -189,6 +178,7 @@ class fi extends oe {
    * @description: 获取角度
    */
   getAngle(e, i) {
+    var s, n;
     const o = i != null ? i : this.five.getCurrentState().panoIndex;
     if (o === void 0)
       throw new Error(`getAngle(): fivePanoIndex is ${o}`);
@@ -196,68 +186,69 @@ class fi extends oe {
     if (t.angle !== void 0)
       return t.angle;
     {
-      const n = this.getObserverPosition(o);
-      if (n === void 0)
-        throw new Error(`getAngle(): observerPosition is ${n}`);
-      const r = (() => e.stickType === "3DPoint" ? C(e.normal) : E(e.position))();
-      if (!r)
+      const 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 u = (() => e.stickType === "3DPoint" ? ie(e.normal) : W(e.position))();
+      if (!u)
         return;
-      const f = B(e);
-      if (!f)
+      const g = N(e);
+      if (!g)
         return;
-      const d = new ee.Vector3().copy(n).sub(f), g = r.angleTo(d) * 180 / Math.PI;
-      return t.angle = g, 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) {
-    const o = b(b({}, this.five.getCurrentState()), i), { panoIndex: t, mode: n } = o, r = A(n) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
-    if ((r == null ? void 0 : r.distance) !== void 0)
-      return r.distance;
-    const f = B(e);
+    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 = N(e);
     if (!f)
       return -1;
-    if (A(n)) {
-      const d = this.getObserverPosition(t);
-      if (d === 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 g = d.distanceTo(f);
-      return r && (r.distance = g), g;
+      const T = l.distanceTo(f);
+      return n && (n.distance = T), T;
     }
-    if (z(n))
+    if ($(s))
       return this.five.camera.position.distanceTo(f);
   }
   getPositions(e) {
     if (ae(e))
       return e.position;
-    if (N(e))
+    if (G(e))
       return e.data.mediaPosition;
     if (ce(e))
-      return te(this.five.camera.position, C(e.position), C(e.normal));
+      return te(this.five.camera.position, E(e.position), E(e.normal));
   }
   addObjectClickHandler(e, i, o) {
     if (!i || !this.domEvents)
       return () => {
       };
-    const t = () => !(!this.getCurrentVisibleState(e) || e.loading), n = (r) => {
+    const t = () => !(!this.getCurrentVisibleState(e) || e.loading), s = (n) => {
       if (!t())
         return !1;
-      o(r.origDomEvent);
+      o(n.origDomEvent);
     };
-    return this.domEvents.addEventListener(i, "click", n), () => {
-      var r;
-      (r = this.domEvents) == null || r.removeEventListener(i, "click", n);
+    return this.domEvents.addEventListener(i, "click", s), () => {
+      var n;
+      (n = this.domEvents) == null || n.removeEventListener(i, "click", s);
     };
   }
   getTagNormal(e) {
     if (e.normal)
-      return C(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() {
@@ -282,13 +273,6 @@ class fi extends oe {
       return o === "BehindDom" || o === "Dom";
     });
   }
-  getTransformedPostion(e) {
-    var o;
-    if (!e)
-      return;
-    const i = (o = this.work) == null ? void 0 : o.options.transform;
-    return Array.isArray(e) && e.length === 4 ? e.map(C).map((t) => O(t, i)) : O(C(e), i);
-  }
   /**
    * @description 检查是否已经销毁
    * @returns isDisposed; 已经销毁返回 true，否则返回 false
@@ -300,46 +284,46 @@ class fi extends oe {
    * @description: 获取merge后的配置
    */
   calculateTagConfig(e, i) {
-    var j, S, I, W;
-    const o = (j = i == null ? void 0 : i.useCache) != null ? j : !0;
+    var A, I, S, O;
+    const o = (A = i == null ? void 0 : i.useCache) != null ? A : !0;
     if (!e)
-      return (S = this.config.globalConfig) != null ? S : {};
-    if (o && ((I = e.config) != null && I._isMerged))
+      return (I = this.config.globalConfig) != null ? I : {};
+    if (o && ((S = e.config) != null && S._isMerged))
       return e.config;
-    const t = {}, n = {}, r = {};
-    this.config.contentTypeConfig && Object.entries(this.config.contentTypeConfig).forEach(([u, p]) => {
-      var V, L;
-      const c = u, D = c.split("-"), F = u.startsWith("["), T = F ? D[0].slice(1, -1) : void 0, h = F ? D.slice(1) : D, v = T ? ["PanoramaLike", "ModelLike"].includes(T) ? (V = n[T]) != null ? V : n[T] = {} : (L = r[T]) != null ? L : r[T] = {} : t;
-      if (!v[c]) {
-        if (h.length === 0 && (v[c] = p), h.length === 1) {
-          const [m] = h;
-          (e.contentType === m || m === "Any") && (v[c] = p);
+    const t = {}, s = {}, n = {};
+    this.config.contentTypeConfig && Object.entries(this.config.contentTypeConfig).forEach(([p, h]) => {
+      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 (v.length === 0 && (M[c] = h), v.length === 1) {
+          const [m] = v;
+          (e.contentType === m || m === "Any") && (M[c] = h);
         }
-        if (h.length === 2) {
-          const [m = "Any", P = "Any"] = h;
-          m === "Mixin" && e.contentType === P && (v[c] = p), (e.stickType === m || m === "Any") && (e.contentType === P || P === "Any") && (v[c] = p);
+        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 (h.length === 3) {
-          const [m = "Any", P, G] = h;
-          if (P === "Audio" && e.contentType === "Audio") {
+        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 === G && (v[c] = p);
+            (x.stickType === m || m === "Any") && x.data.appearance === J && (M[c] = h);
           }
         }
       }
     });
-    const f = (W = e.config) != null && W._isMerged ? e.initialConfig : e.config, d = y({}, Z, this.config.globalConfig, ...Object.values(t)), g = y({}, d, f), k = {}, U = Object.values(se.Mode);
-    H(n).forEach(([u, p]) => {
-      U.forEach((c) => {
-        (u === "PanoramaLike" && A(c) || u === "ModelLike" && z(c)) && (k[c] = y({}, d, ...Object.values(p), f));
+    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));
       });
-    }), H(r).forEach(([u, p]) => {
-      k[u] = y({}, d, ...Object.values(p), f);
+    }), z(n).forEach(([p, h]) => {
+      l[p] = P({}, u, ...Object.values(h), f);
     });
-    const M = _(b({}, g), { configWithFiveMode: k });
-    return $(M, e), Object.values(k).forEach((u) => $(u, e)), M._isMerged = !0, M;
+    const D = B(C({}, g), { configWithFiveMode: l });
+    return _(D, e), Object.values(l).forEach((p) => _(p, e)), D._isMerged = !0, D;
   }
 }
 export {
-  fi as TagUtil
+  si as TagUtil
 };

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

@@ -53,7 +53,7 @@ declare class PanoTagPluginController extends TagRender {
     disable(params?: {
         userAction?: boolean;
     }): void;
-    setState(state: Partial<State>, params?: {
+    setState(state: Partial<State>, params: {
         userAction?: boolean;
         visibleWithAnimation?: boolean;
     }): void;