@realsee/dnalogel 3.2.0-dev.5 → 3.2.0-dev.7

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'>;
+    set workCode(workCode: string);
+    get workCode(): string;
     protected get work(): import("@realsee/five").Work;
     protected mediaStore: MediaStore;
     /** css3DRenderPlugin */
@@ -25,6 +27,7 @@ export declare abstract class TagUtil extends TagCache {
         disposed: boolean;
     };
     protected domEvents: FiveDomEvents;
+    private _workCode;
     protected constructor(five: Five);
     getTagById<C extends TagContentType = TagContentType, S extends StickType = StickType>(id: TagId): TagInstance<C, S> | undefined;
     /** 暂停当前标签内进行的所有多媒体 */

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -2,39 +2,39 @@ var X = Object.defineProperty, q = Object.defineProperties;
 var K = Object.getOwnPropertyDescriptors;
 var R = Object.getOwnPropertySymbols;
 var Q = Object.prototype.hasOwnProperty, Y = Object.prototype.propertyIsEnumerable;
-var E = (a, s, e) => s in a ? X(a, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[s] = e, M = (a, s) => {
+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) && E(a, e, s[e]);
+    Q.call(s, e) && w(a, e, s[e]);
   if (R)
     for (var e of R(s))
-      Y.call(s, e) && E(a, e, s[e]);
+      Y.call(s, e) && w(a, e, s[e]);
   return a;
-}, B = (a, s) => q(a, K(s));
-var m = (a, s, e) => (E(a, typeof s != "symbol" ? s + "" : s, e), e);
+}, _ = (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 P } from "../../shared-utils/positionToVector3.js";
-import { planeNormal as w } from "../utils/planeNormal.js";
-import { getTagCenterPosition as N } from "../utils/tagPosition.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";
 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 { Five as se } from "@realsee/five";
-import { isMediaPlaneTag as fe, isMediaModelTag as _, isPlaneTag as ae, isPoint3DTag as ce } from "../utils/tag/tagCheck.js";
+import { isMediaPlaneTag as fe, isMediaModelTag as N, 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 O, isModelLike as z } from "../../shared-utils/five/mode.js";
+import { isPanoramaLike as A, isModelLike as z } 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 j } from "../../shared-utils/five/transformPosition.js";
+import { transformPosition as O } from "../../shared-utils/five/transformPosition.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../../base/BasePlugin.js";
 import "../../shared-utils/Subscribe.js";
@@ -63,27 +63,28 @@ import "../../shared-utils/five/calculateThreeMouse.js";
 class fi extends oe {
   constructor(e) {
     super(e);
-    m(this, "tags", []);
-    m(this, "config", ie);
-    m(this, "mediaStore", re({
+    l(this, "tags", []);
+    l(this, "config", ie);
+    l(this, "mediaStore", re({
       currentMediaElement: null
     }));
     /** css3DRenderPlugin */
-    m(this, "css3DRenderPlugin");
-    m(this, "store", {
+    l(this, "css3DRenderPlugin");
+    l(this, "store", {
       disposers: [],
       disposed: !1,
       resizeObserverDisposerAdding: !1,
       css3DRenderDisposer: /* @__PURE__ */ new Map()
     });
-    m(this, "domEvents", new de(this.five));
-    m(this, "getObserverPosition", (e) => {
+    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 j(i.position, (t = this.work) == null ? void 0 : t.options.transform);
+        return O(i.position, (t = this.work) == null ? void 0 : t.options.transform);
     });
-    m(this, "loadVideoFirstFrame", () => {
+    l(this, "loadVideoFirstFrame", () => {
       ne && this.hooks.emit("loadVideoFirstFrame");
     });
     this.mediaStore.subscribe(({ currentMediaElement: i }) => {
@@ -97,9 +98,16 @@ class fi extends oe {
       });
     });
   }
+  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.five.state.workCode)) != null ? i : this.five.work;
+    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);
@@ -171,7 +179,7 @@ class fi extends oe {
             if (t[0].type === "Image")
               return J(t[0].url) === "gif" ? "Dom" : "Mesh";
           }
-        } else if (_(e))
+        } else if (N(e))
           return t.length === 1 && t[0].type === "Image" ? J(t[0].url) === "gif" ? "Dom" : "Mesh" : "BehindDom";
       }
     })();
@@ -191,13 +199,13 @@ class fi extends oe {
       const n = this.getObserverPosition(o);
       if (n === void 0)
         throw new Error(`getAngle(): observerPosition is ${n}`);
-      const r = (() => e.stickType === "3DPoint" ? P(e.normal) : w(e.position))();
+      const r = (() => e.stickType === "3DPoint" ? C(e.normal) : E(e.position))();
       if (!r)
         return;
-      const f = N(e);
+      const f = B(e);
       if (!f)
         return;
-      const l = new ee.Vector3().copy(n).sub(f), g = r.angleTo(l) * 180 / Math.PI;
+      const d = new ee.Vector3().copy(n).sub(f), g = r.angleTo(d) * 180 / Math.PI;
       return t.angle = g, t.angle;
     }
   }
