@realsee/dnalogel 3.71.8-dev.1 → 3.72.0-alpha.2

package/libs/PanoTagPlugin/utils/model/mediaPlane.js

@@ -1,7 +1,7 @@
-var _ = Object.defineProperty;
-var G = (M, v, e) => v in M ? _(M, v, { enumerable: !0, configurable: !0, writable: !0, value: e }) : M[v] = e;
-var r = (M, v, e) => (G(M, typeof v != "symbol" ? v + "" : v, e), e);
-var d = (M, v, e) => new Promise((t, s) => {
+var j = Object.defineProperty;
+var V = (l, v, e) => v in l ? j(l, v, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[v] = e;
+var r = (l, v, e) => (V(l, typeof v != "symbol" ? v + "" : v, e), e);
+var d = (l, v, e) => new Promise((t, s) => {
   var i = (o) => {
     try {
       n(e.next(o));
@@ -15,19 +15,19 @@ var d = (M, v, e) => new Promise((t, s) => {
       s(a);
     }
   }, n = (o) => o.done ? t(o.value) : Promise.resolve(o.value).then(i, h);
-  n((e = e.apply(M, v)).next());
+  n((e = e.apply(l, v)).next());
 });
 import * as y from "three";
-import { Vector3 as P } from "three";
-import { centerPoint as I } from "../../../shared-utils/three/centerPoint.js";
+import { Vector3 as b } from "three";
+import { centerPoint as P } from "../../../shared-utils/three/centerPoint.js";
 import { loadPicture as E } from "../../../shared-utils/three/loadTexture.js";
-import { QuadrangleGeometry as F, QuadrangleMesh as x } from "../../../shared-utils/three/Quadrangle.js";
-import { getVideoTexture as j } from "../../../shared-utils/three/loadVideoTexture.js";
-import { Image_Play_Icon_With_Text as V, Image_Play_Icon as S } from "../../Assets/Icon.js";
-import { getPositionsByObjectFit as p } from "../../../shared-utils/three/getPositionsByObjectFit.js";
-import { FragmentTransparencyMaterial as B } from "../../../shared-utils/three/FragmentTransparencyMaterial.js";
-import { getNormal as b } from "../../../shared-utils/three/getNormal.js";
-import { CONST as T } from "../../../shared-utils/constants.js";
+import { QuadrangleGeometry as I, QuadrangleMesh as F } from "../../../shared-utils/three/Quadrangle.js";
+import { getVideoTexture as _ } from "../../../shared-utils/three/loadVideoTexture.js";
+import { Image_Play_Icon_With_Text as B, Image_Play_Icon as S } from "../../Assets/Icon.js";
+import { getPositionsByObjectFit as M } from "../../../shared-utils/three/getPositionsByObjectFit.js";
+import { FragmentTransparencyMaterial as G } from "../../../shared-utils/three/FragmentTransparencyMaterial.js";
+import { getNormal as T } from "../../../shared-utils/three/getNormal.js";
+import { CONST as x } from "../../../shared-utils/constants.js";
 import "../../../shared-utils/math/pointsIsRectangle.js";
 import "../../../shared-utils/device.js";
 class H extends y.Mesh {
@@ -62,15 +62,15 @@ class z extends H {
     const i = (n = s == null ? void 0 : s.resolveZFighting) != null ? n : !0;
     let h = t;
     if (i) {
-      const o = b(t).multiplyScalar(T.Z_FIGHTING_OFFSET);
+      const o = T(t).multiplyScalar(x.Z_FIGHTING_OFFSET);
       h = t.map((a) => a.clone().add(o));
     }
     E(e).then(({ texture: o, transparent: a }) => {
-      var g;
-      const l = new y.MeshBasicMaterial({ map: o, transparent: a, side: y.DoubleSide });
-      this.originRatio = o.image.width / o.image.height, this.objectFit = (g = s == null ? void 0 : s.objectFit) != null ? g : "contain";
-      const c = p(this.objectFit, h, o.image.width / o.image.height), u = I(...c), m = c.map((w) => w.clone().sub(u)), f = new F(m);
-      this.position.copy(u), this.geometry = f, this.material = l;
+      var p;
+      const g = new y.MeshBasicMaterial({ map: o, transparent: a, side: y.DoubleSide });
+      this.originRatio = o.image.width / o.image.height, this.objectFit = (p = s == null ? void 0 : s.objectFit) != null ? p : "contain";
+      const c = M(this.objectFit, h, o.image.width / o.image.height), u = P(...c), m = c.map((w) => w.clone().sub(u)), f = new I(m);
+      this.position.copy(u), this.geometry = f, this.material = g;
     }).catch((o) => {
       console.error(`Imageplane error: ${o == null ? void 0 : o.message}`);
     });
@@ -80,10 +80,10 @@ class z extends H {
     let h = t;
     const { resolveZFighting: n } = s != null ? s : {};
     if (n) {
-      const u = b(t).multiplyScalar(T.Z_FIGHTING_OFFSET);
+      const u = T(t).multiplyScalar(x.Z_FIGHTING_OFFSET);
       h = t.map((m) => m.clone().add(u));
     }
-    const o = p(i != null ? i : "contain", h, this.originRatio), a = I(...o), l = o.map((u) => u.clone().sub(a)), c = new F(l);
+    const o = M(i != null ? i : "contain", h, this.originRatio), a = P(...o), g = o.map((u) => u.clone().sub(a)), c = new I(g);
     this.objectFit = i != null ? i : "contain", this.position.copy(a), this.geometry = c;
   }
 }
@@ -96,7 +96,7 @@ class J extends H {
       playButton: n = "withText",
       paused: o = !0,
       videoTextureMap: a,
-      ImageTextureMap: l,
+      ImageTextureMap: g,
       domEvents: c
     } = s != null ? s : {};
     super();
@@ -114,7 +114,7 @@ class J extends H {
     r(this, "buttonMesh");
     r(this, "videoTextureMap");
     r(this, "ImageTextureMap");
-    this.cornerPoints = t, this.src = e, this.buttonSrc = (() => n === "withText" ? V : n === "withoutText" ? S : typeof n == "string" ? n : S)(), this.videoCoverSrc = i, this.objectFit = h, this.videoTextureMap = a, this.ImageTextureMap = l, this.domEvents = c, this.position.copy(I(...t)), this.videoCoverSrc && o ? this.addCoverMesh().then(() => this.addButtonMesh()) : this.addVideoMesh().then(() => {
+    this.cornerPoints = t, this.src = e, this.buttonSrc = (() => n === "withText" ? B : n === "withoutText" ? S : typeof n == "string" ? n : S)(), this.videoCoverSrc = i, this.objectFit = h, this.videoTextureMap = a, this.ImageTextureMap = g, this.domEvents = c, this.position.copy(P(...t)), this.videoCoverSrc && o ? this.addCoverMesh().then(() => this.addButtonMesh()) : this.addVideoMesh().then(() => {
       o ? this.addButtonMesh() : this.play(!0);
     }), this.addEventListener("removed", () => {
       this.remove(...this.children);
@@ -161,8 +161,8 @@ class J extends H {
           return this.coverMesh;
         if (!this.videoCoverSrc)
           return;
-        const { texture: t, transparent: s } = yield this.getImageTexture(this.videoCoverSrc), i = new y.MeshBasicMaterial({ transparent: !1, map: t, side: y.DoubleSide }), h = p(this.objectFit, this.cornerPoints, t.image.width / t.image.height), n = new x(h, i);
-        return n.position.copy(new P(0, 0, 0)), n.name = "videoCoverMesh", n;
+        const { texture: t, transparent: s } = yield this.getImageTexture(this.videoCoverSrc), i = new y.MeshBasicMaterial({ transparent: !1, map: t, side: y.DoubleSide }), h = M(this.objectFit, this.cornerPoints, t.image.width / t.image.height), n = new F(h, i);
+        return n.position.copy(new b(0, 0, 0)), n.name = "videoCoverMesh", n;
       }))();
       return e && (this.children.includes(this.coverMesh) || (this.add(e), this.coverMesh = e)), e;
     });
@@ -177,15 +177,13 @@ class J extends H {
           return this.videoMesh;
         if (!this.src)
           return;
-        const i = this.getVideoTexture(this.src), h = new y.MeshBasicMaterial({ transparent: !1, map: i, side: y.DoubleSide }), n = yield new Promise((l) => {
-          i.metadataLoaded ? l(p(this.objectFit, this.cornerPoints, i.image.videoWidth / i.image.videoHeight)) : i.addEventListener(
+        const i = this.getVideoTexture(this.src), h = new y.MeshBasicMaterial({ transparent: !1, map: i, side: y.DoubleSide }), n = yield new Promise((a) => {
+          i.metadataLoaded ? a(M(this.objectFit, this.cornerPoints, i.image.videoWidth / i.image.videoHeight)) : i.addEventListener(
             "videoLoaded",
-            () => l(p(this.objectFit, this.cornerPoints, i.image.videoWidth / i.image.videoHeight))
+            () => a(M(this.objectFit, this.cornerPoints, i.image.videoWidth / i.image.videoHeight))
           );
-        }), o = new x(n, h);
-        o.name = "videoMesh", o.position.copy(new P(0, 0, 0));
-        const a = b(n).multiplyScalar(T.Z_FIGHTING_OFFSET);
-        return o.position.add(a), o;
+        }), o = new F(n, h);
+        return o.name = "videoMesh", o.position.copy(new b(0, 0, 0)), o;
       }))();
       if (!e)
         return;
@@ -211,11 +209,11 @@ class J extends H {
       if (this.children.includes(this.buttonMesh))
         return;
       const e = yield (() => d(this, null, function* () {
-        var m, f, g, w;
+        var m, f, p, w;
         if (this.buttonMesh)
           return this.buttonMesh;
-        const t = (f = (m = this.videoMesh) == null ? void 0 : m.geometry.points[0].distanceTo(this.videoMesh.geometry.points[3])) != null ? f : 1 / 0, s = (w = (g = this.coverMesh) == null ? void 0 : g.geometry.points[0].distanceTo(this.coverMesh.geometry.points[3])) != null ? w : 1 / 0, i = this.cornerPoints[0].distanceTo(this.cornerPoints[3]), n = Math.min(t, s, i) / i * 0.3, { texture: o, transparent: a } = yield this.getImageTexture(this.buttonSrc), l = p("contain", this.cornerPoints, o.image.width / o.image.height), c = new x(l, new B(o));
-        c.position.copy(new P(0, 0, 0)), c.name = "buttonMesh", c.scale.set(n, n, n), c.material.side = y.DoubleSide, this.domEvents.addAutoBindEventListener(
+        const t = (f = (m = this.videoMesh) == null ? void 0 : m.geometry.points[0].distanceTo(this.videoMesh.geometry.points[3])) != null ? f : 1 / 0, s = (w = (p = this.coverMesh) == null ? void 0 : p.geometry.points[0].distanceTo(this.coverMesh.geometry.points[3])) != null ? w : 1 / 0, i = this.cornerPoints[0].distanceTo(this.cornerPoints[3]), n = Math.min(t, s, i) / i * 0.3, { texture: o, transparent: a } = yield this.getImageTexture(this.buttonSrc), g = M("contain", this.cornerPoints, o.image.width / o.image.height), c = new F(g, new G(o));
+        c.position.copy(new b(0, 0, 0)), c.name = "buttonMesh", c.scale.set(n, n, n), c.material.side = y.DoubleSide, this.domEvents.addAutoBindEventListener(
           c,
           "click",
           () => {
@@ -223,7 +221,7 @@ class J extends H {
           },
           { noEmitWhenHide: !0 }
         );
-        const u = b(l).multiplyScalar(T.Z_FIGHTING_OFFSET * 2);
+        const u = T(g).multiplyScalar(x.Z_FIGHTING_OFFSET);
         return c.position.add(u), c;
       }))();
       return this.children.includes(this.buttonMesh) || (this.add(e), this.buttonMesh = e), e;
@@ -242,13 +240,13 @@ class J extends H {
     var s, i;
     if ((s = this.videoTextureMap) != null && s.has(e))
       return this.videoTextureMap.get(e);
-    const t = j(e);
+    const t = _(e);
     return (i = this.videoTextureMap) == null || i.set(e, t), t;
   }
   changePointsOrParams(e) {
     return d(this, null, function* () {
       const { cornerPoints: t, params: s } = e;
-      t && (this.cornerPoints = t, this.position.copy(I(...t))), s != null && s.objectFit && (this.objectFit = s.objectFit), yield this.updateAllMeshes();
+      t && (this.cornerPoints = t, this.position.copy(P(...t))), s != null && s.objectFit && (this.objectFit = s.objectFit), yield this.updateAllMeshes();
     });
   }
   updateAllMeshes() {
@@ -260,33 +258,31 @@ class J extends H {
     return d(this, null, function* () {
       if (!this.videoMesh || !this.src)
         return;
-      const e = this.getVideoTexture(this.src), t = yield new Promise((o) => {
-        e.metadataLoaded ? o(p(this.objectFit, this.cornerPoints, e.image.videoWidth / e.image.videoHeight)) : e.addEventListener(
+      const e = this.getVideoTexture(this.src), t = yield new Promise((n) => {
+        e.metadataLoaded ? n(M(this.objectFit, this.cornerPoints, e.image.videoWidth / e.image.videoHeight)) : e.addEventListener(
           "videoLoaded",
-          () => o(p(this.objectFit, this.cornerPoints, e.image.videoWidth / e.image.videoHeight))
+          () => n(M(this.objectFit, this.cornerPoints, e.image.videoWidth / e.image.videoHeight))
         );
-      }), s = I(...t), i = t.map((o) => o.clone().sub(s)), h = new F(i);
-      this.videoMesh.geometry.dispose(), this.videoMesh.geometry = h, this.videoMesh.position.copy(new P(0, 0, 0));
-      const n = b(t).multiplyScalar(T.Z_FIGHTING_OFFSET);
-      this.videoMesh.position.add(n);
+      }), s = P(...t), i = t.map((n) => n.clone().sub(s)), h = new I(i);
+      this.videoMesh.geometry.dispose(), this.videoMesh.geometry = h, this.videoMesh.position.copy(new b(0, 0, 0));
     });
   }
   updateCoverMesh() {
     return d(this, null, function* () {
       if (!this.coverMesh || !this.videoCoverSrc)
         return;
-      const { texture: e } = yield this.getImageTexture(this.videoCoverSrc), t = p(this.objectFit, this.cornerPoints, e.image.width / e.image.height), s = I(...t), i = t.map((n) => n.clone().sub(s)), h = new F(i);
-      this.coverMesh.geometry.dispose(), this.coverMesh.geometry = h, this.coverMesh.position.copy(new P(0, 0, 0));
+      const { texture: e } = yield this.getImageTexture(this.videoCoverSrc), t = M(this.objectFit, this.cornerPoints, e.image.width / e.image.height), s = P(...t), i = t.map((n) => n.clone().sub(s)), h = new I(i);
+      this.coverMesh.geometry.dispose(), this.coverMesh.geometry = h, this.coverMesh.position.copy(new b(0, 0, 0));
     });
   }
   updateButtonMesh() {
     return d(this, null, function* () {
-      var m, f, g, w;
+      var m, f, p, w;
       if (!this.buttonMesh)
         return;
-      const { texture: e } = yield this.getImageTexture(this.buttonSrc), t = p("contain", this.cornerPoints, e.image.width / e.image.height), s = I(...t), i = t.map((C) => C.clone().sub(s)), h = new F(i), n = (f = (m = this.videoMesh) == null ? void 0 : m.geometry.points[0].distanceTo(this.videoMesh.geometry.points[3])) != null ? f : 1 / 0, o = (w = (g = this.coverMesh) == null ? void 0 : g.geometry.points[0].distanceTo(this.coverMesh.geometry.points[3])) != null ? w : 1 / 0, a = this.cornerPoints[0].distanceTo(this.cornerPoints[3]), c = Math.min(n, o, a) / a * 0.3;
-      this.buttonMesh.geometry.dispose(), this.buttonMesh.geometry = h, this.buttonMesh.position.copy(new P(0, 0, 0)), this.buttonMesh.scale.set(c, c, c);
-      const u = b(t).multiplyScalar(T.Z_FIGHTING_OFFSET * 2);
+      const { texture: e } = yield this.getImageTexture(this.buttonSrc), t = M("contain", this.cornerPoints, e.image.width / e.image.height), s = P(...t), i = t.map((C) => C.clone().sub(s)), h = new I(i), n = (f = (m = this.videoMesh) == null ? void 0 : m.geometry.points[0].distanceTo(this.videoMesh.geometry.points[3])) != null ? f : 1 / 0, o = (w = (p = this.coverMesh) == null ? void 0 : p.geometry.points[0].distanceTo(this.coverMesh.geometry.points[3])) != null ? w : 1 / 0, a = this.cornerPoints[0].distanceTo(this.cornerPoints[3]), c = Math.min(n, o, a) / a * 0.3;
+      this.buttonMesh.geometry.dispose(), this.buttonMesh.geometry = h, this.buttonMesh.position.copy(new b(0, 0, 0)), this.buttonMesh.scale.set(c, c, c);
+      const u = T(t).multiplyScalar(x.Z_FIGHTING_OFFSET);
       this.buttonMesh.position.add(u);
     });
   }

package/libs/Sculpt/Objects/Polygon/Editor.d.ts

@@ -1,9 +1,14 @@
 import type { Polygon } from '.';
 import type { FiveDomEvent } from '../../../shared-utils/five/FiveDomEvents';
-import * as THREE from 'three';
 import { LineEditorAbstract } from '../Line/Editor';
 export declare class PolygonEditor extends LineEditorAbstract<Polygon> {
-    get points(): THREE.Vector3[];
+    get points(): import("three").Vector3[];
     constructor(originObject: Polygon);
+    /**
+     * 更新所有 PointMesh 的位置
+     */
+    updatePointMeshes(): void;
+    protected onDragstart: (event: FiveDomEvent) => void;
     protected onDrag: (event: FiveDomEvent) => void;
+    protected onDragend: (event: FiveDomEvent) => void;
 }

package/libs/Sculpt/Objects/Polygon/Editor.js

@@ -1,23 +1,39 @@
 var a = Object.defineProperty;
-var c = (o, i, t) => i in o ? a(o, i, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[i] = t;
-var r = (o, i, t) => (c(o, typeof i != "symbol" ? i + "" : i, t), t);
-import { Sculpt as g } from "../../index.js";
-import { getIntersectByRaycaster as p } from "../../../shared-utils/five/getPosition.js";
-import { LineEditorAbstract as h } from "../Line/Editor.js";
-class u extends h {
+var g = (s, i, t) => i in s ? a(s, i, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[i] = t;
+var n = (s, i, t) => (g(s, typeof i != "symbol" ? i + "" : i, t), t);
+import { Sculpt as h } from "../../index.js";
+import { getIntersectByRaycaster as c } from "../../../shared-utils/five/getPosition.js";
+import { LineEditorAbstract as p } from "../Line/Editor.js";
+class m extends p {
   constructor(t) {
     super(t);
-    r(this, "onDrag", (t) => {
+    n(this, "onDragstart", (t) => {
+      const e = t.target;
+      this.draggingPoints = this.pointMeshes.filter((o) => o.position.equals(e.position));
+    });
+    n(this, "onDrag", (t) => {
       if (!this.draggingPoints || this.draggingPoints.length === 0)
         return;
-      const e = p(g.modules.five, t.raycaster), n = this.originObject.areaMesh.projectPoint(e.point);
-      this.draggingPoints.forEach((s) => s.position.copy(n)), this.originObject.areaMesh.setPoints(this.pointMeshes.map((s) => s.position));
+      const e = c(h.modules.five, t.raycaster), o = this.originObject.areaMesh.projectPoint(e.point);
+      this.draggingPoints.forEach((r) => r.position.copy(o)), this.originObject.areaMesh.setPoints(this.pointMeshes.map((r) => r.position));
+    });
+    n(this, "onDragend", (t) => {
+      this.draggingPoints = [], this.originObject.recordHistory();
     });
   }
   get points() {
     return this.originObject.areaMesh.points;
   }
+  /**
+   * 更新所有 PointMesh 的位置
+   */
+  updatePointMeshes() {
+    const t = this.originObject.areaMesh.points;
+    this.pointMeshes.forEach((e, o) => {
+      t[o] && e.position.copy(t[o]);
+    });
+  }
 }
 export {
-  u as PolygonEditor
+  m as PolygonEditor
 };

package/libs/Sculpt/Objects/Polygon/index.d.ts

@@ -18,6 +18,9 @@ export type PolygonCreateConfig = Partial<PolygonStyle & CreateLimitConfig & Pol
 export declare class Polygon extends BaseObject<PolygonImportData> {
     readonly type = "Polygon";
     areaMesh: AreaMesh;
+    private historyStack;
+    private currentHistoryIndex;
+    private maxHistorySize;
     get editor(): PolygonEditor;
     _editor: PolygonEditor;
     private creatingObject?;
@@ -39,6 +42,14 @@ export declare class Polygon extends BaseObject<PolygonImportData> {
     canRedo(): boolean;
     undo(): void;
     redo(): void;
+    /**
+     * 记录当前状态到历史记录
+     */
+    recordHistory(): void;
+    /**
+     * 恢复快照
+     */
+    private restoreSnapshot;
     create(params?: PolygonCreateConfig): Promise<void>;
 }
 export declare function createPolygon(areaMesh: AreaMesh, pointSelector: PointSelector, config?: PolygonCreateConfig): {