@realsee/dnalogel 3.81.10-alpha.2 → 3.81.10-alpha.4

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

@@ -11,7 +11,7 @@ var S = (a, p, t) => p in a ? P(a, p, { enumerable: !0, configurable: !0, writab
 };
 var f = (a, p, t) => (S(a, typeof p != "symbol" ? p + "" : p, t), t);
 var g = (a, p, t) => new Promise((i, o) => {
-  var e = (n) => {
+  var r = (n) => {
     try {
       l(t.next(n));
     } catch (h) {
@@ -23,11 +23,11 @@ var g = (a, p, t) => new Promise((i, o) => {
     } catch (h) {
       o(h);
     }
-  }, l = (n) => n.done ? i(n.value) : Promise.resolve(n.value).then(e, s);
+  }, l = (n) => n.done ? i(n.value) : Promise.resolve(n.value).then(r, s);
   l((t = t.apply(a, p)).next());
 });
 import { BaseTag as z } from "./BaseTag.js";
-import * as r from "three";
+import * as e from "three";
 import { Sculpt as T } from "../../../Sculpt/index.js";
 import { Box as D } from "../../../Sculpt/Objects/Box/index.js";
 import "../../../shared-utils/tag.js";
@@ -76,6 +76,7 @@ import "../../../shared-utils/safeObj.js";
 import "../../utils/Cache.js";
 import "../../../shared-utils/three/temp.js";
 import "../../../shared-utils/three/core/Raycaster.js";
+import "../../utils/tag/getRaycasterStartPosition.js";
 import "../../../shared-utils/promise/withResolvers.js";
 import "../../../shared-utils/five/vector3ToScreen.js";
 import "../../../shared-utils/dom/resizeObserver.js";
@@ -213,7 +214,7 @@ import "../../../shared-utils/forReverseEach.js";
 import "../../../Sculpt/Objects/Line/index.js";
 import "../../../Sculpt/Editors/BoxMeshEditor.js";
 import "../../../Sculpt/Meshes/Box.js";
-class ae extends z {
+class mr extends z {
   constructor(t, i) {
     super(t, i);
     f(this, "tagStyle");
@@ -226,11 +227,11 @@ class ae extends z {
    * 获取 Box 样式配置（合并用户配置和默认值）
    */
   getBoxStyle() {
-    var i, o, e, s;
+    var i, o, r, s;
     const t = ((i = this.tagStyle) == null ? void 0 : i.boxOrPolygon) || {};
     return {
       color: (o = t.color) != null ? o : 16777215,
-      opacity: (e = t.opacity) != null ? e : 0.4,
+      opacity: (r = t.opacity) != null ? r : 0.4,
       lineColor: (s = t.color) != null ? s : 16777215,
       lineWidth: 1
     };
@@ -263,7 +264,7 @@ class ae extends z {
     const t = this.position;
     if (!(t != null && t.start) || !(t != null && t.end))
       return [0, 0, 0];
-    const i = t.end.map((h) => Number(h)), o = t.start.map((h) => Number(h)), e = i[0] / 2 + o[0] / 2, s = i[1] / 2 + o[1] / 2, l = i[2] / 2 + o[2] / 2, n = new r.Vector3(e, s, l);
+    const i = t.end.map((h) => Number(h)), o = t.start.map((h) => Number(h)), r = i[0] / 2 + o[0] / 2, s = i[1] / 2 + o[1] / 2, l = i[2] / 2 + o[2] / 2, n = new e.Vector3(r, s, l);
     return x(n, this.workUtil.transform).toArray();
   }
   /**
@@ -271,11 +272,11 @@ class ae extends z {
    */
   getCorners() {
     if (this.boxShape) {
-      const t = this.boxShape.data, i = t.points.map((s) => u(s)), o = new r.Vector3().subVectors(
+      const t = this.boxShape.data, i = t.points.map((s) => u(s)), o = new e.Vector3().subVectors(
         u(t.heightPoint),
         i[0]
-      ), e = i.map((s) => s.clone().add(o));
-      return [...i, ...e];
+      ), r = i.map((s) => s.clone().add(o));
+      return [...i, ...r];
     }
     return [];
   }
@@ -285,8 +286,8 @@ class ae extends z {
   computeNormal() {
     const t = this.position;
     if (!t.rotation)
-      return new r.Vector3(0, 1, 0);
-    const i = new r.Euler().fromArray(t.rotation), o = new r.Vector3(0, 1, 0);
+      return new e.Vector3(0, 1, 0);
+    const i = new e.Euler().fromArray(t.rotation), o = new e.Vector3(0, 1, 0);
     return o.applyEuler(i), o;
   }
   /**
@@ -302,13 +303,13 @@ class ae extends z {
       magnifier: null
     });
     i.clear(), i.group.removeFromParent();
-    const o = this.boxPositionToSculptData(t), e = this.getBoxStyle(), s = new D(
+    const o = this.boxPositionToSculptData(t), r = this.getBoxStyle(), s = new D(
       {
         id: M(),
         type: "Box",
         points: o.bottomPoints,
         heightPoint: o.heightPoint,
-        style: e
+        style: r
       },
       {
         defaultAction: !1,
@@ -389,19 +390,19 @@ class ae extends z {
   syncBoxPositionFromSculpt() {
     if (!this.boxShape)
       return;
-    const t = this.boxShape.data, i = t.points.map((s) => u(s)), o = u(t.heightPoint), e = U(i, o);
-    this.position = e, this.hooks.emit("positionChanged", e);
+    const t = this.boxShape.data, i = t.points.map((s) => u(s)), o = u(t.heightPoint), r = U(i, o);
+    this.position = r, this.hooks.emit("positionChanged", r);
   }
   /**
    * 将 BoxPosition 转换为 Sculpt 需要的数据格式
    */
   boxPositionToSculptData(t) {
-    const i = u(t.start), o = u(t.end), e = new r.Euler().fromArray(t.rotation), s = new r.Vector3((i.x + o.x) / 2, (i.y + o.y) / 2, (i.z + o.z) / 2), l = new r.Vector3(Math.abs(o.x - i.x) / 2, Math.abs(o.y - i.y) / 2, Math.abs(o.z - i.z) / 2), n = new r.Matrix4().makeRotationFromEuler(e), h = [
-      new r.Vector3(-0.5, -0.5, -0.5),
-      new r.Vector3(0.5, -0.5, -0.5),
-      new r.Vector3(0.5, -0.5, 0.5),
-      new r.Vector3(-0.5, -0.5, 0.5)
-    ], d = new r.Vector3(-0.5, 0.5, -0.5), c = l.clone().multiplyScalar(2), m = this.workUtil.transform, v = h.map((V) => {
+    const i = u(t.start), o = u(t.end), r = new e.Euler().fromArray(t.rotation), s = new e.Vector3((i.x + o.x) / 2, (i.y + o.y) / 2, (i.z + o.z) / 2), l = new e.Vector3(Math.abs(o.x - i.x) / 2, Math.abs(o.y - i.y) / 2, Math.abs(o.z - i.z) / 2), n = new e.Matrix4().makeRotationFromEuler(r), h = [
+      new e.Vector3(-0.5, -0.5, -0.5),
+      new e.Vector3(0.5, -0.5, -0.5),
+      new e.Vector3(0.5, -0.5, 0.5),
+      new e.Vector3(-0.5, -0.5, 0.5)
+    ], d = new e.Vector3(-0.5, 0.5, -0.5), c = l.clone().multiplyScalar(2), m = this.workUtil.transform, v = h.map((V) => {
       const C = V.clone().multiply(c).applyMatrix4(n).add(s);
       return x(C, m);
     }), w = d.clone().multiply(c).applyMatrix4(n).add(s), k = x(w, m);
@@ -459,16 +460,16 @@ class ae extends z {
       this.screenPosition = null, this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
       return;
     }
-    const o = new r.Vector3().fromArray(i.start), e = new r.Vector3().fromArray(i.end), s = new r.Euler().fromArray(i.rotation), l = [
-      new r.Vector3(o.x, o.y, o.z),
-      new r.Vector3(e.x, o.y, o.z),
-      new r.Vector3(o.x, e.y, o.z),
-      new r.Vector3(e.x, e.y, o.z),
-      new r.Vector3(o.x, o.y, e.z),
-      new r.Vector3(e.x, o.y, e.z),
-      new r.Vector3(o.x, e.y, e.z),
-      new r.Vector3(e.x, e.y, e.z)
-    ], n = new r.Vector3().addVectors(o, e).multiplyScalar(0.5), h = this.workUtil.transform;
+    const o = new e.Vector3().fromArray(i.start), r = new e.Vector3().fromArray(i.end), s = new e.Euler().fromArray(i.rotation), l = [
+      new e.Vector3(o.x, o.y, o.z),
+      new e.Vector3(r.x, o.y, o.z),
+      new e.Vector3(o.x, r.y, o.z),
+      new e.Vector3(r.x, r.y, o.z),
+      new e.Vector3(o.x, o.y, r.z),
+      new e.Vector3(r.x, o.y, r.z),
+      new e.Vector3(o.x, r.y, r.z),
+      new e.Vector3(r.x, r.y, r.z)
+    ], n = new e.Vector3().addVectors(o, r).multiplyScalar(0.5), h = this.workUtil.transform;
     l.forEach((m) => {
       m.sub(n).applyEuler(s).add(n), m.copy(x(m, h));
     });
@@ -480,7 +481,7 @@ class ae extends z {
     if (c.x < -1 || c.x > 1 || c.y < -1 || c.y > 1 || c.z < 0 || c.z > 1)
       this.screenPosition = null;
     else if (this.five.renderer) {
-      const m = this.five.renderer.getSize(new r.Vector2());
+      const m = this.five.renderer.getSize(new e.Vector2());
       this.screenPosition = {
         leftPx: (c.x + 1) / 2 * m.x,
         topPx: (-c.y + 1) / 2 * m.y,
@@ -492,8 +493,8 @@ class ae extends z {
   get centerPosition() {
     const t = A(this.position, this.workUtil.transform), i = F(t, this.matrix);
     let o = i[0];
-    return i.forEach((e) => {
-      e.x > o.x && (o = e);
+    return i.forEach((r) => {
+      r.x > o.x && (o = r);
     }), o;
   }
   /**
@@ -514,5 +515,5 @@ class ae extends z {
   }
 }
 export {
-  ae as BoxTag
+  mr as BoxTag
 };

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

@@ -115,6 +115,7 @@ import "../../../shared-utils/url/getUrl.js";
 import "../../../shared-utils/five/getFloorIndex.js";
 import "../../../shared-utils/safeObj.js";
 import "../../utils/Cache.js";
+import "../../utils/tag/getRaycasterStartPosition.js";
 import "../../../shared-utils/promise/withResolvers.js";
 function w(m) {
   if (Array.isArray(m))

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

@@ -203,8 +203,9 @@ import "../../../shared-utils/url/getUrl.js";
 import "../../../shared-utils/five/getFloorIndex.js";
 import "../../../shared-utils/safeObj.js";
 import "../../utils/Cache.js";
+import "../../utils/tag/getRaycasterStartPosition.js";
 import "../../../shared-utils/promise/withResolvers.js";
-class rr extends R {
+class mr extends R {
   constructor(t, e) {
     super(t, e);
     v(this, "loading", !1);
@@ -298,5 +299,5 @@ class rr extends R {
   }
 }
 export {
-  rr as ModelTag
+  mr as ModelTag
 };

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

@@ -9,6 +9,11 @@ export declare class PlaneTag<C extends TagContentType = TagContentType> extends
     private _floorIndex?;
     private _floorIndexDirty;
     private _opacity?;
+    /**
+     * 因不可见被销毁前是否处于播放态。
+     * PlaneTag 实例在不可见期间存活（只有 mediaPlane 被销毁），因此状态记在这里。
+     */
+    private wasPlayingBeforeHidden;
     constructor(plugin: PanoTagPluginController, tagData: TagData);
     /** 获取透明度 */
     get opacity(): number;