@@ -205,17 +213,17 @@ class fi extends oe {
    * @description: 获取距离
    */
   getDistance(e, i) {
-    const o = M(M({}, this.five.getCurrentState()), i), { panoIndex: t, mode: n } = o, r = O(n) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
+    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 = N(e);
+    const f = B(e);
     if (!f)
       return -1;
-    if (O(n)) {
-      const l = this.getObserverPosition(t);
-      if (l === void 0)
+    if (A(n)) {
+      const d = this.getObserverPosition(t);
+      if (d === void 0)
         return -1;
-      const g = l.distanceTo(f);
+      const g = d.distanceTo(f);
       return r && (r.distance = g), g;
     }
     if (z(n))
@@ -224,10 +232,10 @@ class fi extends oe {
   getPositions(e) {
     if (ae(e))
       return e.position;
-    if (_(e))
+    if (N(e))
       return e.data.mediaPosition;
     if (ce(e))
-      return te(this.five.camera.position, P(e.position), P(e.normal));
+      return te(this.five.camera.position, C(e.position), C(e.normal));
   }
   addObjectClickHandler(e, i, o) {
     if (!i || !this.domEvents)
@@ -245,11 +253,11 @@ class fi extends oe {
   }
   getTagNormal(e) {
     if (e.normal)
-      return P(e.normal);
+      return C(e.normal);
     if (e.stickType === "Plane")
-      return w(e.position);
+      return E(e.position);
     if (e.stickType === "Model")
-      return w(this.getPositions(e));
+      return E(this.getPositions(e));
   }
   // TODO: 优化点：下面这些函数，调用比较频繁，可以按点位加缓存
   get filterPointTag() {
@@ -276,8 +284,10 @@ class fi extends oe {
   }
   getTransformedPostion(e) {
     var o;
+    if (!e)
+      return;
     const i = (o = this.work) == null ? void 0 : o.options.transform;
-    return e.length === 4 ? e.map(P).map((t) => j(t, i)) : j(P(e), i);
+    return Array.isArray(e) && e.length === 4 ? e.map(C).map((t) => O(t, i)) : O(C(e), i);
   }
   /**
    * @description 检查是否已经销毁
@@ -290,44 +300,44 @@ class fi extends oe {
    * @description: 获取merge后的配置
    */
   calculateTagConfig(e, i) {
-    var A, S, I, W;
-    const o = (A = i == null ? void 0 : i.useCache) != null ? A : !0;
+    var j, S, I, W;
+    const o = (j = i == null ? void 0 : i.useCache) != null ? j : !0;
     if (!e)
       return (S = this.config.globalConfig) != null ? S : {};
     if (o && ((I = e.config) != null && I._isMerged))
       return e.config;
     const t = {}, n = {}, r = {};
-    this.config.contentTypeConfig && Object.entries(this.config.contentTypeConfig).forEach(([d, u]) => {
+    this.config.contentTypeConfig && Object.entries(this.config.contentTypeConfig).forEach(([u, p]) => {
       var V, L;
-      const c = d, D = c.split("-"), F = d.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;
+      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] = u), h.length === 1) {
-          const [p] = h;
-          (e.contentType === p || p === "Any") && (v[c] = u);
+        if (h.length === 0 && (v[c] = p), h.length === 1) {
+          const [m] = h;
+          (e.contentType === m || m === "Any") && (v[c] = p);
         }
         if (h.length === 2) {
-          const [p = "Any", b = "Any"] = h;
-          p === "Mixin" && e.contentType === b && (v[c] = u), (e.stickType === p || p === "Any") && (e.contentType === b || b === "Any") && (v[c] = u);
+          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 (h.length === 3) {
-          const [p = "Any", b, G] = h;
-          if (b === "Audio" && e.contentType === "Audio") {
+          const [m = "Any", P, G] = h;
+          if (P === "Audio" && e.contentType === "Audio") {
             const x = e;
-            (x.stickType === p || p === "Any") && x.data.appearance === G && (v[c] = u);
+            (x.stickType === m || m === "Any") && x.data.appearance === G && (v[c] = p);
           }
         }
       }
     });
-    const f = (W = e.config) != null && W._isMerged ? e.initialConfig : e.config, l = y({}, Z, this.config.globalConfig, ...Object.values(t)), g = y({}, l, f), C = {}, U = Object.values(se.Mode);
-    H(n).forEach(([d, u]) => {
+    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) => {
-        (d === "PanoramaLike" && O(c) || d === "ModelLike" && z(c)) && (C[c] = y({}, l, ...Object.values(u), f));
+        (u === "PanoramaLike" && A(c) || u === "ModelLike" && z(c)) && (k[c] = y({}, d, ...Object.values(p), f));
       });
-    }), H(r).forEach(([d, u]) => {
-      C[d] = y({}, l, ...Object.values(u), f);
+    }), H(r).forEach(([u, p]) => {
+      k[u] = y({}, d, ...Object.values(p), f);
     });
-    const k = B(M({}, g), { configWithFiveMode: C });
-    return $(k, e), Object.values(C).forEach((d) => $(d, e)), k._isMerged = !0, k;
+    const M = _(b({}, g), { configWithFiveMode: k });
+    return $(M, e), Object.values(k).forEach((u) => $(u, e)), M._isMerged = !0, M;
   }
 }
 export {

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let b = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.2.0-dev.5");
+    i(this, "VERSION", "3.2.0-dev.7");
     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.5",
+    "%c %c@realsee/dnalogel %cv3.2.0-dev.7",
     [
       "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.5",
+  "version": "3.2.0-dev.7",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",