@realsee/dnalogel 2.21.0-dev.8 → 2.21.0

package/libs/PanoMeasurePlugin/Controller/WatchController.js

@@ -1,17 +1,15 @@
-var H = Object.defineProperty;
-var k = (c, r, e) => r in c ? H(c, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[r] = e;
-var s = (c, r, e) => (k(c, typeof r != "symbol" ? r + "" : r, e), e);
-import I from "hammerjs";
-import R from "../Modules/DeleteDom/index.js";
-import S from "../utils/isNDCPointInScreen.js";
-import G from "./BaseController.js";
-import { Raycaster as T, Vector2 as u } from "three";
-import { closestPointOnLine as U } from "../utils/math.js";
-import { findClosestPoint as b } from "../utils/findClosestPoint.js";
-import { findAssociatedLines as w } from "../utils/findAssociatedLines.js";
-import { getPointFromHammerEvent as D } from "../../shared-utils/getPointFromHammerEvent.js";
-import j from "../Model/area.js";
-import x from "../Model/polygon.js";
+var k = Object.defineProperty;
+var w = (r, h, e) => h in r ? k(r, h, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[h] = e;
+var s = (r, h, e) => (w(r, typeof h != "symbol" ? h + "" : h, e), e);
+import E from "hammerjs";
+import G from "../Modules/DeleteDom/index.js";
+import P from "../utils/isNDCPointInScreen.js";
+import R from "./BaseController.js";
+import { Raycaster as I, Vector2 as f } from "three";
+import { closestPointOnLine as A } from "../utils/math.js";
+import { findClosestPoint as T } from "../utils/findClosestPoint.js";
+import { findAssociatedLines as v } from "../utils/findAssociatedLines.js";
+import { getPointFromHammerEvent as S } from "../utils/getPointFromHammerEvent.js";
 import "../Modules/DeleteDom/_Assets/delete.svg.js";
 import "../Modules/DeleteDom/_Assets/delete_bg.png.js";
 import "../Modules/DeleteDom/_Assets/delete_hover_bg.png.js";
@@ -21,28 +19,17 @@ import "../utils/line.js";
 import "@realsee/five/line";
 import "../utils/constants.js";
 import "@realsee/five";
-import "../utils/dom/distanceItem.js";
-import "../utils/dom/base.js";
+import "../utils/distanceDom.js";
 import "../Model/point.js";
 import "../../shared-utils/removeArrayItem.js";
 import "../utils/ironbox.js";
 import "../utils/ndc2Screen.js";
-import "../Model/polyline.js";
-import "../utils/dom/areaDom.js";
-import "../utils/geometryUtil.js";
-import "../../shared-utils/three/centerPoint.js";
-import "../../shared-utils/three/IObject3D.js";
-import "../utils/generatePolygonGeometry.js";
-import "earcut";
-class Pe extends G {
+class se extends R {
   constructor(e) {
     super(e);
     s(this, "type", "watch");
     s(this, "deleteDom");
-    s(this, "choose");
-    // tmd 真没时间改了，先这样吧，理解万岁
     s(this, "highlightedLines", []);
-    s(this, "highlightedArea");
     s(this, "fiveElement");
     s(this, "editPointState");
     s(this, "hammer");
@@ -50,19 +37,19 @@ class Pe extends G {
       var a;
       if (this.model.getAllLines().length === 0 || !this.fiveElement)
         return;
-      const i = D(e).point, t = (a = b(this.five, this.model.getAllPoints(), i, 20)) == null ? void 0 : a.point;
+      const i = S(e).point, t = (a = T(this.five, this.model.getAllPoints(), i, 20)) == null ? void 0 : a.point;
       if (!t) {
         this.editPointState = void 0;
         return;
       }
-      const n = {
+      const o = {
         point: t,
-        associatedLines: w(t.lines[0])
+        associatedLines: v(t.lines[0])
       };
       this.hook.emit("wantsDragLine", {
         point: t.id,
-        lines: n.associatedLines.map(({ id: d }) => d)
-      }) || (this.editPointState = n, this.magnifier.appendTo(this.container), this.magnifier.enable(), this.group.add(this.mouseGroup));
+        lines: o.associatedLines.map(({ id: d }) => d)
+      }) || (this.editPointState = o, this.magnifier.appendTo(this.container), this.magnifier.enable(), this.group.add(this.mouseGroup));
     });
     s(this, "onPanEnd", () => {
       this.editPointState && (this.editPointState.point.lines.forEach((e) => e.mesh.setMaterial({ dashed: !1 })), this.highlightLines(this.editPointState.associatedLines), this.editPointState = void 0, this.magnifier.disable(), this.group.remove(this.mouseGroup));
@@ -70,10 +57,10 @@ class Pe extends G {
     s(this, "onPan", (e) => {
       if (!this.editPointState || !this.fiveElement)
         return;
-      const i = D(e).ndcPoint, t = new T();
+      const i = S(e).ndcPoint, t = new I();
       t.setFromCamera(i, this.five.camera);
-      const [n] = this.five.model.intersectRaycaster(t);
-      n && this.onIntersectionUpdate(n);
+      const [o] = this.five.model.intersectRaycaster(t);
+      o && this.onIntersectionUpdate(o);
     });
     s(this, "onIntersectionUpdate", (e, i) => {
       if (this.editPointState) {
@@ -82,7 +69,7 @@ class Pe extends G {
         }), this.updateDistanceUI(), this.magnifier.renderWithPoint(e.point), this.mouseGroup.position.copy(e.point), i)
           this.mouseGroup.quaternion.copy(i.quaternion);
         else if (e.face) {
-          const n = e.face.normal.clone().multiplyScalar(0.05), a = e.point.clone().add(n).clone().add(n);
+          const o = e.face.normal.clone().multiplyScalar(0.05), a = e.point.clone().add(o).clone().add(o);
           this.mouseGroup.lookAt(a);
         }
         this.five.needsRender = !0, this.hook.emit(
@@ -96,48 +83,35 @@ class Pe extends G {
         return !1;
     });
     s(this, "wantsTapGesture", (e) => {
-      var A;
-      const i = this.model.areas.map((o) => e.intersectObject(o.polygon, !0)[0]).sort((o, h) => o.distance - h.distance), t = (A = i[0]) == null ? void 0 : A.object.parent;
-      if (t instanceof x) {
-        const o = this.model.areas.find((h) => h.polygon === t);
-        if (o) {
-          const { x: h, y: f } = i[0].point.clone().project(this.five.camera), p = `${(h + 1) / 2 * 100}%`, m = `${(-f + 1) / 2 * 100}%`;
-          return this.chooseArea(o, { left: p, top: m }), !1;
-        }
-      }
-      const [n] = this.five.model.intersectRaycaster(e);
-      if (!n)
+      const [i] = this.five.model.intersectRaycaster(e);
+      if (!i)
         return;
-      const l = this.five.camera, a = n.point.clone().project(l), d = this.container.clientWidth, g = this.container.clientHeight, L = new u(a.x * d, a.y * g), P = this.model.getAllLines().map((o) => {
-        const [h, f] = o.points, p = h.position.clone().project(l), m = f.position.clone().project(l);
-        if (!S(p) && !S(m))
+      const t = this.five.camera, o = i.point.clone().project(t), c = this.container.clientWidth, a = this.container.clientHeight, d = new f(o.x * c, o.y * a), g = this.model.getAllLines().map((n) => {
+        const [l, y] = n.points, m = l.position.clone().project(t), p = y.position.clone().project(t);
+        if (!P(m) && !P(p))
           return null;
-        const C = new u(p.x * d, p.y * g), E = new u(m.x * d, m.y * g);
-        return { id: o.id, points: [C, E] };
-      }).filter((o) => !!o);
-      if (P.length === 0)
+        const C = new f(m.x * c, m.y * a), D = new f(p.x * c, p.y * a);
+        return { id: n.id, points: [C, D] };
+      }).filter((n) => !!n);
+      if (g.length === 0)
         return;
-      const v = P.map((o) => {
-        const h = U(L, o.points);
-        return { id: o.id, distance: h.distanceTo(L) };
-      }).sort((o, h) => o.distance - h.distance)[0];
-      if (v.distance > 20)
+      const u = g.map((n) => {
+        const l = A(d, n.points);
+        return { id: n.id, distance: l.distanceTo(d) };
+      }).sort((n, l) => n.distance - l.distance)[0];
+      if (u.distance > 20)
         return;
-      const y = this.model.getAllLines().find(({ id: o }) => o === v.id);
-      if (y)
-        return this.chooseLine(y), !1;
+      const L = this.model.getAllLines().find(({ id: n }) => n === u.id);
+      if (L)
+        return this.chooseLine(L), !1;
     });
     s(this, "chooseLine", (e) => {
-      this.choose = "line";
-      const i = w(e);
-      this.deleteDom.setLines(i).updatePosition().show(), this.highlightLines(i), this.five.needsRender = !0, this.hook.emit(
+      const i = v(e);
+      this.highlightLines(i), this.five.needsRender = !0, this.hook.emit(
         "selectedChange",
         i.map((t) => t)
       );
     });
-    s(this, "chooseArea", (e, i) => {
-      this.deleteDom.setTarget(e).updatePosition(i.left, `calc(${i.top} - 20px)`).show(), this.highlightArea(e);
-    });
     s(this, "polylineRemoved", (e) => {
       e.lines.forEach((i) => this.removeLine(i)), this.hook.emit(
         "selectedChange",
@@ -147,33 +121,24 @@ class Pe extends G {
     s(this, "onCameraUpdate", () => {
       this.updateDistanceUI(), this.highlightedLines.length > 0 && this.deleteDom.updatePosition();
     });
-    s(this, "deleteArea", (e) => {
-      this.unHighlightArea(e), e.dispose(), this.deleteDom.hide();
-    });
-    s(this, "deleteLine", () => {
+    s(this, "deleteDomClickCallback", () => {
       const e = this.highlightedLines[0], i = this.model.getPolylineByLine(e);
       i && (this.model.removePolyline(i), this.highlightedLines = [], this.deleteDom.setLines([]).hide());
     });
     s(this, "cancelDeleteClickCallback", () => {
-      this.deleteDom.hide(), this.clearHighlightLines(), this.unHighlightArea();
+      this.clearHighlightLines();
     });
-    this.deleteDom = new R(this.five, {
+    this.deleteDom = new G(this.five, {
       i18n: this.config.i18n,
-      onClick: () => {
-        this.choose === "line" ? this.deleteLine() : this.choose instanceof j && this.deleteArea(this.choose);
-      },
-      cancel: this.cancelDeleteClickCallback
+      onClick: this.deleteDomClickCallback,
+      cancelDelete: this.cancelDeleteClickCallback
     }).appendTo(this.container), this.model.getAllLines().forEach((t) => {
-      t.distanceItem.appendTo(this.container), t.distanceItem.update(this.five), t.hook.on("selected", this.chooseLine), t.distanceItem.setCanSelect(!0), this.group.add(t.mesh);
-    }), this.model.getAllAreas().forEach((t) => {
-      t.areaItem.appendTo(this.container), t.areaItem.updateArea(this.five), t.hook.on("selected", this.chooseArea), t.areaItem.setCanSelect(!0), this.group.add(t.polygon), t.polyline.lines.forEach((n) => {
-        n.distanceItem.appendTo(this.container), n.distanceItem.update(this.five), this.group.add(n.mesh);
-      });
+      t.distanceItem.appendTo(this.container), t.distanceItem.update(this.five), t.hook.on("selected", this.chooseLine), t.distanceItem.setItemSelectable(!0), this.group.add(t.mesh);
     });
     const i = this.five.getElement();
     if (i) {
       this.fiveElement = i;
-      const t = new I(i);
+      const t = new E(i);
       this.hammer = t, t.on("pan", this.onPan), t.on("panstart", this.onPanStart), t.on("panend", this.onPanEnd);
     }
     this.updateDistanceUI(), this.five.needsRender = !0, this.five.on("cameraUpdate", this.onCameraUpdate), this.five.on("wantsTapGesture", this.wantsTapGesture), this.five.on("wantsPanGesture", this.wantsPanGesture), this.model.hook.on("polylineRemoved", this.polylineRemoved);
@@ -186,26 +151,14 @@ class Pe extends G {
     e.selected || (e.selected = !0, this.group.add(e.lightMesh), e.distanceItem.highlight(), this.five.needsRender = !0);
   }
   clearHighlightLines() {
-    this.group.children.length !== 0 && (this.unHighlightLines(this.highlightedLines), this.highlightedLines = []);
-  }
-  highlightArea(e) {
-    this.unHighlightLines(), this.unHighlightArea(), this.highlightLines(e.polyline.lines), this.five.needsRender = !0;
-  }
-  unHighlightArea(e) {
-    const i = e != null ? e : this.highlightedArea;
-    i && (this.unHighlightLines(i.polyline.lines), this.five.needsRender = !0);
+    this.group.children.length !== 0 && (this.deleteDom.setLines([]).hide(), this.model.getAllLines().forEach((e) => {
+      e.selected = !1, e.distanceItem.unHighlight(), this.group.remove(e.lightMesh);
+    }), this.highlightedLines = [], this.five.needsRender = !0);
   }
   highlightLines(e) {
-    this.unHighlightLines(), this.highlightedLines = e, e.forEach((i) => this.highlightLine(i));
-  }
-  unHighlightLines(e) {
-    this.unHighlightArea();
-    const i = e != null ? e : this.highlightedLines;
-    i && i.forEach((t) => {
-      t.selected = !1, t.distanceItem.unHighlight(), this.group.remove(t.lightMesh), this.five.needsRender = !0;
-    });
+    this.clearHighlightLines(), this.highlightedLines = e, this.deleteDom.setLines(e).updatePosition().show(), e.forEach((i) => this.highlightLine(i));
   }
 }
 export {
-  Pe as default
+  se as default
 };

package/libs/PanoMeasurePlugin/Controller/index.d.ts

@@ -1,23 +1,17 @@
 import type { Config } from '../typings';
-import type { EditParameter, MeasureType, OpenParameter, PluginData } from '../typings/data';
+import type { OpenParameter, PluginData } from '../typings/data';
 import type { PanoMeasurePluginEvent } from '../typings/event.type';
-import type { UserDistanceItem } from '../utils/dom/distanceItem';
+import type { UserDistanceItem } from '../utils/distanceDom';
 import type { Polyline } from '../Model/polyline';
-import EditController from './EditController';
-import ViewController from './ViewController';
-import WatchController from './WatchController';
-import MixedController from './MixedController';
-import { type Five, Subscribe } from '@realsee/five';
+import Magnifier, { type MagnifierParameter } from '../Modules/Magnifier';
+import type { Five } from '@realsee/five';
+import { Subscribe } from '@realsee/five';
 import { type UIControllerParams } from '../Modules/UIController';
 import { type GuideControllerParams } from '../Modules/GuideController';
-import { Magnifier } from '../../shared-utils';
-import type { MagnifierParameter } from '../../shared-utils';
-import type Area from '../Model/area';
 export type Mode = 'Watch' | 'Edit' | 'Mixed' | 'View';
 export interface PanoMeasureParameterType extends Partial<Config> {
-    editParams?: EditParameter;
-    magnifierParams?: MagnifierParameter;
     openParams?: OpenParameter;
+    magnifierParams?: MagnifierParameter;
     useUIController?: boolean | UIControllerParams;
     useGuideController?: boolean | GuideControllerParams;
     userDistanceItemCreator?: () => UserDistanceItem;
@@ -26,22 +20,17 @@ export default class MeasureController {
     hasOpen: boolean;
     hook: Subscribe<PanoMeasurePluginEvent>;
     magnifier: Magnifier;
-    controller: WatchController | EditController | MixedController | ViewController | null;
-    /** 允许的测量类型 */
-    allowMeasureType: Array<MeasureType>;
-    /** 当前的测量类型 */
-    currentMeasureType: MeasureType | null;
     private five;
     private model;
     private group;
     private config;
     private isMobile;
-    private fiveHelper;
     private useUIController?;
     private params;
     private useGuideController?;
     private container;
     private shortcutKeyController?;
+    private controller;
     constructor(five: Five, params: PanoMeasureParameterType);
     appendTo(parent: HTMLElement): void;
     dispose(): void;
@@ -61,22 +50,17 @@ export default class MeasureController {
      * @description 清除标尺线条
      * @description 还原点位展示和默认鼠标 UI
      */
-    disable: () => void;
+    disable(): void;
     getCurrentMode: () => Mode | null;
     /** 变更场景
      * @description 如果从编辑场景改变到观看场景，不会自动保存，默认丢弃所有改动
      */
     changeMode: (mode: Mode) => void;
-    /**
-     * @description: 切换测量的类型
-     */
-    changeMeasureType: (measureType: MeasureType) => void;
     /** 进入编辑模式 */
-    edit(measureType?: MeasureType): void;
+    edit(): void;
     /** 撤销编辑 */
     revoke(): void;
     removePolyline(polyline: Polyline): void;
-    removeArea(area: Area): void;
     removePolylineByID(id: string): void;
     getPolylineByID(id: string): Polyline;
     getEditedPolyline(): void;
@@ -98,7 +82,6 @@ export default class MeasureController {
     /** 导出数据 */
     toJson(): PluginData;
     /**
-     * @deprecated 暂不支持
      * @description 改变插件的模式（pc端模式或移动端模式）
      * @param isMobile true为移动端模式，false为pc端
      */