@realsee/dnalogel 3.2.0-dev.1 → 3.2.0-dev.2

package/libs/PanoTagPlugin/controller/TagComputer.js

@@ -275,7 +275,7 @@ class Je extends q {
   /** 通过射线检测标签可用性 */
   getTagEnableByIntersect(e, i) {
     var o, r, c, u, a, v;
-    const l = j(j((o = this.getTagConfig(e).visibleConfig) != null ? o : {}).intersectRaycaster), t = i != null ? i : this.five.getCurrentState().panoIndex, n = h(this.five.getCurrentState().mode) ? (r = this.five.work.observers[t]) == null ? void 0 : r.position : this.five.camera.position;
+    const l = j(j((o = this.getTagConfig(e).visibleConfig) != null ? o : {}).intersectRaycaster), t = i != null ? i : this.five.getCurrentState().panoIndex, n = h(this.five.getCurrentState().mode) ? (r = this.work.observers[t]) == null ? void 0 : r.position : this.five.camera.position;
     if (n === void 0)
       return { value: !1, reason: { type: "startPosition is undefined", fivePanoIndex: t } };
     const f = X(
@@ -317,10 +317,7 @@ class Je extends q {
     var n, f, s, d, o, r, c;
     let i = 0;
     const l = (n = e.fiveState) == null ? void 0 : n.panoIndex;
-    l !== void 0 ? i = (f = this.five.work.observers[l]) == null ? void 0 : f.floorIndex : i = W(
-      this.five.work.observers,
-      (c = (r = (d = (s = e.model) == null ? void 0 : s.object) == null ? void 0 : d.position) != null ? r : (o = e.mediaPlane) == null ? void 0 : o.position) != null ? c : I(e)
-    );
+    l !== void 0 ? i = (f = this.work.observers[l]) == null ? void 0 : f.floorIndex : i = W(this.work.observers, (c = (r = (d = (s = e.model) == null ? void 0 : s.object) == null ? void 0 : d.position) != null ? r : (o = e.mediaPlane) == null ? void 0 : o.position) != null ? c : I(e));
     const t = this.five.model.shownFloor;
     return t === null || t === i;
   }

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

@@ -10,6 +10,8 @@ import { FiveDomEvents } from '../../shared-utils/five/FiveDomEvents';
 export declare abstract class TagUtil extends TagCache {
     tags: TagInstance[];
     config: Pick<Tags, 'globalConfig' | 'contentTypeConfig'>;
+    protected workCode: string;
+    protected get work(): import("@realsee/five").Work;
     protected mediaStore: MediaStore;
     /** css3DRenderPlugin */
     protected css3DRenderPlugin?: CSS3DRenderPluginExportType;
@@ -24,7 +26,6 @@ export declare abstract class TagUtil extends TagCache {
         disposed: boolean;
     };
     protected domEvents: FiveDomEvents;
-    private mouseInfo?;
     protected constructor(five: Five);
     getTagById<C extends TagContentType = TagContentType, S extends StickType = StickType>(id: TagId): TagInstance<C, S> | undefined;
     /** 暂停当前标签内进行的所有多媒体 */
@@ -53,7 +54,6 @@ export declare abstract class TagUtil extends TagCache {
      */
     protected getDistance(tag: TagInstance, fiveState?: Partial<FiveState>): number;
     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[];

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -1,33 +1,33 @@
-var U = Object.defineProperty, X = Object.defineProperties;
-var q = Object.getOwnPropertyDescriptors;
+var U = Object.defineProperty, G = Object.defineProperties;
+var X = Object.getOwnPropertyDescriptors;
 var R = Object.getOwnPropertySymbols;
 var K = Object.prototype.hasOwnProperty, Q = Object.prototype.propertyIsEnumerable;
-var w = (a, r, e) => r in a ? U(a, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[r] = e, C = (a, r) => {
-  for (var e in r || (r = {}))
-    K.call(r, e) && w(a, e, r[e]);
+var w = (a, s, e) => s in a ? U(a, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[s] = e, M = (a, s) => {
+  for (var e in s || (s = {}))
+    K.call(s, e) && w(a, e, s[e]);
   if (R)
-    for (var e of R(r))
-      Q.call(r, e) && w(a, e, r[e]);
+    for (var e of R(s))
+      Q.call(s, e) && w(a, e, s[e]);
   return a;
-}, B = (a, r) => X(a, q(r));
-var d = (a, r, e) => (w(a, typeof r != "symbol" ? r + "" : r, e), e);
+}, B = (a, s) => G(a, X(s));
+var h = (a, s, e) => (w(a, typeof s != "symbol" ? s + "" : s, e), e);
 import { defaultGlobalConfig as Y } from "../typings/tag/TagConfig.js";
-import { objectAssignDeepExports as P } from "../../vendor/object-assign-deep/objectAssignDeep.js";
+import { objectAssignDeepExports as k } 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 { planeNormal as j } from "../utils/planeNormal.js";
 import { getTagCenterPosition as N } from "../utils/tagPosition.js";
 import { normalPositionToPositions as te } from "../utils/normalPositionToPositions.js";
 import { TagCache as oe } from "./TagCache.js";
 import { writable as ne } from "../../vendor/svelte/store/index.js";
 import { isIOSWX as re } from "../../shared-utils/device.js";
 import { Five as se } from "@realsee/five";
-import { isMediaPlaneTag as fe, isMediaModelTag as G, isPlaneTag as ae, isPoint3DTag as ce } from "../utils/tag/tagCheck.js";
+import { isMediaPlaneTag as fe, isMediaModelTag as _, isPlaneTag as ae, isPoint3DTag as ce } from "../utils/tag/tagCheck.js";
 import { VideoPlane as le } from "../utils/model/mediaPlane.js";
 import { FiveDomEvents as de } from "../../shared-utils/five/FiveDomEvents.js";
-import _ from "../utils/tag/adaptConfig.js";
-import { isPanoramaLike as j, isModelLike as $ } from "../../shared-utils/five/mode.js";
+import $ from "../utils/tag/adaptConfig.js";
+import { isPanoramaLike as A, isModelLike as q } from "../../shared-utils/five/mode.js";
 import "hammerjs";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
@@ -62,42 +62,44 @@ import "../../shared-utils/five/calculateThreeMouse.js";
 class si extends oe {
   constructor(e) {
     super(e);
-    d(this, "tags", []);
-    d(this, "config", ee);
-    d(this, "mediaStore", ne({
+    h(this, "tags", []);
+    h(this, "config", ee);
+    h(this, "workCode", this.five.work.workCode);
+    h(this, "mediaStore", ne({
       currentMediaElement: null
     }));
     /** css3DRenderPlugin */
-    d(this, "css3DRenderPlugin");
-    d(this, "store", {
+    h(this, "css3DRenderPlugin");
+    h(this, "store", {
       disposers: [],
       disposed: !1,
       resizeObserverDisposerAdding: !1,
       css3DRenderDisposer: /* @__PURE__ */ new Map()
     });
-    d(this, "domEvents", new de(this.five));
-    d(this, "mouseInfo");
-    d(this, "loadVideoFirstFrame", () => {
+    h(this, "domEvents", new de(this.five));
+    h(this, "loadVideoFirstFrame", () => {
       re && this.hooks.emit("loadVideoFirstFrame");
     });
-    d(this, "preventWhenMouseDown", () => {
-      var e;
-      if ((e = this.mouseInfo) != null && e.isDown)
-        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((o) => {
-        var t;
-        if (o.mediaPlane instanceof le && i !== o.mediaPlane.videoInstance) {
-          if (!((t = o.mediaPlane.videoInstance) != null && t.src) || i === o.mediaPlane.videoInstance)
+    const i = ({ state: o }) => {
+      this.workCode = o.workCode;
+    };
+    this.five.on("pano.request", i), this.mediaStore.subscribe(({ currentMediaElement: o }) => {
+      this.tags.forEach((t) => {
+        var r;
+        if (t.mediaPlane instanceof le && o !== t.mediaPlane.videoInstance) {
+          if (!((r = t.mediaPlane.videoInstance) != null && r.src) || o === t.mediaPlane.videoInstance)
             return;
-          o.mediaPlane.pause();
+          t.mediaPlane.pause();
         }
       });
     }), this.store.disposers.push(() => {
-      this.five.off("wantsMoveToPano", this.preventWhenMouseDown), this.five.off("wantsTapGesture", this.preventWhenMouseDown);
+      this.five.off("pano.request", i);
     });
   }
+  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) {
@@ -115,8 +117,8 @@ class si extends oe {
    */
   getTagConfig(e, i) {
     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;
+    const o = this.calculateTagConfig(e, i), t = (n = i == null ? void 0 : i.fiveMode) != null ? n : this.five.getCurrentState().mode, r = (f = o.configWithFiveMode) == null ? void 0 : f[t];
+    return r != null ? r : o;
   }
   /**
    * @description 获取标签当前状态
@@ -130,7 +132,7 @@ class si 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 ? P(e.data, t, i.initialData) : P(e.data, i.initialData, t);
+        e.data = (o = i.initialData) != null && o.important ? k(e.data, t, i.initialData) : k(e.data, i.initialData, t);
       }
     });
   }
@@ -168,7 +170,7 @@ class si extends oe {
             if (t[0].type === "Image")
               return H(t[0].url) === "gif" ? "Dom" : "Mesh";
           }
-        } else if (G(e))
+        } else if (_(e))
           return t.length === 1 && t[0].type === "Image" ? H(t[0].url) === "gif" ? "Dom" : "Mesh" : "BehindDom";
       }
     })();
@@ -178,7 +180,7 @@ class si extends oe {
    * @description: 获取角度
    */
   getAngle(e, i) {
-    var s, n;
+    var r, n;
     const o = i != null ? i : this.five.getCurrentState().panoIndex;
     if (o === void 0)
       throw new Error(`getAngle(): fivePanoIndex is ${o}`);
@@ -186,44 +188,44 @@ class si extends oe {
     if (t.angle !== void 0)
       return t.angle;
     {
-      const f = (n = (s = this.five.work) == null ? void 0 : s.observers[o]) == null ? void 0 : n.position;
+      const f = (n = (r = this.work) == null ? void 0 : r.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)
+      const d = (() => e.stickType === "3DPoint" ? ie(e.normal) : j(e.position))();
+      if (!d)
         return;
       const g = N(e);
       if (!g)
         return;
-      const l = new Z.Vector3().copy(f).sub(g), T = u.angleTo(l) * 180 / Math.PI;
-      return t.angle = T, t.angle;
+      const l = new Z.Vector3().copy(f).sub(g), v = d.angleTo(l) * 180 / Math.PI;
+      return t.angle = v, t.angle;
     }
   }
   /**
    * @description: 获取距离
    */
   getDistance(e, i) {
-    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;
+    var d, g;
+    const o = M(M({}, this.five.getCurrentState()), i), { panoIndex: t, mode: r } = o, n = A(r) ? 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 (j(s)) {
-      const l = (g = (u = this.five.work) == null ? void 0 : u.observers[t]) == null ? void 0 : g.position;
+    if (A(r)) {
+      const l = (g = (d = this.work) == null ? void 0 : d.observers[t]) == null ? void 0 : g.position;
       if (l === void 0)
         return -1;
-      const T = l.distanceTo(f);
-      return n && (n.distance = T), T;
+      const v = l.distanceTo(f);
+      return n && (n.distance = v), v;
     }
-    if ($(s))
+    if (q(r))
       return this.five.camera.position.distanceTo(f);
   }
   getPositions(e) {
     if (ae(e))
       return e.position;
-    if (G(e))
+    if (_(e))
       return e.data.mediaPosition;
     if (ce(e))
       return te(this.five.camera.position, E(e.position), E(e.normal));
@@ -232,23 +234,23 @@ class si extends oe {
     if (!i || !this.domEvents)
       return () => {
       };
-    const t = () => !(!this.getCurrentVisibleState(e) || e.loading), s = (n) => {
+    const t = () => !(!this.getCurrentVisibleState(e) || e.loading), r = (n) => {
       if (!t())
         return !1;
       o(n.origDomEvent);
     };
-    return this.domEvents.addEventListener(i, "click", s), () => {
+    return this.domEvents.addEventListener(i, "click", r), () => {
       var n;
-      (n = this.domEvents) == null || n.removeEventListener(i, "click", s);
+      (n = this.domEvents) == null || n.removeEventListener(i, "click", r);
     };
   }
   getTagNormal(e) {
     if (e.normal)
       return E(e.normal);
     if (e.stickType === "Plane")
-      return W(e.position);
+      return j(e.position);
     if (e.stickType === "Model")
-      return W(this.getPositions(e));
+      return j(this.getPositions(e));
   }
   // TODO: 优化点：下面这些函数，调用比较频繁，可以按点位加缓存
   get filterPointTag() {
@@ -284,44 +286,44 @@ class si extends oe {
    * @description: 获取merge后的配置
    */
   calculateTagConfig(e, i) {
-    var A, I, S, O;
-    const o = (A = i == null ? void 0 : i.useCache) != null ? A : !0;
+    var S, O, I, W;
+    const o = (S = i == null ? void 0 : i.useCache) != null ? S : !0;
     if (!e)
-      return (I = this.config.globalConfig) != null ? I : {};
-    if (o && ((S = e.config) != null && S._isMerged))
+      return (O = this.config.globalConfig) != null ? O : {};
+    if (o && ((I = e.config) != null && I._isMerged))
       return e.config;
-    const t = {}, s = {}, n = {};
-    this.config.contentTypeConfig && Object.entries(this.config.contentTypeConfig).forEach(([p, h]) => {
+    const t = {}, r = {}, n = {};
+    this.config.contentTypeConfig && Object.entries(this.config.contentTypeConfig).forEach(([u, p]) => {
       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);
+      const c = u, D = c.split("-"), V = u.startsWith("["), y = V ? D[0].slice(1, -1) : void 0, T = V ? D.slice(1) : D, C = y ? ["PanoramaLike", "ModelLike"].includes(y) ? (F = r[y]) != null ? F : r[y] = {} : (L = n[y]) != null ? L : n[y] = {} : t;
+      if (!C[c]) {
+        if (T.length === 0 && (C[c] = p), T.length === 1) {
+          const [m] = T;
+          (e.contentType === m || m === "Any") && (C[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 (T.length === 2) {
+          const [m = "Any", P = "Any"] = T;
+          m === "Mixin" && e.contentType === P && (C[c] = p), (e.stickType === m || m === "Any") && (e.contentType === P || P === "Any") && (C[c] = p);
         }
-        if (v.length === 3) {
-          const [m = "Any", b, J] = v;
-          if (b === "Audio" && e.contentType === "Audio") {
+        if (T.length === 3) {
+          const [m = "Any", P, J] = T;
+          if (P === "Audio" && e.contentType === "Audio") {
             const x = e;
-            (x.stickType === m || m === "Any") && x.data.appearance === J && (M[c] = h);
+            (x.stickType === m || m === "Any") && x.data.appearance === J && (C[c] = p);
           }
         }
       }
     });
-    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));
+    const f = (W = e.config) != null && W._isMerged ? e.initialConfig : e.config, d = k({}, Y, this.config.globalConfig, ...Object.values(t)), g = k({}, d, f), l = {}, v = Object.values(se.Mode);
+    z(r).forEach(([u, p]) => {
+      v.forEach((c) => {
+        (u === "PanoramaLike" && A(c) || u === "ModelLike" && q(c)) && (l[c] = k({}, d, ...Object.values(p), f));
       });
-    }), z(n).forEach(([p, h]) => {
-      l[p] = P({}, u, ...Object.values(h), f);
+    }), z(n).forEach(([u, p]) => {
+      l[u] = k({}, d, ...Object.values(p), f);
     });
-    const D = B(C({}, g), { configWithFiveMode: l });
-    return _(D, e), Object.values(l).forEach((p) => _(p, e)), D._isMerged = !0, D;
+    const b = B(M({}, g), { configWithFiveMode: l });
+    return $(b, e), Object.values(l).forEach((u) => $(u, e)), b._isMerged = !0, b;
   }
 }
 export {

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let b = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.2.0-dev.1");
+    i(this, "VERSION", "3.2.0-dev.2");
     i(this, "five");
     /**
      * 插件事件钩子

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.2.0-dev.1",
+    "%c %c@realsee/dnalogel %cv3.2.0-dev.2",
     [
       "background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAMCAMAAACHgmeRAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABLFBMVEUAAAAapPoap/oaqvkbrfkbr/gZnfwZoPsaqfnD4v/E4/8Ylv0clPm93/+/4P/B4f8Yj/683/8Wif+33P8Uhv+x2f8ShP+s1v8Pgf+n0/8Nf/+h0f8Lff8Lff8Nf/9dl/+czv8KfP8KfP+Lxf+Uyv+Xy/+Hwv+Jw/+Mxf+Oxv+RyP8aovsapfoap/oZmfwZm/wZnvsYnPsYkf4YlP0NePsDYfgYcfi43f+63v8Xiv8Xjf4EWfwCV/sWZ/qz2v+02/8Vh/8WiP8EUf8CTf4WXv2u1/+v2P8Thf8Thv8ETf8CR/8VV/+o1f+q1f8Qgv8Rg/8DSv8BRf8UVP+j0v+k0v8OgP8Pgf8DR/8DQv9Nhf+dzv+fz/+Kv/+Vyv+Xy/+azf+Oxv+Qx/+SyP////8MUhLdAAAAK3RSTlMACEWQ2bd98uQECPXxqO7c+Pb49vj2+Pb49vj23Oul8fMHA+TwerXXjEIG2P+bHgAAAAFiS0dEY1y+LaoAAAB+SURBVAjXY2BgZGJmYWVgYGBgY9fW0eVg4ORi4NbTNzDk4eXjZxAwMjYxNTO3EGQQsrSytrG1sxdmEHFwdHJ2cXUTZRBz9/D08vbxFWeQ8PMPCAwKDpFkkAoNC4+IjIqWZpCRlZOPiY2LV2BQVGJQTkhMUlEFWaOmrqGpxQAAyg0S9Dq+VPYAAAAASUVORK5CYII=')",
       "background-repeat: no-repeat",

package/package.json

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