@realsee/dnalogel 2.18.5 → 2.19.0-1

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -6,8 +6,8 @@ import * as C from "three";
 import { DefaultConfig as P } 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 E, getTagPosition as k } from "../utils/tagPosition.js";
-import { normalPositionToPositions as M } from "../utils/normalPositionToPositions.js";
+import { tagPosition as E, getTagPosition as M } 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/store/index.js";
 import { isIOSWX as A } from "../../shared-utils/device.js";
@@ -97,12 +97,12 @@ class De extends b {
    * TODO: 缓存
    */
   getTagConfig(e) {
-    var o, a;
+    var o, d;
     if (!e)
       return (o = this.config.globalConfig) != null ? o : {};
     const i = {};
-    this.config.contentTypeConfig && Object.keys(this.config.contentTypeConfig).forEach((d) => {
-      const r = d;
+    this.config.contentTypeConfig && Object.keys(this.config.contentTypeConfig).forEach((a) => {
+      const r = a;
       if (i[r])
         return;
       const f = r.split("-");
@@ -123,7 +123,7 @@ class De extends b {
       }
     });
     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: (a = t.visibleConfig) == null ? void 0 : a.visibleFiveMode }), t;
+    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;
   }
   loadVideoFirstFrame() {
     A && this.hooks.emit("loadVideoFirstFrame");
@@ -175,7 +175,7 @@ class De extends b {
    * @description: 获取角度
    */
   getAngle(e, i) {
-    var a, d;
+    var d, a;
     const t = i != null ? i : this.five.getCurrentState().panoIndex;
     if (t === void 0)
       throw new Error(`getDistance(): fivePanoIndex is ${t}`);
@@ -183,7 +183,7 @@ class De extends b {
     if (o.angle !== void 0)
       return o.angle;
     {
-      const r = (d = (a = this.five.work) == null ? void 0 : a.observers[t]) == null ? void 0 : d.position;
+      const r = (a = (d = this.five.work) == null ? void 0 : d.observers[t]) == null ? void 0 : a.position;
       if (r === void 0)
         throw new Error(`getAngleRange(): observerPosition is ${r}`);
       const f = (() => e.stickType === "3DPoint" ? w(e.normal) : p(e.position))();
@@ -200,7 +200,7 @@ class De extends b {
    * @description: 获取距离
    */
   getDistance(e, i) {
-    var a, d;
+    var d, a;
     const t = i != null ? i : this.five.getCurrentState().panoIndex;
     if (t === void 0)
       throw new Error(`getDistance(): fivePanoIndex is ${t}`);
@@ -208,10 +208,10 @@ class De extends b {
     if (o.distance !== void 0)
       return o.distance;
     {
-      const r = (d = (a = this.five.work) == null ? void 0 : a.observers[t]) == null ? void 0 : d.position;
+      const r = (a = (d = this.five.work) == null ? void 0 : d.observers[t]) == null ? void 0 : a.position;
       if (r === void 0)
         throw new Error(`getDistance(): observerPosition is ${r}`);
-      const f = k(e);
+      const f = M(e);
       if (!f)
         return -1;
       const s = r.distanceTo(f);
@@ -224,7 +224,7 @@ class De extends b {
     if (g(e))
       return e.data.mediaPosition;
     const i = e;
-    return M(
+    return k(
       this.five.camera.position,
       h(i.position),
       h(i.normal)
@@ -234,7 +234,7 @@ class De extends b {
     if (!i || !this.domEvents)
       return () => {
       };
-    const o = () => !(!e.state.visible || !this.state.visible || g(e) && !e.mediaVisible), a = (s) => {
+    const o = () => !(!e.state.visible || !this.state.visible || g(e) && !e.mediaVisible), d = (s) => {
       if (!o()) {
         this.mouseInfo = void 0;
         return;
@@ -246,7 +246,7 @@ class De extends b {
         isDown: !0,
         mouseDownTimestamp: Date.now()
       };
-    }, d = (s) => {
+    }, a = (s) => {
       if (!o()) {
         this.mouseInfo = void 0;
         return;
@@ -273,8 +273,8 @@ class De extends b {
       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);
     };
-    return this.domEvents.addEventListener(i, "mousedown", a, !1), this.domEvents.addEventListener(i, "mouseup", d, !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", a), this.domEvents.removeEventListener(i, "mouseup", d), this.domEvents.removeEventListener(i, "touchstart", r), this.domEvents.removeEventListener(i, "touchend", f));
+    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));
     };
   }
   getTagNormal(e) {
@@ -307,7 +307,7 @@ class De extends b {
     return this.tags.filter((e) => e.stickType === "Model");
   }
   get filterCSS3DTag() {
-    return this.tags.filter((i) => i.stickType === "3DPoint" || i.stickType === "Plane" || i.stickType === "Model").filter((i) => {
+    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";
     });

package/libs/PanoTagPlugin/controller/index.js

@@ -1,72 +1,73 @@
-var S = Object.defineProperty, F = Object.defineProperties;
-var P = Object.getOwnPropertyDescriptors;
-var b = Object.getOwnPropertySymbols;
-var M = Object.prototype.hasOwnProperty, U = Object.prototype.propertyIsEnumerable;
-var u = (d, a, e) => a in d ? S(d, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[a] = e, l = (d, a) => {
+var E = Object.defineProperty, F = Object.defineProperties;
+var w = Object.getOwnPropertyDescriptors;
+var C = Object.getOwnPropertySymbols;
+var U = Object.prototype.hasOwnProperty, I = Object.prototype.propertyIsEnumerable;
+var v = (h, a, e) => a in h ? E(h, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[a] = e, l = (h, a) => {
   for (var e in a || (a = {}))
-    M.call(a, e) && u(d, e, a[e]);
-  if (b)
-    for (var e of b(a))
-      U.call(a, e) && u(d, e, a[e]);
-  return d;
-}, m = (d, a) => F(d, P(a));
-var c = (d, a, e) => (u(d, typeof a != "symbol" ? a + "" : a, e), e);
-var f = (d, a, e) => new Promise((t, i) => {
-  var s = (n) => {
+    U.call(a, e) && v(h, e, a[e]);
+  if (C)
+    for (var e of C(a))
+      I.call(a, e) && v(h, e, a[e]);
+  return h;
+}, u = (h, a) => F(h, w(a));
+var g = (h, a, e) => (v(h, typeof a != "symbol" ? a + "" : a, e), e);
+var f = (h, a, e) => new Promise((t, i) => {
+  var s = (r) => {
     try {
-      r(e.next(n));
-    } catch (h) {
-      i(h);
+      n(e.next(r));
+    } catch (d) {
+      i(d);
     }
-  }, o = (n) => {
+  }, o = (r) => {
     try {
-      r(e.throw(n));
-    } catch (h) {
-      i(h);
+      n(e.throw(r));
+    } catch (d) {
+      i(d);
     }
-  }, r = (n) => n.done ? t(n.value) : Promise.resolve(n.value).then(s, o);
-  r((e = e.apply(d, a)).next());
+  }, n = (r) => r.done ? t(r.value) : Promise.resolve(r.value).then(s, o);
+  n((e = e.apply(h, a)).next());
 });
-import { Subscribe as E } from "@realsee/five";
+import * as b from "three";
+import { Subscribe as B } from "@realsee/five";
 import { objectAssignDeepExports as p } from "../../vendor/object-assign-deep/objectAssignDeep.js";
-import { arrayPositionToVector3 as T } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
-import { addDebugPoints as w } from "../utils/addDebugPoints.js";
-import "three";
-import { isMediaModelTag as C } from "../utils/tag/tagCheck.js";
-import { waitFiveModelLoaded as I } from "../utils/actionAfterFiveModelLoad.js";
-import { debounce as A } from "../utils/debounce.js";
-import { throttle as B } from "../utils/throttle.js";
-import { resizeObserver as y } from "../utils/resizeObserver.js";
-import R from "../utils/tag/format.js";
-import { generateBlankAudio as O, AudioNamespace as _ } from "../../shared-utils/audio.js";
-import { TagRender as k } from "./TagRender.js";
-import { uuid as L } from "../../shared-utils/uuid.js";
+import { arrayPositionToVector3 as A } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
+import { addDebugPoints as R } from "../utils/addDebugPoints.js";
+import { isMediaModelTag as y, isModelTag as O } from "../utils/tag/tagCheck.js";
+import { waitFiveModelLoaded as _ } from "../utils/actionAfterFiveModelLoad.js";
+import { debounce as D } from "../utils/debounce.js";
+import { throttle as k } from "../utils/throttle.js";
+import { resizeObserver as S } from "../utils/resizeObserver.js";
+import L from "../utils/tag/format.js";
+import { generateBlankAudio as G, AudioNamespace as V } from "../../shared-utils/audio.js";
+import { TagRender as N } from "./TagRender.js";
+import { uuid as z } from "../../shared-utils/uuid.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 x } from "../../shared-utils/animationFrame/BetterTween.js";
 import "./TagComputer.js";
 import "../utils/tagPosition.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../utils/checkRange.js";
-import "hammerjs";
-import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
-import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
+import "../../shared-utils/isNil.js";
+import "./TagUtil.js";
+import "../tag.config.js";
+import "../utils/planeNormal.js";
+import "../utils/normalPositionToPositions.js";
+import "./TagCache.js";
+import "../../base/BasePlugin.js";
+import "../../shared-utils/Subscribe.js";
+import "../../shared-utils/isAbsoluteURL.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
 import "../../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
 import "../../CSS3DRenderPlugin/utils/createResizeObserver.js";
 import "../../CSS3DRenderPlugin/utils/even.js";
-import "../../shared-utils/Subscribe.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
 import "../../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
-import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import "../../shared-utils/isNil.js";
-import "./TagUtil.js";
-import "../tag.config.js";
-import "../utils/planeNormal.js";
-import "../utils/normalPositionToPositions.js";
-import "./TagCache.js";
-import "../../base/BasePlugin.js";
-import "../../shared-utils/isAbsoluteURL.js";
 import "../../vendor/svelte/store/index.js";
 import "../../vendor/svelte/internal/index.js";
 import "../../shared-utils/device.js";
@@ -156,35 +157,36 @@ import "../../CSS3DRenderPlugin/Controller.js";
 import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 import "../../shared-utils/three/GLTFLoader.js";
 import "@realsee/five/gltf-loader";
-const D = "Dnalogel-PanoTagPlugin", ri = (d) => `${D}--${d}`;
-class ai extends k {
+import "../../shared-utils/animationFrame/index.js";
+const M = "Dnalogel-PanoTagPlugin", pi = (h) => `${M}--${h}`;
+class ci extends N {
   constructor(e, t) {
     super(e);
     /** state */
-    c(this, "state", { enabled: !0, visible: !0 });
+    g(this, "state", { enabled: !0, visible: !0 });
     /** 插件参数 */
-    c(this, "params");
+    g(this, "params");
     /** debug */
-    c(this, "debug");
+    g(this, "debug");
     /** 更改 tag 模型 */
-    c(this, "changeTagModel", (e, t) => f(this, null, function* () {
+    g(this, "changeTagModel", (e, t) => f(this, null, function* () {
       e.data = p({}, e.data, t), yield this.loadModel(e), this.updateRenderAllTags();
     }));
-    c(this, "handleFiveInitAnimationEnded", () => {
+    g(this, "handleFiveInitAnimationEnded", () => {
       const e = this.five.getCurrentState().mode;
       this.tags.forEach((t) => {
-        C(t) && e === "Panorama" && this.changeTagMode(t, "front"), t.state.visible = this.getVisible(t);
+        y(t) && e === "Panorama" && this.changeTagMode(t, "front"), t.state.visible = this.getVisible(t);
       }), this.updateRenderAllTags();
     });
     /** 楼层切换时，需要更新标签可见性 */
-    c(this, "handleFiveModelShownFloorChange", () => {
+    g(this, "handleFiveModelShownFloorChange", () => {
       this.tags.forEach((e) => {
         var i, s;
         const t = this.getTagConfig(e).visibleConfig;
         typeof t == "object" && ((i = t.visibleFiveMode) != null && i.includes("Floorplan") || (s = t.visibleFiveMode) != null && s.includes("Mapview")) && (e.state.visible = this.getVisibleByFiveMode(e));
       }), this.updateRenderAllTags();
     });
-    this.params = l({ debug: !1, config: this.config }, t), this.debug = this.params.debug, this.config = this.params.config, O(1, { namespace: _.PlayAudio });
+    this.params = p({}, { debug: !1, config: this.config }, l({}, t)), this.debug = this.params.debug, this.config = this.params.config, G(1, { namespace: V.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;
@@ -197,16 +199,16 @@ class ai extends k {
   load(e, t) {
     return f(this, null, function* () {
       var s, o;
-      this.clearTags(), console.info(D, " load:", { data: JSON.parse(JSON.stringify(e)) }), this.config = p({}, this.config, {
+      this.clearTags(), console.info(M, " load:", { data: JSON.parse(JSON.stringify(e)) }), this.config = p({}, this.config, {
         globalConfig: (s = e.globalConfig) != null ? s : {},
         contentTypeConfig: (o = e.contentTypeConfig) != null ? o : {}
       });
       const i = yield this.addTag(e.tagList, t);
       if (this.debug)
         try {
-          w(this.five, this.tags);
-        } catch (r) {
-          console.error(r);
+          R(this.five, this.tags);
+        } catch (n) {
+          console.error(n);
         }
       return i;
     });
@@ -217,17 +219,17 @@ class ai extends k {
   addTag(e, t) {
     return f(this, null, function* () {
       const s = (Array.isArray(e) ? e : [e]).map((o) => {
-        var h;
-        const r = this.getTagConfig(o);
-        return m(l({}, o), {
-          id: (h = o.id) != null ? h : L(),
-          data: p({}, r.initialData, o.data),
+        var d;
+        const n = this.getTagConfig(o);
+        return u(l({}, o), {
+          id: (d = o.id) != null ? d : z(),
+          data: p({}, n.initialData, o.data),
           state: l({
             visible: void 0,
             unfolded: !this.can("fold", o)
-          }, r.initialState),
-          hooks: new E(),
-          mergedConfig: r,
+          }, n.initialState),
+          hooks: new B(),
+          mergedConfig: n,
           unfold: () => this.changeUnfoldedById(o.id, !0),
           fold: () => this.changeUnfoldedById(o.id, !1),
           enable: () => this.changeEnabledById(o.id, !0),
@@ -235,9 +237,9 @@ class ai extends k {
           destroy: () => this.destroyTagById(o.id)
         });
       }).filter((o) => o.position);
-      return s.forEach(R), this.tags.push(...s), I(this.five).then(() => f(this, null, function* () {
-        var o, r, n;
-        this.store.eventListenerDisposer && ((r = (o = this.store).eventListenerDisposer) == null || r.call(o)), this.state.enabled && this.handleEnable(), this.addResizeListener(), this.clearUnusedPanelTag(), this.setVisibleAndUnfolded({ withAnimation: (n = t == null ? void 0 : t.withAnimation) != null ? n : !0 }).then(() => this.updateRenderAllTags()), this.updateRenderAllTags(), yield this.addMediaModelTag(s);
+      return s.forEach(L), this.tags.push(...s), _(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.setVisibleAndUnfolded({ withAnimation: (r = t == null ? void 0 : t.withAnimation) != null ? r : !0 }).then(() => this.updateRenderAllTags()), this.updateRenderAllTags(), yield this.addMediaModelTag(s);
       }));
     });
   }
@@ -297,22 +299,22 @@ class ai extends k {
    * @description: 销毁
    */
   dispose() {
-    var e, t, i, s, o, r;
-    this.pauseCurrentMedia(), this.disposeAllCSS3DContainer(), (e = this.TagContainerSvelte) == null || e.$destroy(), this.filterCSS3DTag.forEach((n) => {
-      var h;
-      return (h = n.tag3DContentSvelte) == null ? void 0 : h.svelteApp.$destroy();
-    }), this.tags = [], (t = this.store.disposers) == null || t.forEach((n) => n == null ? void 0 : n()), this.store.disposers = [], (s = (i = this.store).eventListenerDisposer) == null || s.call(i), this.store.eventListenerDisposer = void 0, (r = (o = this.store).resizeObserverDisposer) == null || r.call(o), this.store.resizeObserverDisposer = void 0, this.store.resizeObserverDisposerAdding = !1, this.five.scene.remove(this.group), this.group.remove(...this.group.children), this.gltfObjectGroup.remove(...this.gltfObjectGroup.children), this.imagePlaneGroup.remove(...this.imagePlaneGroup.children), this.clearCache(), this.five.needsRender = !0, this.store.disposed = !0, this.hooks.emit("dispose");
+    var e, t, i, s, o, n;
+    this.pauseCurrentMedia(), this.disposeAllCSS3DContainer(), (e = this.TagContainerSvelte) == null || e.$destroy(), this.filterCSS3DTag.forEach((r) => {
+      var d;
+      return (d = r.tag3DContentSvelte) == null ? void 0 : d.svelteApp.$destroy();
+    }), this.tags = [], (t = this.store.disposers) == null || t.forEach((r) => r == null ? void 0 : r()), this.store.disposers = [], (s = (i = this.store).eventListenerDisposer) == null || s.call(i), this.store.eventListenerDisposer = void 0, (n = (o = this.store).resizeObserverDisposer) == null || n.call(o), this.store.resizeObserverDisposer = void 0, this.store.resizeObserverDisposerAdding = !1, this.five.scene.remove(this.group), this.group.remove(...this.group.children), this.gltfObjectGroup.remove(...this.gltfObjectGroup.children), this.imagePlaneGroup.remove(...this.imagePlaneGroup.children), this.clearCache(), this.five.needsRender = !0, this.store.disposed = !0, this.hooks.emit("dispose");
   }
   changeUnfoldedById(e, t) {
-    var r;
+    var n;
     const i = this.getTagById(e);
     if (!i)
       return;
     const s = this.can("fold", i), o = this.can("unfold", i);
     if (s && o) {
       i.state.unfolded = t;
-      const n = this.filterPointTag;
-      (r = this.TagContainerSvelte) == null || r.$set({ tags: n });
+      const r = this.filterPointTag;
+      (n = this.TagContainerSvelte) == null || n.$set({ tags: r });
     } else
       console.warn(`tag ${e} cannot be ${t ? "unfolded" : "folded"}`);
   }
@@ -325,7 +327,7 @@ class ai extends k {
    */
   changeTagNormalById(e, t) {
     const i = this.getTagById(e);
-    i && i.tag3DContentSvelte && (i.tag3DContentSvelte.currentNormal = T(t));
+    i && i.tag3DContentSvelte && (i.tag3DContentSvelte.currentNormal = A(t));
   }
   /**
    * @description: 改变data
@@ -345,7 +347,7 @@ class ai extends k {
    */
   changeTagById(e, t, i = !0) {
     const s = this.getTagById(e);
-    t && (i ? p(s, t) : Object.assign(s, t), s != null && s.tag3DContentSvelte && (t != null && t.normal) && (s.tag3DContentSvelte.currentNormal = T(t.normal)), this.updateRenderAllTags(), this.clearUnusedPanelTag());
+    t && (i ? p(s, t) : Object.assign(s, t), s != null && s.tag3DContentSvelte && (t != null && t.normal) && (s.tag3DContentSvelte.currentNormal = A(t.normal)), this.updateRenderAllTags(), this.clearUnusedPanelTag());
   }
   /**
    * @description: 销毁tag
@@ -392,9 +394,9 @@ class ai extends k {
    * @description: 添加 cameraUpdate, panoArrived 等事件监听
    */
   addEventListener() {
-    const { five: e, hooks: t } = this, i = this.handleFiveWantsMoveToPano.bind(this), s = this.handleFiveModeChange.bind(this), o = this.handleFiveCameraUpdate.bind(this), r = this.handleFiveCameraUpdateDebounce(), n = this.handleFivePanoArrived.bind(this), h = this.loadVideoFirstFrame.bind(this), g = this.clickhandler.bind(this), v = this.five.currentMode;
-    return v && this.handleFiveModeChange(v), this.handleFivePanoArrived(), e.on("wantsMoveToPano", i), e.on("modeChange", s), e.on("initAnimationEnded", this.handleFiveInitAnimationEnded), e.on("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.on("cameraUpdate", o), e.on("cameraUpdate", r), e.on("panoArrived", n), e.on("panoArrived", h), t.on("click", g), () => {
-      e.off("wantsMoveToPano", i), e.off("modeChange", s), e.off("initAnimationEnded", this.handleFiveInitAnimationEnded), e.off("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.off("cameraUpdate", o), e.off("cameraUpdate", r), e.off("panoArrived", n), e.off("panoArrived", h), t.off("click", g), this.store.eventListenerDisposer = void 0;
+    const { five: e, hooks: t } = this, i = this.handleFiveWantsMoveToPano.bind(this), s = this.handleFiveModeChange.bind(this), o = this.handleFiveCameraUpdate.bind(this), n = this.handleFiveCameraUpdateDebounce(), r = this.handleFivePanoArrived.bind(this), d = this.loadVideoFirstFrame.bind(this), c = this.clickhandler.bind(this), m = this.five.currentMode;
+    return m && this.handleFiveModeChange(m), this.handleFivePanoArrived(), e.on("wantsMoveToPano", i), e.on("modeChange", s), e.on("initAnimationEnded", this.handleFiveInitAnimationEnded), e.on("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.on("cameraUpdate", o), e.on("cameraUpdate", n), e.on("panoArrived", r), e.on("panoArrived", d), t.on("click", c), () => {
+      e.off("wantsMoveToPano", i), e.off("modeChange", s), e.off("initAnimationEnded", this.handleFiveInitAnimationEnded), e.off("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.off("cameraUpdate", o), e.off("cameraUpdate", n), e.off("panoArrived", r), e.off("panoArrived", d), t.off("click", c), this.store.eventListenerDisposer = void 0;
     };
   }
   addResizeListener() {
@@ -412,17 +414,17 @@ class ai extends k {
       this.state.enabled && (this.show(), this.updateRenderAllTags());
     }, i = () => {
       this.state.enabled && this.hide();
-    }, { observe: s, unobserve: o } = y(
-      B(() => {
+    }, { observe: s, unobserve: o } = S(
+      k(() => {
         this.store.resizeObserverDisposer && i();
       }, 500),
       e
-    ), { observe: r, unobserve: n } = y(
-      A(() => t(), 400),
+    ), { observe: n, unobserve: r } = S(
+      D(() => t(), 400),
       e
     );
-    return s(), r(), () => {
-      o(), n();
+    return s(), n(), () => {
+      o(), r();
     };
   }
   /**
@@ -430,13 +432,13 @@ class ai extends k {
    */
   handleFiveModeChange(e) {
     this.setModelMedialVisible(), this.tags.forEach((t) => {
-      C(t) && e !== "Panorama" && this.changeTagMode(t, "behind"), t.state.visible = this.getVisible(t);
+      y(t) && e !== "Panorama" && this.changeTagMode(t, "behind"), t.state.visible = this.getVisible(t);
     }), this.updateRenderAllTags();
   }
   handleFiveWantsMoveToPano() {
     this.tags.forEach((e) => {
       const t = this.getTagConfig(e);
-      typeof t.visibleConfig == "object" && (t.visibleConfig.keep ? e.temporaryState = m(l({}, e.temporaryState), { visible: t.visibleConfig.keep === "visible" }) : e.temporaryState = m(l({}, e.temporaryState), { visible: !!t.visibleConfig.alwaysShowWhenMovePano }));
+      typeof t.visibleConfig == "object" && (t.visibleConfig.keep ? e.temporaryState = u(l({}, e.temporaryState), { visible: t.visibleConfig.keep === "visible" }) : e.temporaryState = u(l({}, e.temporaryState), { visible: !!t.visibleConfig.alwaysShowWhenMovePano }));
     }), this.updateTagContainerVisible();
   }
   /**
@@ -466,7 +468,7 @@ class ai extends k {
     }), this.updateRenderAllTags());
   }
   handleFiveCameraUpdateDebounce() {
-    return A(() => {
+    return D(() => {
       this.setUnfoldedByCamera(), this.updateRenderAllTags();
     }, 100);
   }
@@ -475,8 +477,24 @@ class ai extends k {
   }
   handleFivePanoArrived() {
     return f(this, null, function* () {
-      this.setModelMedialVisible(), yield this.setVisibleAndUnfolded(), this.tags.forEach((e) => {
-        e.temporaryState = m(l({}, e.temporaryState), { visible: !0 });
+      var e, t, i;
+      this.setModelMedialVisible(), yield this.setVisibleAndUnfolded(), this.tags.forEach((s) => {
+        s.temporaryState = u(l({}, s.temporaryState), { visible: !0 });
+      }), (i = (t = (e = this.config) == null ? void 0 : e.globalConfig) == null ? void 0 : t.modelConfig) != null && i.autoLookAtEnabled && this.tags.filter(O).filter((s) => {
+        var o, n;
+        return (n = (o = s.config) == null ? void 0 : o.modelConfig) == null ? void 0 : n.autoLookAtEnabled;
+      }).forEach((s) => {
+        var T;
+        const o = new b.Mesh(new b.BoxGeometry(), new b.MeshBasicMaterial()), n = (T = s.model) == null ? void 0 : T.object;
+        if (!n)
+          return;
+        o.position.copy(n.position), o.quaternion.copy(n.quaternion);
+        const r = this.five.camera.position;
+        o.lookAt(r.clone().setY(o.position.y));
+        const d = n.quaternion.clone(), c = o.quaternion.clone(), m = x();
+        m.onUpdate(({ progress: P }) => {
+          n.quaternion.copy(d.clone().slerp(c, P));
+        }), m.play();
       }), this.store.visibleWithAnimation = !0, this.updateTagContainerVisible(), this.updateRenderAllTags();
     });
   }
@@ -491,12 +509,12 @@ class ai extends k {
     });
   }
   changeTagMode(e, t) {
-    var i, s, o, r, n, h;
-    ((i = this.getTagConfig(e)) == null ? void 0 : i.renderType) !== "Mesh" && ((r = (o = (s = e.tag3DContentSvelte) == null ? void 0 : s.css3DInstance) == null ? void 0 : o.css3DObject) == null ? void 0 : r.mode) !== t && ((n = e.config) != null && n.tag3DConfig ? e.config.tag3DConfig.mode = t : e.config ? e.config.tag3DConfig = { mode: t } : e.config = { tag3DConfig: { mode: t } }, (h = this.store.css3DRenderDisposer.get(e.id)) == null || h.forEach((g) => g == null ? void 0 : g()), e.tag3DContentSvelte = void 0);
+    var i, s, o, n, r, d;
+    ((i = this.getTagConfig(e)) == null ? void 0 : i.renderType) !== "Mesh" && ((n = (o = (s = e.tag3DContentSvelte) == null ? void 0 : s.css3DInstance) == null ? void 0 : o.css3DObject) == null ? void 0 : n.mode) !== t && ((r = e.config) != null && r.tag3DConfig ? e.config.tag3DConfig.mode = t : e.config ? e.config.tag3DConfig = { mode: t } : e.config = { tag3DConfig: { mode: t } }, (d = this.store.css3DRenderDisposer.get(e.id)) == null || d.forEach((c) => c == null ? void 0 : c()), e.tag3DContentSvelte = void 0);
   }
 }
 export {
-  ai as PanoTagPluginController,
-  ai as default,
-  ri as pluginFlag
+  ci as PanoTagPluginController,
+  ci as default,
+  pi as pluginFlag
 };

package/libs/PanoTagPlugin/index.js

@@ -1,11 +1,11 @@
 import t from "./controller/index.js";
-import { pluginFlag as vr } from "./controller/index.js";
-import { ContentType as Ar } from "./typings/tag/TagData.js";
-import { DimensionType as Er } from "./typings/tag/Utils.js";
+import { pluginFlag as Ar } from "./controller/index.js";
+import { ContentType as Er } from "./typings/tag/TagData.js";
+import { DimensionType as Hr } from "./typings/tag/Utils.js";
+import "three";
 import "@realsee/five";
 import "../vendor/object-assign-deep/objectAssignDeep.js";
 import "../CSS3DRenderPlugin/utils/positionToVector3.js";
-import "three";
 import "./utils/addDebugPoints.js";
 import "./utils/tag/tagCheck.js";
 import "./utils/actionAfterFiveModelLoad.js";
@@ -131,12 +131,14 @@ import "../CSS3DRenderPlugin/Controller.js";
 import "../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 import "../shared-utils/three/GLTFLoader.js";
 import "@realsee/five/gltf-loader";
-const jr = (o, r) => new t(o, r);
+import "../shared-utils/animationFrame/BetterTween.js";
+import "../shared-utils/animationFrame/index.js";
+const qr = (o, r) => new t(o, r);
 export {
-  Ar as ContentType,
-  Er as DimensionType,
-  jr as PanoTagPlugin,
+  Er as ContentType,
+  Hr as DimensionType,
+  qr as PanoTagPlugin,
   t as PanoTagPluginController,
-  jr as default,
-  vr as pluginFlag
+  qr as default,
+  Ar as pluginFlag
 };

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

@@ -124,6 +124,9 @@ export interface TagConfig<C extends TagContentType = TagContentType, S extends
     };
     initialData?: PartialDeep<ContentTypeMap[C]>;
     tag3DConfig?: Create3DDomContainerParamsType['config'];
+    modelConfig?: {
+        autoLookAtEnabled?: boolean;
+    };
     /** 当图片为一张时可以通过Mesh渲染 */
     renderType?: 'Mesh' | 'Dom';
     clickable?: false;

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

@@ -35,6 +35,8 @@ export declare enum ContentType {
     MediaPlane = "MediaPlane",
     /** 带有多媒体的模型 */
     MediaModel = "MediaModel",
+    /** 模型 */
+    Model = "Model",
     /** 其他/自定义标签 */
     Custom = "Custom",
     /** Unknown */
@@ -162,13 +164,21 @@ interface ContentTypeMapInterface {
             type: 'iframe' | 'window';
         };
     };
+    Model: {
+        modelUrl: string;
+        matrix?: number[];
+        action?: {
+            url?: string;
+            type: 'iframe' | 'window' | 'custom';
+        };
+    };
     Custom: Object;
     Unknown: Object;
 }
-type ContentTypeMapInterfaceWithextraData = {
+type ContentTypeMapInterfaceWithExtraData = {
     [key in keyof ContentTypeMapInterface]: ContentTypeMapInterface[key] & {
         extraData?: Object;
     };
 };
-export type ContentTypeMap = Pick<ContentTypeMapInterfaceWithextraData, TagContentType>;
+export type ContentTypeMap = Pick<ContentTypeMapInterfaceWithExtraData, TagContentType>;
 export {};

package/libs/PanoTagPlugin/typings/tag/TagData.js

@@ -1,4 +1,4 @@
-var a = /* @__PURE__ */ ((i) => (i.Audio = "Audio", i.Text = "Text", i.ImageText = "ImageText", i.Image = "Image", i.Video = "Video", i.Link = "Link", i.Sticker = "Sticker", i.VRLink = "VRLink", i.PanoLink = "PanoLink", i.Marketing = "Marketing", i.MediaPlane = "MediaPlane", i.MediaModel = "MediaModel", i.Custom = "Custom", i.Unknown = "Unknown", i))(a || {});
+var a = /* @__PURE__ */ ((i) => (i.Audio = "Audio", i.Text = "Text", i.ImageText = "ImageText", i.Image = "Image", i.Video = "Video", i.Link = "Link", i.Sticker = "Sticker", i.VRLink = "VRLink", i.PanoLink = "PanoLink", i.Marketing = "Marketing", i.MediaPlane = "MediaPlane", i.MediaModel = "MediaModel", i.Model = "Model", i.Custom = "Custom", i.Unknown = "Unknown", i))(a || {});
 export {
   a as ContentType
 };

package/libs/PanoTagPlugin/utils/tag/tagCheck.d.ts

@@ -1,4 +1,4 @@
-import type { PlaneTagElement, Tag } from '../../typings';
+import type { PlaneTagElement, Tag, TagElement } from '../../typings';
 export declare function isPointTag(tag: Tag<any, any>): boolean;
 export declare function isPlaneTag(tag: Tag<any, any>): tag is PlaneTagElement;
 export declare function isPoint2DTag(tag: Tag<any, any>): boolean;
@@ -6,4 +6,6 @@ export declare function isPoint3DTag(tag: Tag<any, any>): boolean;
 export declare function is2DTag(tag: Tag<any, any>): boolean;
 export declare function is3DTag(tag: Tag<any, any>): tag is Tag<any, '3DPoint'> | Tag<any, 'Plane'>;
 export declare function isMediaModelTag(tag: Tag<any, any>): tag is Tag<'MediaModel', 'Model'>;
+export declare function isModelTag(tag: Tag<any, any>): tag is Tag<'Model', 'Model'>;
+export declare function isStickModelTag(tag: Tag<any, any>): tag is TagElement<'Model', 'Model'> | TagElement<'MediaModel', 'Model'>;
 export declare function isMediaPlaneTag(tag: Tag<any, any>): tag is Tag<'MediaModel', 'Model'>;