@realsee/dnalogel 3.71.5 → 3.71.7-alpha.0

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

@@ -1,16 +1,16 @@
-var I = Object.defineProperty, F = Object.defineProperties;
-var T = Object.getOwnPropertyDescriptors;
-var y = Object.getOwnPropertySymbols;
-var j = Object.prototype.hasOwnProperty, R = Object.prototype.propertyIsEnumerable;
-var b = (l, i, t) => i in l ? I(l, i, { enumerable: !0, configurable: !0, writable: !0, value: t }) : l[i] = t, v = (l, i) => {
+var F = Object.defineProperty, T = Object.defineProperties;
+var j = Object.getOwnPropertyDescriptors;
+var b = Object.getOwnPropertySymbols;
+var R = Object.prototype.hasOwnProperty, k = Object.prototype.propertyIsEnumerable;
+var S = (l, i, t) => i in l ? F(l, i, { enumerable: !0, configurable: !0, writable: !0, value: t }) : l[i] = t, v = (l, i) => {
   for (var t in i || (i = {}))
-    j.call(i, t) && b(l, t, i[t]);
-  if (y)
-    for (var t of y(i))
-      R.call(i, t) && b(l, t, i[t]);
+    R.call(i, t) && S(l, t, i[t]);
+  if (b)
+    for (var t of b(i))
+      k.call(i, t) && S(l, t, i[t]);
   return l;
-}, S = (l, i) => F(l, T(i));
-var D = (l, i, t) => new Promise((e, o) => {
+}, D = (l, i) => T(l, j(i));
+var C = (l, i, t) => new Promise((e, o) => {
   var n = (s) => {
     try {
       r(t.next(s));
@@ -26,19 +26,19 @@ var D = (l, i, t) => new Promise((e, o) => {
   }, r = (s) => s.done ? e(s.value) : Promise.resolve(s.value).then(n, m);
   r((t = t.apply(l, i)).next());
 });
-import { CONST as k } from "../../../shared-utils/constants.js";
-import { CSS3DObjectPlus as E } from "../../../shared-utils/CSS3DRender/CSS3DObject.js";
-import { anyPositionToVector3 as V, arrayPositionToVector3 as u } from "../../../shared-utils/positionToVector3.js";
+import { CONST as E } from "../../../shared-utils/constants.js";
+import { CSS3DObjectPlus as V } from "../../../shared-utils/CSS3DRender/CSS3DObject.js";
+import { anyPositionToVector3 as M, arrayPositionToVector3 as u } from "../../../shared-utils/positionToVector3.js";
 import "three";
-import { planeNormal as M } from "../../utils/planeNormal.js";
-import { VideoPlane as O, ImagePlane as w } from "../../utils/model/mediaPlane.js";
-import G from "../../Components/Tag/index.js";
-import { BaseTag as L } from "./BaseTag.js";
+import { planeNormal as O } from "../../utils/planeNormal.js";
+import { VideoPlane as w, ImagePlane as G } from "../../utils/model/mediaPlane.js";
+import L from "../../Components/Tag/index.js";
+import { BaseTag as A } 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 A } from "../../../shared-utils/CSS3DRender/index.js";
+import { initialCSS3DRender as N } 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";
@@ -46,11 +46,11 @@ 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 C } from "../../../shared-utils/five/fiveModelLoad.js";
-import { uuid as N } from "../../../shared-utils/uuid.js";
+import { waitFiveModelLoaded as I } from "../../../shared-utils/five/fiveModelLoad.js";
+import { uuid as B } from "../../../shared-utils/uuid.js";
 import "../../../shared-utils/five/FivePuppet.js";
-import { Sculpt as B } from "../../../Sculpt/index.js";
-import { Rectangle as x } from "../../../Sculpt/Objects/Rectangle/index.js";
+import { Sculpt as x } from "../../../Sculpt/index.js";
+import { Rectangle as H } from "../../../Sculpt/Objects/Rectangle/index.js";
 import "../../../shared-utils/even.js";
 import "../../../shared-utils/CSS3DRender/OpacityMesh.js";
 import "../../../shared-utils/three/centerPoint.js";
@@ -296,8 +296,8 @@ import "../../../shared-utils/forReverseEach.js";
 import "../../../Sculpt/Objects/Line/index.js";
 import "../../../Sculpt/Editors/RectangleMeshEditor.js";
 import "../../../Sculpt/utils/sortPositionsByCameraPosition.js";
-const H = /* @__PURE__ */ new Map(), $ = /* @__PURE__ */ new Map();
-class qr extends L {
+const $ = /* @__PURE__ */ new Map(), U = /* @__PURE__ */ new Map();
+class Wr extends A {
   constructor(i, t) {
     super(i, t), this.state.unfolded = !0, this.loadModel();
   }
@@ -306,7 +306,7 @@ class qr extends L {
     this.computeRenderType() === "Mesh" ? (this.initialSculpt(), ((e = (t = this.data.mediaData) == null ? void 0 : t[0]) == null ? void 0 : e.type) === "Video" ? this.renderVideoPlane() : ((n = (o = this.data.mediaData) == null ? void 0 : o[0]) == null ? void 0 : n.type) === "Image" ? this.renderImagePlane() : this.renderEmptyPlane()) : ((m = this.tag3DContentSvelte) == null || m.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));
   }
   set(i, t = !0) {
-    super.set(i, t), C(this.five).then(() => {
+    super.set(i, t), I(this.five).then(() => {
       this.tag3DContentSvelte && (i.data ? this.tag3DContentSvelte.svelteApp.$set({ tag: this, state: this.plugin.state, temporaryState: this.plugin.temporaryState }) : i.position && this.loadModel());
     });
   }
@@ -315,23 +315,23 @@ class qr extends L {
     super.setData(...i), this.computeRenderType() === "Mesh" ? ((o = (e = this.data.mediaData) == null ? void 0 : e[0]) == null ? void 0 : o.type) === "Video" ? this.renderVideoPlane() : ((m = (n = this.data.mediaData) == null ? void 0 : n[0]) == null ? void 0 : m.type) === "Image" ? this.renderImagePlane() : this.renderEmptyPlane() : (r = this.tag3DContentSvelte) == null || r.svelteApp.$set({ tag: this });
   }
   loadModel() {
-    return D(this, null, function* () {
+    return C(this, null, function* () {
       var t, e, o, n, m, r;
-      if (yield C(this.five), this.computeRenderType() === "Mesh")
+      if (yield I(this.five), this.computeRenderType() === "Mesh")
         this.initialSculpt(), ((e = (t = this.data.mediaData) == null ? void 0 : t[0]) == null ? void 0 : e.type) === "Video" ? this.renderVideoPlane() : ((n = (o = this.data.mediaData) == null ? void 0 : o[0]) == null ? void 0 : n.type) === "Image" ? this.renderImagePlane() : this.renderEmptyPlane();
       else {
-        A(this.five);
-        const s = this.position.map(V);
+        N(this.five);
+        const s = this.position.map(M);
         (r = (m = this.tag3DContentSvelte) == null ? void 0 : m.dispose) == null || r.call(m);
         const d = document.createElement("div");
         d.classList.add("tag-media-container");
-        const g = v({ mode: "front", cornerPoints: s, container: d }, this.config.tag3DConfig), P = this.computeRenderType() === "BehindDom" || g.mode === "behind" ? "behind" : "front", p = new E(S(v({}, g), { mode: P })), a = this.computeNormal();
-        p.position.add(a.clone().setLength(k.Z_FIGHTING_OFFSET)), this.plugin.group.add(p);
+        const g = v({ mode: "front", cornerPoints: s, container: d }, this.config.tag3DConfig), P = this.computeRenderType() === "BehindDom" || g.mode === "behind" ? "behind" : "front", p = new V(D(v({}, g), { mode: P })), a = this.computeNormal();
+        p.position.add(a.clone().setLength(E.Z_FIGHTING_OFFSET)), this.plugin.group.add(p);
         let f;
         p.mode === "behind" && this.config.clickable !== !1 && (f = this.addObjectClickHandler(this, p, (c) => {
           this.plugin.hooks.emit("click", { event: c, target: "TagContent", tag: this });
         }));
-        const h = new G({
+        const h = new L({
           target: d,
           props: {
             tag: this,
@@ -360,11 +360,11 @@ class qr extends L {
   initialSculpt() {
     if (this.rectanglePlane)
       return;
-    const i = new B(this.five, void 0, {
+    const i = new x(this.five, void 0, {
       magnifier: null
     });
     i.clear(), i.group.removeFromParent();
-    const t = N(), e = new x(
+    const t = B(), e = new H(
       {
         id: t,
         type: "Rectangle",
@@ -409,18 +409,18 @@ class qr extends L {
     if (m || r) {
       let p = this.position.map(u);
       this.rectanglePlane && (p = this.rectanglePlane.data.points.map(u));
-      const a = new O(t, p, {
+      const a = new w(t, p, {
         videoCoverSrc: i.videoCoverUrl,
         playButton: this.data.playIcon,
         paused: !((g = this.data.autoplayConfig) != null && g.autoplayVideo),
         objectFit: this.data.objectFit,
-        videoTextureMap: H,
-        ImageTextureMap: $,
+        videoTextureMap: $,
+        ImageTextureMap: U,
         domEvents: this.plugin.domEvents
       });
       this.plugin.domEvents.addAutoBindEventListener(a, "click", (h) => {
-        var c;
-        !((c = a.videoInstance) != null && c.paused) && a.videoInstance.muted === !1 && this.plugin.hooks.emit("playStateChange", {
+        var c, y;
+        !((c = a.videoInstance) != null && c.paused) && ((y = a.videoInstance) == null ? void 0 : y.muted) === !1 && this.plugin.hooks.emit("playStateChange", {
           event: h,
           state: "playing",
           tag: this,
@@ -454,7 +454,7 @@ class qr extends L {
       return;
     let o = this.position.map(u);
     const n = this.currentVisible, m = (() => !!(this.mediaPlane && !n))(), r = (() => !!(!this.mediaPlane && n))(), s = (() => !!(this.mediaPlane && this.mediaPlane.src !== e))(), d = (() => !!(this.mediaPlane && this.mediaPlane.objectFit && this.mediaPlane.objectFit !== t))();
-    if ((m || s) && this.mediaPlane && (this.plugin.imagePlaneGroup.remove(this.mediaPlane), this.mediaPlane.dispose(), this.mediaPlane.removeFromParent(), this.mediaPlane = void 0), (r || s) && (this.rectanglePlane && (o = this.rectanglePlane.data.points.map(u)), this.mediaPlane = new w(e, o, { objectFit: this.data.objectFit }), this.getConfig().clickable !== !1 && this.plugin.domEvents.addAutoBindEventListener(
+    if ((m || s) && this.mediaPlane && (this.plugin.imagePlaneGroup.remove(this.mediaPlane), this.mediaPlane.dispose(), this.mediaPlane.removeFromParent(), this.mediaPlane = void 0), (r || s) && (this.rectanglePlane && (o = this.rectanglePlane.data.points.map(u)), this.mediaPlane = new G(e, o, { objectFit: this.data.objectFit }), this.getConfig().clickable !== !1 && this.plugin.domEvents.addAutoBindEventListener(
       this.mediaPlane,
       "click",
       (p) => {
@@ -471,9 +471,9 @@ class qr extends L {
     this.mediaPlane && (this.plugin.imagePlaneGroup.remove(this.mediaPlane), this.mediaPlane.dispose(), this.mediaPlane.removeFromParent(), this.mediaPlane = void 0);
   }
   computeNormal() {
-    return M(this.position);
+    return O(this.position);
   }
 }
 export {
-  qr as PlaneTag
+  Wr as PlaneTag
 };

package/libs/PanoTagPlugin/controller/Tag/PointTag.d.ts

@@ -7,7 +7,11 @@ export type PointTagInterface<C extends TagContentType = TagContentType> = TagIn
 export declare class PointTag<C extends TagContentType = TagContentType> extends BaseTag<C, '2DPoint' | '3DPoint'> {
     private __Object__;
     private requestIdleCallbackId?;
+    private _hiddenByOverlap;
     constructor(plugin: PanoTagPluginController, tagData: TagData);
+    get visible(): boolean;
+    get hiddenByOverlap(): boolean;
+    set hiddenByOverlap(value: boolean);
     /**
      * @description 展开自己，收起其他标签
      */

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

@@ -1,8 +1,9 @@
-var h = Object.defineProperty;
-var c = (s, o, t) => o in s ? h(s, o, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[o] = t;
-var p = (s, o, t) => (c(s, typeof o != "symbol" ? o + "" : o, t), t);
+var f = Object.defineProperty;
+var c = (s, o, t) => o in s ? f(s, o, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[o] = t;
+var n = (s, o, t) => (c(s, typeof o != "symbol" ? o + "" : o, t), t);
 import { BaseTag as g } from "./BaseTag.js";
 import * as l from "three";
+import { getFOVFromVal as v } from "../../../shared-utils/five/fovTransform.js";
 import "../../../shared-utils/Subscribe.js";
 import "../../utils/tag/calculateTagConfig.js";
 import "../../../vendor/object-assign-deep/objectAssignDeep.js";
@@ -87,12 +88,23 @@ import "../../../shared-utils/five/getFloorIndex.js";
 import "../../../shared-utils/safeObj.js";
 import "../../utils/Cache.js";
 import "../../../shared-utils/promise/withResolvers.js";
-const v = new l.Vector2();
-class Kt extends g {
+const y = new l.Vector2();
+class Xt extends g {
   constructor(t, i) {
     super(t, i);
-    p(this, "__Object__");
-    p(this, "requestIdleCallbackId");
+    n(this, "__Object__");
+    n(this, "requestIdleCallbackId");
+    n(this, "_hiddenByOverlap", !1);
+  }
+  get visible() {
+    var t;
+    return ((t = this.temporaryState) == null ? void 0 : t.visible) !== !1 && this.state.visible !== !1 && this.enabled !== !1 && this.hiddenByOverlap !== !0;
+  }
+  get hiddenByOverlap() {
+    return this.five.state.fov < v(4) ? !1 : this._hiddenByOverlap;
+  }
+  set hiddenByOverlap(t) {
+    this._hiddenByOverlap = t;
   }
   /**
    * @description 展开自己，收起其他标签
@@ -101,7 +113,7 @@ class Kt extends g {
     if (this.isPopoverConfigEnabled())
       return;
     const t = this.can("fold"), i = this.can("unfold");
-    t && i && (this.state.unfolded = !this.state.unfolded, this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }), this.state.unfolded && this.plugin.tags.forEach((r) => {
+    t && i && (this.state.unfolded = !this.state.unfolded, this.manuallyOperated = !0, this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }), this.state.unfolded && this.plugin.tags.forEach((r) => {
       r.id !== this.id && r.fold();
     }));
   }
@@ -148,18 +160,18 @@ class Kt extends g {
       });
     }, 1e3)) : e.timeoutId && (clearTimeout(e.timeoutId), e.inAnimation = !1, e.timeoutId = void 0), !r && !e.inAnimation)
       return;
-    const n = this.computeTagProject();
-    if (n && this.five.renderer) {
-      const m = (() => {
+    const p = this.computeTagProject();
+    if (p && this.five.renderer) {
+      const d = (() => {
         if (!this.currentConfig.simulate3D)
           return 1;
-        const u = 2 * Math.tan(0.5 * this.five.camera.fov / 180 * Math.PI), f = this.getDistance(void 0, 1);
-        return Math.max(Math.min(1 - u * f / 40, 1), 0.7);
-      })(), d = this.five.renderer.getSize(v);
+        const h = 2 * Math.tan(0.5 * this.five.camera.fov / 180 * Math.PI), u = this.getDistance(void 0, 1);
+        return Math.max(Math.min(1 - h * u / 40, 1), 0.7);
+      })(), m = this.five.renderer.getSize(y);
       this.screenPosition = {
-        leftPx: (n.x + 1) / 2 * d.x,
-        topPx: (-n.y + 1) / 2 * d.y,
-        scale: m
+        leftPx: (p.x + 1) / 2 * m.x,
+        topPx: (-p.y + 1) / 2 * m.y,
+        scale: d
       };
     } else
       this.screenPosition = null;
@@ -185,5 +197,5 @@ class Kt extends g {
   }
 }
 export {
-  Kt as PointTag
+  Xt as PointTag
 };