@realsee/dnalogel 3.2.0 → 3.3.0-dev.1

package/libs/PanoTagPlugin/controller/index.js

@@ -1,17 +1,17 @@
-var w = Object.defineProperty, E = Object.defineProperties;
-var U = Object.getOwnPropertyDescriptors;
-var C = Object.getOwnPropertySymbols;
-var I = Object.prototype.hasOwnProperty, B = Object.prototype.propertyIsEnumerable;
-var m = (d, a, e) => a in d ? w(d, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[a] = e, c = (d, a) => {
+var E = Object.defineProperty, U = Object.defineProperties;
+var I = Object.getOwnPropertyDescriptors;
+var A = Object.getOwnPropertySymbols;
+var R = Object.prototype.hasOwnProperty, B = Object.prototype.propertyIsEnumerable;
+var u = (d, a, e) => a in d ? E(d, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[a] = e, c = (d, a) => {
   for (var e in a || (a = {}))
-    I.call(a, e) && m(d, e, a[e]);
-  if (C)
-    for (var e of C(a))
-      B.call(a, e) && m(d, e, a[e]);
+    R.call(a, e) && u(d, e, a[e]);
+  if (A)
+    for (var e of A(a))
+      B.call(a, e) && u(d, e, a[e]);
   return d;
-}, u = (d, a) => E(d, U(a));
-var l = (d, a, e) => (m(d, typeof a != "symbol" ? a + "" : a, e), e);
-var p = (d, a, e) => new Promise((t, i) => {
+}, v = (d, a) => U(d, I(a));
+var l = (d, a, e) => (u(d, typeof a != "symbol" ? a + "" : a, e), e);
+var f = (d, a, e) => new Promise((t, i) => {
   var s = (r) => {
     try {
       n(e.next(r));
@@ -27,26 +27,26 @@ var p = (d, a, e) => new Promise((t, i) => {
   }, n = (r) => r.done ? t(r.value) : Promise.resolve(r.value).then(s, o);
   n((e = e.apply(d, a)).next());
 });
-import * as v from "three";
+import * as b from "three";
 import { Subscribe as F } from "@realsee/five";
-import { objectAssignDeepExports as f } from "../../vendor/object-assign-deep/objectAssignDeep.js";
+import { objectAssignDeepExports as p } from "../../vendor/object-assign-deep/objectAssignDeep.js";
 import { addDebugPoints as M } from "../utils/addDebugPoints.js";
-import { arrayPositionToVector3 as A } from "../../shared-utils/positionToVector3.js";
-import { isMediaModelTag as R, isModelTag as _ } from "../utils/tag/tagCheck.js";
-import { debounce as k } from "../utils/debounce.js";
-import { throttle as O } from "../utils/throttle.js";
+import { arrayPositionToVector3 as P } from "../../shared-utils/positionToVector3.js";
+import { isMediaModelTag as _, isModelTag as k } from "../utils/tag/tagCheck.js";
+import { debounce as O } from "../utils/debounce.js";
+import { throttle as V } from "../utils/throttle.js";
 import { resizeObserver as D } from "../utils/resizeObserver.js";
-import V from "../utils/tag/format.js";
-import { generateBlankAudio as L, AudioNamespace as G } from "../../shared-utils/audio.js";
-import { TagRender as N } from "./TagRender.js";
-import { uuid as z } from "../../shared-utils/uuid.js";
-import { isModelLike as x } from "../../shared-utils/five/mode.js";
+import L from "../utils/tag/format.js";
+import { generateBlankAudio as G, AudioNamespace as N } from "../../shared-utils/audio.js";
+import { TagRender as z } from "./TagRender.js";
+import { uuid as x } from "../../shared-utils/uuid.js";
+import { 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 { tweenProgress as $ } from "../../shared-utils/animationFrame/BetterTween.js";
-import { waitFiveModelLoaded as W } from "../../shared-utils/five/fiveModelLoad.js";
+import { tweenProgress as W } from "../../shared-utils/animationFrame/BetterTween.js";
+import { waitFiveModelLoaded as j } from "../../shared-utils/five/fiveModelLoad.js";
 import "./TagComputer.js";
 import "../utils/tagPosition.js";
 import "../../shared-utils/three/centerPoint.js";
@@ -89,6 +89,7 @@ import "../../shared-utils/five/calculateThreeMouse.js";
 import "../utils/tag/adaptConfig.js";
 import "../../shared-utils/typescript/entries.js";
 import "../../shared-utils/url/getUrl.js";
+import "../../shared-utils/five/transformPosition.js";
 import "../../shared-utils/five/getFloorIndex.js";
 import "../../shared-utils/safeObj.js";
 import "../Components/TagContainer.js";
@@ -167,8 +168,8 @@ import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 import "../../shared-utils/three/GLTFLoader.js";
 import "@realsee/five/gltf-loader";
 import "../../shared-utils/animationFrame/index.js";
-const P = "Dnalogel-PanoTagPlugin", Di = (d) => `${P}--${d}`;
-class Pi extends N {
+const S = "Dnalogel-PanoTagPlugin", wi = (d) => `${S}--${d}`;
+class Ei extends z {
   constructor(e, t) {
     super(e);
     /** state */
@@ -178,8 +179,8 @@ class Pi extends N {
     /** debug */
     l(this, "debug");
     /** 更改 tag 模型 */
-    l(this, "changeTagModel", (e, t) => p(this, null, function* () {
-      e.data = f({}, e.data, t), yield this.loadModel(e), this.updateRenderAllTags();
+    l(this, "changeTagModel", (e, t) => f(this, null, function* () {
+      e.data = p({}, e.data, t), yield this.loadModel(e), this.updateRenderAllTags();
     }));
     l(this, "whyHide", (e) => {
       var i, s, o;
@@ -192,16 +193,18 @@ class Pi extends N {
         return { reason: `tag ${e} not found` };
       if (!t.enabled)
         return { reason: `tag ${e} enabled is ${t.enabled}` };
+      if (t.stickType === "Model" || t.stickType === "Plane")
+        return { reason: "maybe blocked by the five model" };
       if (!t.state.visible) {
         const n = (s = (i = this.getPanoIndexCache({ panoIndex: this.five.panoIndex, id: e })) == null ? void 0 : i.__debug_visible_reason__) == null ? void 0 : s.reason;
-        return { reason: (o = n.type) != null ? o : n, reasonObj: n };
+        return { reason: (o = n == null ? void 0 : n.type) != null ? o : n, reasonObj: n };
       }
-      return t.stickType === "Model" || t.stickType === "Plane" ? { reason: "maybe blocked by the five model" } : { reason: "check your eyes" };
+      return { reason: "check your eyes" };
     });
     l(this, "updateVisible", () => {
       const e = this.five.getCurrentState().mode;
       this.tags.forEach((t) => {
-        R(t) && e !== "Panorama" && this.changeTagMode(t, "behind");
+        _(t) && e !== "Panorama" && this.changeTagMode(t, "behind");
       }), this.setVisible(), this.updateRenderAllTags();
     });
     l(this, "handleFiveWantsMoveToPano", (e) => {
@@ -240,21 +243,21 @@ class Pi extends N {
     l(this, "handleFiveCameraUpdate", () => {
       this.updatePointTagPosition();
     });
-    l(this, "handleFivePanoArrived", () => p(this, null, function* () {
+    l(this, "handleFivePanoArrived", () => f(this, null, function* () {
       this.setVisible(), this.updatePointTagPosition(), yield this.setVisibleAndUnfolded(), this.tags.forEach((e) => {
-        e.temporaryState = u(c({}, e.temporaryState), { visible: !0 });
-      }), this.tags.filter(_).filter((e) => {
-        var t, i;
-        return (i = (t = e.config) == null ? void 0 : t.modelConfig) == null ? void 0 : i.autoLookAtEnabled;
+        e.temporaryState = v(c({}, e.temporaryState), { visible: !0 });
+      }), this.tags.filter(k).filter((e) => {
+        var t;
+        return (t = this.getTagConfig(e).modelConfig) == null ? void 0 : t.autoLookAtEnabled;
       }).forEach((e) => {
         var h;
-        const t = new v.Mesh(new v.BoxGeometry(), new v.MeshBasicMaterial()), i = (h = e.model) == null ? void 0 : h.object;
+        const t = new b.Mesh(new b.BoxGeometry(), new b.MeshBasicMaterial()), i = (h = e.model) == null ? void 0 : h.object;
         if (!i)
           return;
         t.position.copy(i.position), t.quaternion.copy(i.quaternion);
         const s = this.five.camera.position;
         t.lookAt(s.clone().setY(t.position.y));
-        const o = i.quaternion.clone(), n = t.quaternion.clone(), r = $();
+        const o = i.quaternion.clone(), n = t.quaternion.clone(), r = W();
         r.onUpdate(({ progress: g }) => {
           i.quaternion.copy(o.clone().slerp(n, g));
         }), r.play();
@@ -265,9 +268,9 @@ class Pi extends N {
       this.setVisible(), this.updateRenderAllTags();
     });
     l(this, "onFiveEveryReady", () => {
-      this.setUnfoldedByCamera(), x(this.five.getCurrentState().mode) && (this.setTagZIndex(this.filterPointTag), this.setVisible(this.filterPointTag), this.setPointTagPosition()), this.updateDomView({ withAnimation: !0 });
+      this.setUnfoldedByCamera(), $(this.five.getCurrentState().mode) && (this.setTagZIndex(this.filterPointTag), this.setVisible(), this.setPointTagPosition()), this.updateDomView({ withAnimation: !0 }), this.updateRenderVideoPlane(), this.updateRenderImagePlane(), this.updateRenderModelTag();
     });
-    this.params = f({}, { debug: !1, config: this.config }, c({}, t)), this.debug = this.params.debug, this.config = this.params.config, L(1, { namespace: G.PlayAudio });
+    this.params = p({}, { debug: !1, config: this.config }, c({}, t)), this.debug = this.params.debug, this.config = this.params.config, G(1, { namespace: N.PlayAudio });
     try {
       const i = window;
       Array.isArray(i.__PANOTAGPLUGIN_DEBUG_LIST__) || (i.__PANOTAGPLUGIN_DEBUG_LIST__ = []), i.__PANOTAGPLUGIN_DEBUG_LIST__.push(this), i.__PANOTAGPLUGIN_DEBUG__ = this;
@@ -278,9 +281,9 @@ class Pi extends N {
    * @description: 加载数据
    */
   load(e, t) {
-    return p(this, null, function* () {
+    return f(this, null, function* () {
       var s, o;
-      this.clearTags(), console.debug(P, " load:", { data: JSON.parse(JSON.stringify(e)) }), this.config = f({}, this.config, {
+      this.clearTags(), console.debug(S, " load:", { data: JSON.parse(JSON.stringify(e)) }), this.config = p({}, this.config, {
         globalConfig: (s = e.globalConfig) != null ? s : {},
         contentTypeConfig: (o = e.contentTypeConfig) != null ? o : {}
       });
@@ -298,19 +301,24 @@ class Pi extends N {
    * @description: 添加标签
    */
   addTag(e, t) {
-    return p(this, null, function* () {
+    return f(this, null, function* () {
       const s = (Array.isArray(e) ? e : [e]).map((o) => {
-        var b, T, y;
+        var T, y, C;
         const n = this.getTagConfig(o), r = JSON.parse(JSON.stringify(o.data)), h = o.config;
-        return o.config = n, u(c({}, o), {
-          enabled: (b = o.enabled) != null ? b : !0,
-          id: (T = o.id) != null ? T : z(),
-          data: (y = n.initialData) != null && y.important ? f(o.data, r, n.initialData) : f(o.data, n.initialData, r),
+        return o.config = n, v(c({}, o), {
+          enabled: (T = o.enabled) != null ? T : !0,
+          id: (y = o.id) != null ? y : x(),
+          data: (C = n.initialData) != null && C.important ? p(o.data, r, n.initialData) : p(o.data, n.initialData, r),
           state: c({
             visible: void 0,
             unfolded: !this.can("fold", o)
           }, n.initialState),
           hooks: new F(),
+          originPosition: o.position,
+          position: (() => {
+            const m = this.getTransformedPostion(o.position);
+            return Array.isArray(m) ? m.map((w) => w.toArray()) : m.toArray();
+          })(),
           initialConfig: h,
           config: n,
           unfold: () => this.changeUnfoldedById(o.id, !0),
@@ -318,10 +326,10 @@ class Pi extends N {
           enable: () => this.changeEnabledById(o.id, !0),
           disable: () => this.changeEnabledById(o.id, !1),
           destroy: () => this.destroyTagById(o.id),
-          changeData: (S) => this.changeDataById(o.id, S)
+          changeData: (m) => this.changeDataById(o.id, m)
         });
       }).filter((o) => o.position);
-      return s.forEach(V), this.tags.push(...s), W(this.five).then(() => p(this, null, function* () {
+      return s.forEach(L), this.tags.push(...s), j(this.five).then(() => f(this, null, function* () {
         var o, n, r;
         this.store.eventListenerDisposer && ((n = (o = this.store).eventListenerDisposer) == null || n.call(o)), this.state.enabled && this.handleEnable(), this.addResizeListener(), this.clearUnusedPanelTag(), this.addMediaModelTag(s), this.setVisibleAndUnfolded({ withAnimation: (r = t == null ? void 0 : t.withAnimation) != null ? r : !0 }), this.updatePointTagPosition(), this.updateRenderAllTags();
       }));
@@ -331,22 +339,22 @@ class Pi extends N {
    * @description: 改变配置
    */
   changeConfig(e, t = !0) {
-    t ? this.config = f({}, this.config, e) : this.config = e, this.updateTagConfig(), this.updateRenderAllTags();
+    t ? this.config = p({}, this.config, e) : this.config = e, this.updateTagConfig(), this.updateRenderAllTags();
   }
   /**
    * @description: 改变全局配置
    */
   changeGlobalConfig(e, t = !0) {
-    t ? this.config.globalConfig = f({}, this.config.globalConfig, e) : this.config.globalConfig = e, this.updateTagConfig(), this.updateRenderAllTags();
+    t ? this.config.globalConfig = p({}, this.config.globalConfig, e) : this.config.globalConfig = e, this.updateTagConfig(), this.updateRenderAllTags();
   }
   /**
    * @description: 改变类型配置
    */
   changeContentTypeConfig(e, t, i = !0) {
-    this.config.contentTypeConfig || (this.config.contentTypeConfig = {}), i ? this.config.contentTypeConfig[e] = f({}, this.config.contentTypeConfig[e], t) : this.config.contentTypeConfig[e] = t, this.updateTagConfig(), this.updateRenderAllTags();
+    this.config.contentTypeConfig || (this.config.contentTypeConfig = {}), i ? this.config.contentTypeConfig[e] = p({}, this.config.contentTypeConfig[e], t) : this.config.contentTypeConfig[e] = t, this.updateTagConfig(), this.updateRenderAllTags();
   }
   show(e) {
-    return p(this, null, function* () {
+    return f(this, null, function* () {
       if (this.checkDisposed())
         return;
       const { userAction: t = !0, withAnimation: i = !1 } = e != null ? e : {};
@@ -354,7 +362,7 @@ class Pi extends N {
     });
   }
   hide(e) {
-    return p(this, null, function* () {
+    return f(this, null, function* () {
       if (this.checkDisposed())
         return;
       const { userAction: t = !0, withAnimation: i = !1 } = e != null ? e : {};
@@ -376,7 +384,7 @@ class Pi extends N {
   setState(e, t) {
     if (this.checkDisposed())
       return;
-    const { userAction: i = !0, visibleWithAnimation: s = !1 } = t, o = c({}, this.state);
+    const { userAction: i = !0, visibleWithAnimation: s = !1 } = t != null ? t : {}, o = c({}, this.state);
     this.state = Object.assign(this.state, e), this.store.visibleWithAnimation = s, o.visible !== this.state.visible && (e.visible ? this.handleShow() : this.handleHide()), o.enabled !== this.state.enabled && (e.enabled ? this.handleEnable() : this.handleDisable()), this.hooks.emit("stateChange", { state: this.state, prevState: o, userAction: i });
   }
   /**
@@ -411,7 +419,7 @@ class Pi extends N {
    */
   changeTagNormalById(e, t) {
     const i = this.getTagById(e);
-    i && i.tag3DContentSvelte && (i.tag3DContentSvelte.currentNormal = A(t));
+    i && i.tag3DContentSvelte && (i.tag3DContentSvelte.currentNormal = P(t));
   }
   /**
    * @description: 改变data
@@ -419,7 +427,7 @@ class Pi extends N {
   changeDataById(e, t, i = !0) {
     const s = this.getTagById(e);
     let o = !1;
-    s && (s.data && (o = !0), i ? s.data = f(s.data, t) : s.data = c(c({}, s.data), t), this.clearUnusedPanelTag(), this.updateRenderAllTags(), o && s.hooks.emit("dataChanged", s.data));
+    s && (s.data && (o = !0), i ? s.data = p(s.data, t) : s.data = c(c({}, s.data), t), this.clearUnusedPanelTag(), this.updateRenderAllTags(), o && s.hooks.emit("dataChanged", s.data));
   }
   /**
    * @description: 改变tag的stickType
@@ -433,7 +441,7 @@ class Pi extends N {
   changeTagById(e, t, i = !0) {
     const s = this.getTagById(e);
     let o = !1;
-    t && (t.data && (o = !0), i ? f(s, t) : Object.assign(s, t), s != null && s.tag3DContentSvelte && (t != null && t.normal) && (s.tag3DContentSvelte.currentNormal = A(t.normal)), this.updateRenderAllTags(), this.clearUnusedPanelTag(), o && s.hooks.emit("dataChanged", s.data));
+    t && (t.data && (o = !0), i ? p(s, t) : Object.assign(s, t), s != null && s.tag3DContentSvelte && (t != null && t.normal) && (s.tag3DContentSvelte.currentNormal = P(t.normal)), this.updateRenderAllTags(), this.clearUnusedPanelTag(), o && s.hooks.emit("dataChanged", s.data));
   }
   /**
    * @description: 销毁tag
@@ -448,7 +456,7 @@ class Pi extends N {
    * @description: 设置 visible 和 unfolded
    */
   setVisibleAndUnfolded() {
-    return p(this, arguments, function* ({ withAnimation: e } = { withAnimation: !1 }) {
+    return f(this, arguments, function* ({ withAnimation: e } = { withAnimation: !1 }) {
       return this.setVisible(), e ? new Promise((t) => {
         setTimeout(() => {
           this.setUnfoldedByPanoIndex(), t();
@@ -506,12 +514,12 @@ class Pi extends N {
     }, i = () => {
       this.state.enabled && this.hide();
     }, { observe: s, unobserve: o } = D(
-      O(() => {
+      V(() => {
         this.store.resizeObserverDisposer && i();
       }, 500),
       e
     ), { observe: n, unobserve: r } = D(
-      k(() => t(), 400),
+      O(() => t(), 400),
       e
     );
     return s(), n(), () => {
@@ -534,7 +542,7 @@ class Pi extends N {
   }
 }
 export {
-  Pi as PanoTagPluginController,
-  Pi as default,
-  Di as pluginFlag
+  Ei as PanoTagPluginController,
+  Ei as default,
+  wi as pluginFlag
 };

package/libs/PanoTagPlugin/index.js

@@ -1,7 +1,7 @@
 import r from "./controller/index.js";
-import { pluginFlag as Lt } from "./controller/index.js";
-import { defaultGlobalConfig as Nt } from "./typings/tag/TagConfig.js";
-import { ContentType as Qt, DimensionType as Rt, PointType as St } from "./Archive/deprecated.js";
+import { pluginFlag as Mt } from "./controller/index.js";
+import { defaultGlobalConfig as Ot } from "./typings/tag/TagConfig.js";
+import { ContentType as Rt, DimensionType as St, PointType as Ut } from "./Archive/deprecated.js";
 import "three";
 import "@realsee/five";
 import "../vendor/object-assign-deep/objectAssignDeep.js";
@@ -60,6 +60,7 @@ import "../shared-utils/five/calculateThreeMouse.js";
 import "./utils/tag/adaptConfig.js";
 import "../shared-utils/typescript/entries.js";
 import "../shared-utils/url/getUrl.js";
+import "../shared-utils/five/transformPosition.js";
 import "../shared-utils/five/getFloorIndex.js";
 import "../shared-utils/safeObj.js";
 import "./Components/TagContainer.js";
@@ -141,14 +142,14 @@ import "@realsee/five/gltf-loader";
 import "../shared-utils/animationFrame/BetterTween.js";
 import "../shared-utils/animationFrame/index.js";
 import "../shared-utils/five/fiveModelLoad.js";
-const It = (o, t) => new r(o, t);
+const Jt = (o, t) => new r(o, t);
 export {
-  Qt as ContentType,
-  Rt as DimensionType,
-  It as PanoTagPlugin,
+  Rt as ContentType,
+  St as DimensionType,
+  Jt as PanoTagPlugin,
   r as PanoTagPluginController,
-  St as PointType,
-  It as default,
-  Nt as defaultGlobalConfig,
-  Lt as pluginFlag
+  Ut as PointType,
+  Jt as default,
+  Ot as defaultGlobalConfig,
+  Mt as pluginFlag
 };

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

@@ -48,6 +48,7 @@ export type TagInstance<C extends TagContentType = TagContentType, S extends Sti
             [key in Mode]?: TagConfig<C>;
         };
     };
+    originPosition: Tag<C, S>['position'];
     hooks: Subscribe<TagEvents<C>>;
     unfold: () => void;
     fold: () => void;

package/libs/PanoTagPlugin/utils/tagPosition.d.ts

@@ -1,4 +1,3 @@
-import { Vector3 } from 'three';
 import type { TagInstance } from '../typings';
-export declare function getTagPosition(tag: TagInstance): Vector3 | Vector3[];
-export declare function getTagCenterPosition(tag: TagInstance): Vector3;
+export declare function getTagPosition(tag: TagInstance): import("three").Vector3 | import("three").Vector3[];
+export declare function getTagCenterPosition(tag: TagInstance): import("three").Vector3;

package/libs/PanoTagPlugin/utils/tagPosition.js

@@ -1,22 +1,22 @@
-import { Matrix4 as n, Vector3 as e } from "three";
-import { centerPoint as a } from "../../shared-utils/three/centerPoint.js";
-import { isMediaModelTag as m } from "./tag/tagCheck.js";
-import { vector3Position as s } from "../../shared-utils/positionToVector3.js";
-function p(r) {
-  const o = (() => {
-    if (m(r) && r.matrix) {
-      const i = new n().fromArray(r.matrix);
-      return r.data.mediaPosition.map((t) => new e().fromArray(t).applyMatrix4(i));
+import { Matrix4 as n } from "three";
+import { centerPoint as e } from "../../shared-utils/three/centerPoint.js";
+import { isMediaModelTag as a } from "./tag/tagCheck.js";
+import { anyPositionToVector3 as m, vector3Position as s } from "../../shared-utils/positionToVector3.js";
+function p(o) {
+  const i = (() => {
+    if (a(o) && o.matrix) {
+      const r = new n().fromArray(o.matrix);
+      return o.data.mediaPosition.map((t) => m(t).clone().applyMatrix4(r));
     } else
-      return r.position;
+      return o.position;
   })();
-  return s(o);
+  return s(i);
 }
-function P(r) {
-  const o = p(r);
-  return a(...Array.isArray(o) ? o : [o]);
+function x(o) {
+  const i = p(o);
+  return e(...Array.isArray(i) ? i : [i]);
 }
 export {
-  P as getTagCenterPosition,
+  x as getTagCenterPosition,
   p as getTagPosition
 };

package/libs/base/BasePlugin.js

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