@realsee/dnalogel 3.81.10-alpha.3 → 3.81.10-alpha.5

package/libs/PanoTagPlugin/controller/Tag/PlaneTag.js

@@ -1,16 +1,16 @@
-var w = Object.defineProperty, V = Object.defineProperties;
-var k = Object.getOwnPropertyDescriptors;
-var C = Object.getOwnPropertySymbols;
-var _ = Object.prototype.hasOwnProperty, H = Object.prototype.propertyIsEnumerable;
+var w = Object.defineProperty, k = Object.defineProperties;
+var B = Object.getOwnPropertyDescriptors;
+var F = Object.getOwnPropertySymbols;
+var O = Object.prototype.hasOwnProperty, _ = Object.prototype.propertyIsEnumerable;
 var D = (c, l, t) => l in c ? w(c, l, { enumerable: !0, configurable: !0, writable: !0, value: t }) : c[l] = t, S = (c, l) => {
   for (var t in l || (l = {}))
-    _.call(l, t) && D(c, t, l[t]);
-  if (C)
-    for (var t of C(l))
-      H.call(l, t) && D(c, t, l[t]);
+    O.call(l, t) && D(c, t, l[t]);
+  if (F)
+    for (var t of F(l))
+      _.call(l, t) && D(c, t, l[t]);
   return c;
-}, E = (c, l) => V(c, k(l));
-var b = (c, l, t) => (D(c, typeof l != "symbol" ? l + "" : l, t), t);
+}, E = (c, l) => k(c, B(l));
+var I = (c, l, t) => (D(c, typeof l != "symbol" ? l + "" : l, t), t);
 var x = (c, l, t) => new Promise((e, i) => {
   var o = (r) => {
     try {
@@ -27,20 +27,20 @@ var x = (c, l, t) => new Promise((e, i) => {
   }, a = (r) => r.done ? e(r.value) : Promise.resolve(r.value).then(o, s);
   a((t = t.apply(c, l)).next());
 });
-import { CONST as O } from "../../../shared-utils/constants.js";
-import { CSS3DObjectPlus as B } from "../../../shared-utils/CSS3DRender/CSS3DObject.js";
+import { CONST as A } from "../../../shared-utils/constants.js";
+import { CSS3DObjectPlus as H } from "../../../shared-utils/CSS3DRender/CSS3DObject.js";
 import { anyPositionToVector3 as T, arrayPositionToVector3 as y } from "../../../shared-utils/positionToVector3.js";
-import * as M from "three";
-import { planeNormal as A } from "../../utils/planeNormal.js";
-import { centerPoint as G } from "../../../shared-utils/three/centerPoint.js";
-import { VideoPlane as L, ImagePlane as N } from "../../utils/model/mediaPlane.js";
-import W from "../../Components/Tag/index.js";
-import { BaseTag as $ } from "./BaseTag.js";
+import * as V from "three";
+import { planeNormal as G } from "../../utils/planeNormal.js";
+import { centerPoint as L } from "../../../shared-utils/three/centerPoint.js";
+import { VideoPlane as N, ImagePlane as W } from "../../utils/model/mediaPlane.js";
+import $ from "../../Components/Tag/index.js";
+import { BaseTag as U } from "./BaseTag.js";
 import "../../../shared-utils/tag.js";
 import "../../../vendor/hammerjs/hammer.js";
 import "../../../shared-utils/three/PointSelector/index.js";
 import "../../../shared-utils/three/CSS3DRenderer/index.js";
-import { initialCSS3DRender as U } from "../../../shared-utils/CSS3DRender/index.js";
+import { initialCSS3DRender as q } from "../../../shared-utils/CSS3DRender/index.js";
 import "@realsee/five/line";
 import "../../../shared-utils/three/core/Five_LineMaterial2.js";
 import "../../../shared-utils/three/core/Sphere.js";
@@ -48,13 +48,14 @@ import "../../../shared-utils/three/blink.js";
 import "../../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import { waitFiveModelLoaded as R } from "../../../shared-utils/five/fiveModelLoad.js";
+import { waitFiveModelLoaded as M } from "../../../shared-utils/five/fiveModelLoad.js";
 import "../../../vendor/earcut/src/earcut.js";
-import { uuid as q } from "../../../shared-utils/uuid.js";
+import { uuid as Z } from "../../../shared-utils/uuid.js";
 import "../../../shared-utils/five/FivePuppet.js";
-import { Sculpt as j } from "../../../Sculpt/index.js";
-import { Rectangle as Z } from "../../../Sculpt/Objects/Rectangle/index.js";
-import { getFloorMesh as z } from "../../../shared-utils/five/getFloorMesh.js";
+import { Sculpt as R } from "../../../Sculpt/index.js";
+import { Rectangle as z } from "../../../Sculpt/Objects/Rectangle/index.js";
+import { getFloorMesh as J } from "../../../shared-utils/five/getFloorMesh.js";
+import { canAutoPlayByOcclusion as K } from "../../utils/tag/canAutoPlayByOcclusion.js";
 import "../../../shared-utils/even.js";
 import "../../../shared-utils/CSS3DRender/OpacityMesh.js";
 import "../../../shared-utils/isNil.js";
@@ -302,18 +303,18 @@ import "../../../shared-utils/forReverseEach.js";
 import "../../../Sculpt/Objects/Line/index.js";
 import "../../../Sculpt/Editors/RectangleMeshEditor.js";
 import "../../../Sculpt/utils/sortPositionsByCameraPosition.js";
-const J = /* @__PURE__ */ new Map(), K = /* @__PURE__ */ new Map();
-class oa extends $ {
+const Q = /* @__PURE__ */ new Map(), X = /* @__PURE__ */ new Map();
+class na extends U {
   constructor(t, e) {
     super(t, e);
-    b(this, "_floorIndex");
-    b(this, "_floorIndexDirty", !0);
-    b(this, "_opacity");
+    I(this, "_floorIndex");
+    I(this, "_floorIndexDirty", !0);
+    I(this, "_opacity");
     /**
      * 因不可见被销毁前是否处于播放态。
      * PlaneTag 实例在不可见期间存活（只有 mediaPlane 被销毁），因此状态记在这里。
      */
-    b(this, "wasPlayingBeforeHidden", !1);
+    I(this, "wasPlayingBeforeHidden", !1);
     this.state.unfolded = !0, this.loadModel();
   }
   /** 获取透明度 */
@@ -338,7 +339,7 @@ class oa extends $ {
     this.computeRenderType() === "Mesh" ? (this.initialSculpt(), ((i = (e = this.data.mediaData) == null ? void 0 : e[0]) == null ? void 0 : i.type) === "Video" ? this.renderVideoPlane() : ((s = (o = this.data.mediaData) == null ? void 0 : o[0]) == null ? void 0 : s.type) === "Image" ? this.renderImagePlane() : this.renderEmptyPlane()) : ((a = this.tag3DContentSvelte) == null || a.svelteApp.$set({ tag: this, state: this.plugin.state, temporaryState: this.plugin.temporaryState }), (r = this.tag3DContentSvelte) != null && r.css3DInstance && (this.tag3DContentSvelte.css3DInstance.visible = this.visible, this.five.needsRender = !0)), this.syncEditorAuxiliaryVisibility();
   }
   set(t, e = !0) {
-    super.set(t, e), R(this.five).then(() => {
+    super.set(t, e), M(this.five).then(() => {
       this.tag3DContentSvelte && (t.data ? this.tag3DContentSvelte.svelteApp.$set({ tag: this, state: this.plugin.state, temporaryState: this.plugin.temporaryState }) : t.position && this.loadModel());
     });
   }
@@ -354,29 +355,29 @@ class oa extends $ {
       var h;
       const p = (h = n.floorIndex) != null ? h : 0;
       if (!t.has(p)) {
-        const f = z(this.five, p);
-        f.isEmpty() || t.set(p, f);
+        const u = J(this.five, p);
+        u.isEmpty() || t.set(p, u);
       }
     });
-    const i = G(...this.position.map(T)), o = [], s = [];
+    const i = L(...this.position.map(T)), o = [], s = [];
     if (t.forEach((n, p) => {
       s.push({ floorIndex: p, box: n }), n.containsPoint(i) && o.push({ floorIndex: p, box: n });
     }), o.length === 1)
       return o[0].floorIndex;
     if (o.length > 1) {
       let n = 1 / 0, p = o[0].floorIndex;
-      return o.forEach(({ floorIndex: h, box: f }) => {
-        const m = new M.Vector3();
-        f.getCenter(m);
+      return o.forEach(({ floorIndex: h, box: u }) => {
+        const m = new V.Vector3();
+        u.getCenter(m);
         const g = i.distanceTo(m);
         g < n && (n = g, p = h);
       }), p;
     }
     if (s.length > 0) {
       let n = 1 / 0, p = s[0].floorIndex;
-      return s.forEach(({ floorIndex: h, box: f }) => {
-        const m = new M.Vector3();
-        f.getCenter(m);
+      return s.forEach(({ floorIndex: h, box: u }) => {
+        const m = new V.Vector3();
+        u.getCenter(m);
         const g = i.distanceTo(m);
         g < n && (n = g, p = h);
       }), p;
@@ -385,21 +386,21 @@ class oa extends $ {
   loadModel() {
     return x(this, null, function* () {
       var e, i, o, s, a, r;
-      if (yield R(this.five), this.computeRenderType() === "Mesh")
+      if (yield M(this.five), this.computeRenderType() === "Mesh")
         this.initialSculpt(), ((i = (e = this.data.mediaData) == null ? void 0 : e[0]) == null ? void 0 : i.type) === "Video" ? this.renderVideoPlane() : ((s = (o = this.data.mediaData) == null ? void 0 : o[0]) == null ? void 0 : s.type) === "Image" ? this.renderImagePlane() : this.renderEmptyPlane();
       else {
-        U(this.five);
+        q(this.five);
         const n = this.position.map(T);
         (r = (a = this.tag3DContentSvelte) == null ? void 0 : a.dispose) == null || r.call(a);
         const p = document.createElement("div");
         p.classList.add("tag-media-container");
-        const h = S({ mode: "front", cornerPoints: n, container: p }, this.config.tag3DConfig), f = this.computeRenderType() === "BehindDom" || h.mode === "behind" ? "behind" : "front", m = new B(E(S({}, h), { mode: f })), g = this.computeNormal();
-        m.position.add(g.clone().setLength(O.Z_FIGHTING_OFFSET)), this.plugin.group.add(m);
-        let u;
-        m.mode === "behind" && this.config.clickable !== !1 && (u = this.addObjectClickHandler(this, m, (I) => {
-          this.plugin.hooks.emit("click", { event: I, target: "TagContent", tag: this });
+        const h = S({ mode: "front", cornerPoints: n, container: p }, this.config.tag3DConfig), u = this.computeRenderType() === "BehindDom" || h.mode === "behind" ? "behind" : "front", m = new H(E(S({}, h), { mode: u })), g = this.computeNormal();
+        m.position.add(g.clone().setLength(A.Z_FIGHTING_OFFSET)), this.plugin.group.add(m);
+        let f;
+        m.mode === "behind" && this.config.clickable !== !1 && (f = this.addObjectClickHandler(this, m, (d) => {
+          this.plugin.hooks.emit("click", { event: d, target: "TagContent", tag: this });
         }));
-        const d = new W({
+        const b = new $({
           target: p,
           props: {
             tag: this,
@@ -411,7 +412,7 @@ class oa extends $ {
           }
         });
         this.tag3DContentSvelte = {
-          svelteApp: d,
+          svelteApp: b,
           domContainer: {
             css3DObject: m
           },
@@ -419,7 +420,7 @@ class oa extends $ {
           initialNormal: g,
           currentNormal: g,
           dispose: () => {
-            d.$destroy(), m.dispose(), u == null || u();
+            b.$destroy(), m.dispose(), f == null || f();
           }
         }, this.five.needsRender = !0;
       }
@@ -428,11 +429,11 @@ class oa extends $ {
   initialSculpt() {
     if (this.rectanglePlane)
       return;
-    const t = new j(this.five, void 0, {
+    const t = new R(this.five, void 0, {
       magnifier: null
     });
     t.clear(), t.group.removeFromParent();
-    const e = q(), i = new Z(
+    const e = Z(), i = new z(
       {
         id: e,
         type: "Rectangle",
@@ -467,7 +468,7 @@ class oa extends $ {
     var e, i;
     const t = (e = this.rectanglePlane) == null ? void 0 : e.rectangleMesh;
     if (t)
-      return (i = j.modules.object3DHelper.getObject3DHelper(t)) == null ? void 0 : i.helper;
+      return (i = R.modules.object3DHelper.getObject3DHelper(t)) == null ? void 0 : i.helper;
   }
   /**
    * 标签因为 visiblePanoIndex 等可见性规则被隐藏时，同时隐藏编辑辅助元素。
@@ -483,8 +484,20 @@ class oa extends $ {
     }
     this.rectanglePlane.visible = !0, t == null || t.show(), this.five.needsRender = !0;
   }
+  /**
+   * 自动播放使用真实观察点到屏幕角点的视线检测，不复用展示用的 horizontal 射线。
+   * 这样标签仍可按既有策略展示，但真实视线被楼板、墙体等挡住时不会自动播放或抢占音频焦点。
+   */
+  canAutoPlayByOcclusion() {
+    const { panoIndex: t } = this.five.getCurrentState();
+    return K({
+      currentVisible: this.currentVisible,
+      panoIndex: t,
+      computeVisibleByIntersect: (e, i) => this.computeVisibleByIntersect(e, i)
+    }).value;
+  }
   renderVideoPlane() {
-    var p, h, f, m, g;
+    var p, h, u, m, g;
     const t = this.data.mediaData[0];
     if (!t)
       return;
@@ -493,29 +506,29 @@ class oa extends $ {
       return;
     const i = (p = this.data.objectFit) != null ? p : "contain", o = this.currentVisible, s = (() => !!(this.mediaPlane && !o))(), a = (() => !!(!this.mediaPlane && o))(), r = (() => !!(this.mediaPlane && (this.mediaPlane.src !== e || this.mediaPlane.objectFit !== i)))();
     if ((s || r) && this.mediaPlane) {
-      const u = "videoInstance" in this.mediaPlane ? this.mediaPlane.videoInstance : void 0;
-      this.wasPlayingBeforeHidden = s && (u == null ? void 0 : u.paused) === !1, this.plugin.imagePlaneGroup.remove(this.mediaPlane), this.mediaPlane.dispose(), this.mediaPlane.removeFromParent(), this.mediaPlane = void 0;
+      const f = "videoInstance" in this.mediaPlane ? this.mediaPlane.videoInstance : void 0;
+      this.wasPlayingBeforeHidden = s && (f == null ? void 0 : f.paused) === !1, this.plugin.imagePlaneGroup.remove(this.mediaPlane), this.mediaPlane.dispose(), this.mediaPlane.removeFromParent(), this.mediaPlane = void 0;
     }
     const n = (() => !!(this.mediaPlane && this.mediaPlane.objectFit && this.mediaPlane.objectFit !== i))();
     if (a || r) {
-      let u = this.position.map(y);
-      this.rectanglePlane && (u = this.rectanglePlane.data.points.map(y));
-      const d = new L(e, u, {
+      let f = this.position.map(y);
+      this.rectanglePlane && (f = this.rectanglePlane.data.points.map(y));
+      const b = this.canAutoPlayByOcclusion(), d = new N(e, f, {
         mediaManager: this.mediaManager,
         videoCoverSrc: t.videoCoverUrl,
         playButton: this.data.playIcon,
-        paused: !((h = this.data.autoplayConfig) != null && h.autoplayVideo),
+        paused: !((h = this.data.autoplayConfig) != null && h.autoplayVideo && b),
         objectFit: this.data.objectFit,
-        videoTextureMap: J,
-        ImageTextureMap: K,
+        videoTextureMap: Q,
+        ImageTextureMap: X,
         domEvents: this.plugin.domEvents,
         opacity: this.opacity,
         // 开启重播时按标签独占 video 元素，避免同 src 的多块屏幕互相干扰进度
-        cacheScope: (f = this.data.autoplayConfig) != null && f.replayWhenRevisible ? String(this.id) : void 0
+        cacheScope: (u = this.data.autoplayConfig) != null && u.replayWhenRevisible ? String(this.id) : void 0
       });
       d.onDispose(this.bindMediaManager((P) => d.setMediaManager(P))), this.plugin.domEvents.addAutoBindEventListener(d, "click", (P) => {
-        var v, F;
-        !((v = d.videoInstance) != null && v.paused) && ((F = d.videoInstance) == null ? void 0 : F.muted) === !1 && this.plugin.hooks.emit("playStateChange", {
+        var v, C;
+        !((v = d.videoInstance) != null && v.paused) && ((C = d.videoInstance) == null ? void 0 : C.muted) === !1 && this.plugin.hooks.emit("playStateChange", {
           event: P,
           state: "playing",
           tag: this,
@@ -530,17 +543,17 @@ class oa extends $ {
           this.plugin.hooks.emit("playStateChange", { event: v, state: "paused", tag: this, mediaInstance: d.videoInstance });
         });
       };
-      const I = (P) => (this.five.on("renderFrame", P), () => this.five.off("renderFrame", P));
-      d.initialRenderHooks(I), this.mediaPlane = d, this.play = (P = !1) => d.play(!1, P), this.pause = () => d.pause(), this.plugin.imagePlaneGroup.add(this.mediaPlane), a && this.wasPlayingBeforeHidden && ((m = this.data.autoplayConfig) != null && m.replayWhenRevisible) && (this.wasPlayingBeforeHidden = !1, d.replayFromStart());
+      const j = (P) => (this.five.on("renderFrame", P), () => this.five.off("renderFrame", P));
+      d.initialRenderHooks(j), this.mediaPlane = d, this.play = (P = !1) => d.play(!1, P), this.pause = () => d.pause(), this.plugin.imagePlaneGroup.add(this.mediaPlane), a && this.wasPlayingBeforeHidden && ((m = this.data.autoplayConfig) != null && m.replayWhenRevisible) && b && (this.wasPlayingBeforeHidden = !1, d.replayFromStart());
     }
     if (n) {
-      const u = this.rectanglePlane.data.points.map(y);
-      (g = this.mediaPlane) == null || g.changePointsOrParams({ cornerPoints: u, params: { objectFit: i } });
+      const f = this.rectanglePlane.data.points.map(y);
+      (g = this.mediaPlane) == null || g.changePointsOrParams({ cornerPoints: f, params: { objectFit: i } });
     }
     this.five.needsRender = !0;
   }
   renderImagePlane() {
-    var h, f;
+    var h, u;
     const t = this.data.mediaData[0], e = (h = this.data.objectFit) != null ? h : "contain";
     if (!t)
       return;
@@ -549,7 +562,7 @@ class oa extends $ {
       return;
     let o = this.position.map(y);
     const s = this.currentVisible, a = (() => !!(this.mediaPlane && !s))(), r = (() => !!(!this.mediaPlane && s))(), n = (() => !!(this.mediaPlane && this.mediaPlane.src !== i))(), p = (() => !!(this.mediaPlane && this.mediaPlane.objectFit && this.mediaPlane.objectFit !== e))();
-    if ((a || n) && this.mediaPlane && (this.plugin.imagePlaneGroup.remove(this.mediaPlane), this.mediaPlane.dispose(), this.mediaPlane.removeFromParent(), this.mediaPlane = void 0), (r || n) && (this.rectanglePlane && (o = this.rectanglePlane.data.points.map(y)), this.mediaPlane = new N(i, o, { objectFit: this.data.objectFit, opacity: this.opacity }), this.getConfig().clickable !== !1 && this.plugin.domEvents.addAutoBindEventListener(
+    if ((a || n) && this.mediaPlane && (this.plugin.imagePlaneGroup.remove(this.mediaPlane), this.mediaPlane.dispose(), this.mediaPlane.removeFromParent(), this.mediaPlane = void 0), (r || n) && (this.rectanglePlane && (o = this.rectanglePlane.data.points.map(y)), this.mediaPlane = new W(i, o, { objectFit: this.data.objectFit, opacity: this.opacity }), this.getConfig().clickable !== !1 && this.plugin.domEvents.addAutoBindEventListener(
       this.mediaPlane,
       "click",
       (m) => {
@@ -558,7 +571,7 @@ class oa extends $ {
       { noEmitWhenHide: !0 }
     ), this.plugin.imagePlaneGroup.add(this.mediaPlane)), p) {
       const m = this.rectanglePlane.data.points.map(y);
-      (f = this.mediaPlane) == null || f.changePointsOrParams({ cornerPoints: m, params: { objectFit: e } });
+      (u = this.mediaPlane) == null || u.changePointsOrParams({ cornerPoints: m, params: { objectFit: e } });
     }
     this.five.needsRender = !0;
   }
@@ -566,9 +579,9 @@ class oa extends $ {
     this.mediaPlane && (this.plugin.imagePlaneGroup.remove(this.mediaPlane), this.mediaPlane.dispose(), this.mediaPlane.removeFromParent(), this.mediaPlane = void 0);
   }
   computeNormal() {
-    return A(this.position);
+    return G(this.position);
   }
 }
 export {
-  oa as PlaneTag
+  na as PlaneTag
 };

package/libs/PanoTagPlugin/controller/index.js

@@ -319,6 +319,7 @@ import "../../Sculpt/Meshes/Box.js";
 import "../../shared-utils/forReverseEach.js";
 import "../../Sculpt/Objects/Line/index.js";
 import "../../shared-utils/five/getFloorMesh.js";
+import "../utils/tag/canAutoPlayByOcclusion.js";
 import "../utils/sculptDataToBoxPosition.js";
 import "./Tag/MaskTag.shaders.js";
 import "../Components/TagItem.js";
@@ -337,8 +338,8 @@ import "../Components/Common/TagPopover/TagPopoverToolBar.js";
 import "../Components/Common/TagPopover/ArrowRightIcon.js";
 import "../Components/Common/TagPopover/ShareIcon.js";
 import "../utils/popoverContainer.js";
-const I = "Dnalogel-PanoTagPlugin", $s = (d) => `${I}--${d}`;
-class js extends $ {
+const I = "Dnalogel-PanoTagPlugin", js = (d) => `${I}--${d}`;
+class Qs extends $ {
   constructor(e, t) {
     super(e);
     l(this, "mediaManager");
@@ -920,7 +921,7 @@ class js extends $ {
   }
 }
 export {
-  js as PanoTagPluginController,
-  js as default,
-  $s as pluginFlag
+  Qs as PanoTagPluginController,
+  Qs as default,
+  js as pluginFlag
 };

package/libs/PanoTagPlugin/index.js

@@ -1,7 +1,7 @@
 import r from "./controller/index.js";
-import { pluginFlag as Vi } from "./controller/index.js";
-import { defaultGlobalConfig as Xi } from "./typings/tag/TagConfig.js";
-import { ContentType as Zi, DimensionType as _i, PointType as $i } from "./Archive/deprecated.js";
+import { pluginFlag as Wi } from "./controller/index.js";
+import { defaultGlobalConfig as Yi } from "./typings/tag/TagConfig.js";
+import { ContentType as _i, DimensionType as $i, PointType as om } from "./Archive/deprecated.js";
 import "three";
 import "../vendor/object-assign-deep/objectAssignDeep.js";
 import "../shared-utils/positionToVector3.js";
@@ -288,6 +288,7 @@ import "../Sculpt/Meshes/Box.js";
 import "../shared-utils/forReverseEach.js";
 import "../Sculpt/Objects/Line/index.js";
 import "../shared-utils/five/getFloorMesh.js";
+import "./utils/tag/canAutoPlayByOcclusion.js";
 import "./controller/Tag/BoxTag.js";
 import "./utils/sculptDataToBoxPosition.js";
 import "./controller/Tag/PolygonTag.js";
@@ -311,14 +312,14 @@ import "./Components/Common/TagPopover/ArrowRightIcon.js";
 import "./Components/Common/TagPopover/ShareIcon.js";
 import "./utils/popoverContainer.js";
 import "../shared-utils/animationFrame/BetterTween.js";
-const Ri = (o, t) => new r(o, t);
+const Si = (o, t) => new r(o, t);
 export {
-  Zi as ContentType,
-  _i as DimensionType,
-  Ri as PanoTagPlugin,
+  _i as ContentType,
+  $i as DimensionType,
+  Si as PanoTagPlugin,
   r as PanoTagPluginController,
-  $i as PointType,
-  Ri as default,
-  Xi as defaultGlobalConfig,
-  Vi as pluginFlag
+  om as PointType,
+  Si as default,
+  Yi as defaultGlobalConfig,
+  Wi as pluginFlag
 };