@realsee/dnalogel 2.21.0-dev.0 → 2.21.0-dev.2

package/libs/PanoMeasurePlugin/Model/point.js

@@ -1,16 +1,21 @@
-var e = Object.defineProperty;
-var p = (t, i, o) => i in t ? e(t, i, { enumerable: !0, configurable: !0, writable: !0, value: o }) : t[i] = o;
-var s = (t, i, o) => (p(t, typeof i != "symbol" ? i + "" : i, o), o);
-import { Vector3 as n } from "three";
+var s = Object.defineProperty;
+var n = (t, i, o) => i in t ? s(t, i, { enumerable: !0, configurable: !0, writable: !0, value: o }) : t[i] = o;
+var r = (t, i, o) => (n(t, typeof i != "symbol" ? i + "" : i, o), o);
+import { Vector3 as p } from "three";
 import { uuid as h } from "../../shared-utils/uuid.js";
 import { removeArrayItem as m } from "../../shared-utils/removeArrayItem.js";
-class r {
+class e {
   constructor(i) {
-    s(this, "id");
-    s(this, "lines");
-    s(this, "position");
-    s(this, "type", "point");
-    this.id = h(), this.lines = [], this.position = new n(), i instanceof n ? this.position.copy(i) : this.position.fromArray(i);
+    r(this, "id");
+    r(this, "lines");
+    r(this, "position");
+    r(this, "type", "point");
+    if (this.id = h(), this.lines = [], this.position = new p(), Array.isArray(i))
+      this.position.fromArray(i);
+    else if (typeof i == "object" && i.isVector3)
+      this.position.copy(i);
+    else
+      throw new Error("position must be Vector3 or number[]");
   }
   toJson() {
     return { id: this.id, position: this.position.toArray() };
@@ -22,9 +27,9 @@ class r {
     m(i, this.lines);
   }
   clone() {
-    return new r(this.position);
+    return new e(this.position);
   }
 }
 export {
-  r as default
+  e as default
 };

package/libs/PanoMeasurePlugin/Model/polygon.js

@@ -1,11 +1,12 @@
 var c = Object.defineProperty;
-var m = (o, t, e) => t in o ? c(o, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[t] = e;
-var i = (o, t, e) => (m(o, typeof t != "symbol" ? t + "" : t, e), e);
+var d = (o, t, e) => t in o ? c(o, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[t] = e;
+var i = (o, t, e) => (d(o, typeof t != "symbol" ? t + "" : t, e), e);
 import * as r from "three";
 import { IObject3D as h } from "../../shared-utils/three/IObject3D.js";
-import p from "../utils/generatePolygonGeometry.js";
+import l from "../utils/generatePolygonGeometry.js";
 import "earcut";
-class g extends h {
+const p = new r.BufferGeometry();
+class w extends h {
   constructor(e) {
     super();
     i(this, "geometry", new r.BufferGeometry());
@@ -15,24 +16,24 @@ class g extends h {
       side: r.DoubleSide,
       depthTest: !0,
       opacity: 0.5
-    }), d = new r.MeshBasicMaterial({
+    }), m = new r.MeshBasicMaterial({
       color: 16777215,
       transparent: !0,
       side: r.DoubleSide,
       depthTest: !1,
       depthWrite: !1,
       opacity: 0.2
-    }), a = new r.Mesh(this.geometry, s), n = new r.Mesh(this.geometry, d);
-    a.renderOrder = 10, n.renderOrder = 0, e && this.updatePoints(e), this.add(a, n);
+    }), n = new r.Mesh(this.geometry, s), a = new r.Mesh(this.geometry, m);
+    n.renderOrder = 10, a.renderOrder = 0, e && this.updatePoints(e), this.add(n, a);
   }
   /**
    * @description: 按照新的端点来更新多边形的geometry
    */
   updatePoints(e) {
-    const s = p(e);
-    s && this.geometry.copy(s);
+    const s = l(e);
+    s ? this.geometry.copy(s) : this.geometry.copy(p);
   }
 }
 export {
-  g as default
+  w as default
 };

package/libs/PanoMeasurePlugin/Model/polyline.js

@@ -52,7 +52,7 @@ class S {
    * @description: 获取连续线段的顶点数量
    */
   getPointLength() {
-    return this.isEmpty() ? 0 : this.lines.length + 1;
+    return this.lines.length + 1;
   }
   clear() {
     const i = this.lines.slice();
@@ -83,14 +83,14 @@ class S {
   }
   fromJson(i) {
     this.clear(), this.id = i.id;
-    const { getPoint: t, getAllPoints: h } = f(), d = i.lines.map((e) => {
-      const [p, u] = e.points, n = t(p), l = t(u);
+    const { getPoint: t, getAllPoints: h } = f(), u = i.lines.map((e) => {
+      const [p, d] = e.points, n = t(p), l = t(d);
       if (!n || !l)
         throw new Error("线上的点不存在");
       const o = new P(n, l, this.model);
       return o.id = e.id, o.text = e.text, o;
     }), c = h();
-    this.points.push(...c), this.lines.push(...d), this.visiblePanoIndexes = i.visiblePanoIndexes;
+    this.points.push(...c), this.lines.push(...u), this.visiblePanoIndexes = i.visiblePanoIndexes;
     function f() {
       const e = /* @__PURE__ */ new Map();
       function p(n) {
@@ -100,10 +100,10 @@ class S {
         const o = new g(n.position);
         return o.id = n.id, e.set(n.id, o), o;
       }
-      function u() {
+      function d() {
         return Array.from(e.values());
       }
-      return { getPoint: p, getAllPoints: u };
+      return { getPoint: p, getAllPoints: d };
     }
     return this;
   }

package/libs/PanoMeasurePlugin/Modules/GuideController.d.ts

@@ -1,6 +1,6 @@
 import type MeasureController from '../Controller';
 export interface GuideControllerParams {
-    container: Element;
+    container?: Element;
     startTip?: string;
     endTip?: string;
     firstPointTip?: string;

package/libs/PanoMeasurePlugin/Modules/UIController/index.d.ts

@@ -1,13 +1,14 @@
 import type MeasureController from '../../Controller';
+export type UIMode = 'pc' | 'mobile';
 export interface UIControllerParams {
-    container: Element;
-    mode?: 'pc' | 'mobile';
+    container?: Element;
+    mode?: UIMode;
+    useNewUI?: boolean;
     startButtonText?: string;
     endButtonText?: string;
     revokeButtonText?: string;
     exitButtonText?: string;
 }
-export type UIMode = 'pc' | 'mobile';
 export declare class UIController {
     private revoke?;
     private container;

package/libs/PanoMeasurePlugin/Modules/UIController/index.js

@@ -1,18 +1,79 @@
 var c = Object.defineProperty;
-var m = (r, t, e) => t in r ? c(r, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[t] = e;
-var o = (r, t, e) => (m(r, typeof t != "symbol" ? t + "" : t, e), e);
-import h from "./HTML.js";
-import p from "./mobileHTML.js";
-import { controllerBackgroundStyle as d, operatingSpaceStyle as y, uiWrapperStyle as u, textStyle as f, exitItemStyle as v, exitIconStyle as C } from "./style.js";
+var h = (i, e, t) => e in i ? c(i, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : i[e] = t;
+var o = (i, e, t) => (h(i, typeof e != "symbol" ? e + "" : e, t), t);
+import d from "./HTML.js";
+import u from "./mobileHTML.js";
+import { controllerBackgroundStyle as y, operatingSpaceStyle as f, uiWrapperStyle as v, textStyle as C, exitItemStyle as b, exitIconStyle as g } from "./style.js";
 import { MainBtnController as _ } from "./MainBtnController.js";
-import { MobileMainBtnController as b } from "./mobileMainBtnController.js";
-import g from "./Revoke/index.js";
-import E from "../../Components/Controller1.js";
+import { MobileMainBtnController as E } from "./mobileMainBtnController.js";
+import S from "./Revoke/index.js";
+import x from "../../Components/Controller0.js";
+import k from "../../Components/Controller1.js";
 import "../../../vendor/svelte/internal/index.js";
+import "../../Components/Common/Switcher0.js";
+import "../../Components/Common/Exit.js";
 import "../../Components/Common/Switcher1.js";
 import "../../Components/Common/CircleButton.js";
-class D {
-  constructor(t, e) {
+import "../../Controller/EditController.js";
+import "hammerjs";
+import "../../Model/line.js";
+import "../../../shared-utils/uuid.js";
+import "../../utils/line.js";
+import "@realsee/five/line";
+import "../../utils/constants.js";
+import "three";
+import "@realsee/five";
+import "../../utils/dom/distanceItem.js";
+import "../../utils/dom/base.js";
+import "../../utils/isNDCPointInScreen.js";
+import "../../Model/point.js";
+import "../../../shared-utils/removeArrayItem.js";
+import "../../../shared-utils/throttle.js";
+import "../../Controller/BaseController.js";
+import "../../utils/ironbox.js";
+import "../../utils/getIntersectionFromEvent.js";
+import "../../utils/getPointFromHammerEvent.js";
+import "../../Model/polyline.js";
+import "../../Model/area.js";
+import "../../Model/polygon.js";
+import "../../../shared-utils/three/IObject3D.js";
+import "../../utils/generatePolygonGeometry.js";
+import "earcut";
+import "../../utils/dom/areaDom.js";
+import "../../utils/geometryUtil.js";
+import "../../../shared-utils/three/centerPoint.js";
+import "../../utils/isIntersecting.js";
+import "../../../shared-utils/three/PointSelector.js";
+import "../../../shared-utils/three/PointSelectorHelper.js";
+import "../../../shared-utils/three/Magnifier.js";
+import "../../../shared-utils/three/getIntersect.js";
+import "../../../shared-utils/three/PointHelper.js";
+import "../../../shared-utils/three/Assets/index.js";
+import "../../../shared-utils/three/PointDomHelper.js";
+import "../../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
+import "../rangePiece/html.js";
+import "../../../CSS3DRenderPlugin/index.js";
+import "../../../CSS3DRenderPlugin/Controller.js";
+import "../../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
+import "../../../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
+import "three/examples/jsm/renderers/CSS3DRenderer";
+import "../../../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
+import "../../../CSS3DRenderPlugin/utils/createResizeObserver.js";
+import "../../../CSS3DRenderPlugin/utils/even.js";
+import "../../../shared-utils/Subscribe.js";
+import "../../../CSS3DRenderPlugin/utils/positionToVector3.js";
+import "../../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
+import "../../../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
+import "../../../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
+import "../../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
+import "../../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
+import "../../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
+import "../../../shared-utils/isAbsoluteURL.js";
+import "../../../shared-utils/animationFrame/BetterTween.js";
+import "../../../shared-utils/animationFrame/index.js";
+import "../../../shared-utils/isTouchDevice.js";
+class Ft {
+  constructor(e, t) {
     o(this, "revoke");
     o(this, "container");
     o(this, "mainController");
@@ -22,41 +83,48 @@ class D {
     o(this, "svelteDom");
     o(this, "_params");
     o(this, "handleExit", () => {
-      const t = this.container.querySelector(".fpm__exit-icon"), e = this.container.querySelector(".fpm__exit");
-      if (!e || !t)
+      const e = this.container.querySelector(".fpm__exit-icon"), t = this.container.querySelector(".fpm__exit");
+      if (!t || !e)
         throw new Error("cannot find dom");
-      this.mode === "pc" && (Object.assign(e.style, v), Object.assign(t == null ? void 0 : t.style, C));
-      const s = () => {
-        e.style.opacity = "1";
-      }, i = () => {
-        e.style.opacity = "0.85";
+      this.mode === "pc" && (Object.assign(t.style, b), Object.assign(e == null ? void 0 : e.style, g));
+      const r = () => {
+        t.style.opacity = "1";
+      }, s = () => {
+        t.style.opacity = "0.85";
       }, n = () => {
         this.measureController.disable();
       };
-      return e.addEventListener("click", n), e.addEventListener("mouseenter", s), e.addEventListener("mouseleave", i), () => {
-        e.removeEventListener("click", n), e.removeEventListener("mouseenter", s), e.removeEventListener("mouseleave", i);
+      return t.addEventListener("click", n), t.addEventListener("mouseenter", r), t.addEventListener("mouseleave", s), () => {
+        t.removeEventListener("click", n), t.removeEventListener("mouseenter", r), t.removeEventListener("mouseleave", s);
       };
     });
-    var l;
-    this._params = e, this.measureController = t, this.mode = (l = e.mode) != null ? l : "pc", this.container = document.createElement("div"), this.container.innerHTML = this.mode === "mobile" ? p : h, this.container.classList.add("fpm__ui-controller", this.mode), this.container.style.background = "rgba(0, 0, 0, 0.15)", this.svelteDom = new E({
-      target: e.container,
+    var s, n;
+    this._params = t, this.measureController = e, this.mode = (s = t.mode) != null ? s : "pc", this.container = document.createElement("div"), this.container.innerHTML = this.mode === "mobile" ? u : d, this.container.classList.add("fpm__ui-controller", this.mode), this.container.style.background = "rgba(0, 0, 0, 0.15)";
+    const r = (n = t.useNewUI) != null ? n : !1;
+    if (r && (this.mode === "pc" ? this.svelteDom = new x({
+      target: t.container,
       props: { measureController: this.measureController }
-    });
-    const s = this.container.querySelectorAll(".fpm__text"), i = this.container.querySelector(".fpm_ui-bg"), n = this.container.querySelector(".fpm_operating-space");
-    Object.assign(i == null ? void 0 : i.style, d), Object.assign(n == null ? void 0 : n.style, y), Object.assign(this.container.style, u), s.forEach((a) => Object.assign(a.style, f));
+    }) : this.mode === "mobile" && (this.svelteDom = new k({
+      target: t.container,
+      props: { measureController: this.measureController }
+    }))), !r) {
+      t.container.appendChild(this.container);
+      const l = this.container.querySelectorAll(".fpm__text"), m = this.container.querySelector(".fpm_ui-bg"), p = this.container.querySelector(".fpm_operating-space");
+      Object.assign(m == null ? void 0 : m.style, y), Object.assign(p == null ? void 0 : p.style, f), Object.assign(this.container.style, v), l.forEach((a) => Object.assign(a.style, C));
+    }
   }
   dispose() {
-    var t;
-    this.hide(), (t = this.svelteDom) == null || t.$destroy(), this.container.remove();
+    var e;
+    this.hide(), (e = this.svelteDom) == null || e.$destroy(), this.container.remove();
   }
   show() {
-    return this.container.style.display = "block", this.container.style.opacity = "1", this.container.style.transform = "translate(0, 0)", this.mode === "pc" ? (this.revoke = new g(this.measureController, this.container), this.mainController = new _(this.measureController, this.container, this._params)) : this.mainController = new b(this.measureController, this.container, this._params), this.disposers.push(this.handleExit()), this;
+    return this.container.style.display = "block", this.container.style.opacity = "1", this.container.style.transform = "translate(0, 0)", this.mode === "pc" ? (this.revoke = new S(this.measureController, this.container), this.mainController = new _(this.measureController, this.container, this._params)) : this.mainController = new E(this.measureController, this.container, this._params), this.disposers.push(this.handleExit()), this;
   }
   hide() {
-    var t, e;
-    return this.container.style.display = "none", this.container.style.opacity = "0", this.container.style.transform = "translate(0, 10px)", this.mode === "pc" && ((t = this.revoke) == null || t.dispose()), (e = this.mainController) == null || e.dispose(), this.disposers.forEach((s) => s()), this.disposers = [], this;
+    var e, t;
+    return this.container.style.display = "none", this.container.style.opacity = "0", this.container.style.transform = "translate(0, 10px)", this.mode === "pc" && ((e = this.revoke) == null || e.dispose()), (t = this.mainController) == null || t.dispose(), this.disposers.forEach((r) => r()), this.disposers = [], this;
   }
 }
 export {
-  D as UIController
+  Ft as UIController
 };

package/libs/PanoMeasurePlugin/index.js

@@ -1,9 +1,9 @@
 import t from "./Controller/index.js";
-import { default as Ao } from "./Modules/Magnifier.js";
-import { Model as Do } from "./Model/index.js";
-import { default as Fo } from "./Model/point.js";
-import { default as Ho } from "./Model/line.js";
-import { Polyline as Jo } from "./Model/polyline.js";
+import { default as To } from "./Modules/Magnifier.js";
+import { Model as Vo } from "./Model/index.js";
+import { default as Xo } from "./Model/point.js";
+import { default as Zo } from "./Model/line.js";
+import { Polyline as $o } from "./Model/polyline.js";
 import "./Modules/FiveHelper.js";
 import "three";
 import "./Controller/EditController.js";
@@ -31,6 +31,35 @@ import "./utils/dom/areaDom.js";
 import "./utils/geometryUtil.js";
 import "../shared-utils/three/centerPoint.js";
 import "./utils/isIntersecting.js";
+import "../shared-utils/three/PointSelector.js";
+import "../shared-utils/three/PointSelectorHelper.js";
+import "../shared-utils/three/Magnifier.js";
+import "../shared-utils/three/getIntersect.js";
+import "../shared-utils/three/PointHelper.js";
+import "../shared-utils/three/Assets/index.js";
+import "../shared-utils/three/PointDomHelper.js";
+import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
+import "./Modules/rangePiece/html.js";
+import "../CSS3DRenderPlugin/index.js";
+import "../CSS3DRenderPlugin/Controller.js";
+import "../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
+import "../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
+import "three/examples/jsm/renderers/CSS3DRenderer";
+import "../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
+import "../CSS3DRenderPlugin/utils/createResizeObserver.js";
+import "../CSS3DRenderPlugin/utils/even.js";
+import "../shared-utils/Subscribe.js";
+import "../CSS3DRenderPlugin/utils/positionToVector3.js";
+import "../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
+import "../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
+import "../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
+import "../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
+import "../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
+import "../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
+import "../shared-utils/isAbsoluteURL.js";
+import "../shared-utils/animationFrame/BetterTween.js";
+import "../shared-utils/animationFrame/index.js";
+import "../shared-utils/isTouchDevice.js";
 import "./Controller/ViewController.js";
 import "./Controller/WatchController.js";
 import "./Modules/DeleteDom/index.js";
@@ -43,9 +72,6 @@ import "./utils/ndc2Screen.js";
 import "./utils/findAssociatedLines.js";
 import "./Controller/MixedController.js";
 import "./Modules/rangePiece/index.js";
-import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
-import "./Modules/rangePiece/html.js";
-import "../shared-utils/animationFrame/index.js";
 import "../shared-utils/noop.js";
 import "./utils/calculateThreeMouse.js";
 import "./utils/mouseGroup.js";
@@ -58,36 +84,25 @@ import "./Modules/UIController/style.js";
 import "./Modules/UIController/MainBtnController.js";
 import "./Modules/UIController/mobileMainBtnController.js";
 import "./Modules/UIController/Revoke/index.js";
-import "./Components/Controller1.js";
+import "./Components/Controller0.js";
 import "../vendor/svelte/internal/index.js";
+import "./Components/Common/Switcher0.js";
+import "./Components/Common/Exit.js";
+import "./Components/Controller1.js";
 import "./Components/Common/Switcher1.js";
 import "./Components/Common/CircleButton.js";
 import "./Modules/GuideController.js";
 import "./Controller/ShortcutKeyController.js";
 import "../shared-utils/safeObj.js";
-import "../shared-utils/three/Magnifier.js";
-import "../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
-import "../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
-import "three/examples/jsm/renderers/CSS3DRenderer";
-import "../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
-import "../CSS3DRenderPlugin/utils/createResizeObserver.js";
-import "../CSS3DRenderPlugin/utils/even.js";
-import "../shared-utils/Subscribe.js";
-import "../CSS3DRenderPlugin/utils/positionToVector3.js";
-import "../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
-import "../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
-import "../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
-import "../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
-import "../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-const qo = function(o, r) {
+const Qo = function(o, r) {
   return new t(o, r);
 };
 export {
-  Ao as Magnifier,
-  qo as PanoMeasurePlugin,
-  Ho as PanoMeasurePluginLine,
-  Do as PanoMeasurePluginModel,
-  Fo as PanoMeasurePluginPoint,
-  Jo as PanoMeasurePluginPolyline,
-  qo as default
+  To as Magnifier,
+  Qo as PanoMeasurePlugin,
+  Zo as PanoMeasurePluginLine,
+  Vo as PanoMeasurePluginModel,
+  Xo as PanoMeasurePluginPoint,
+  $o as PanoMeasurePluginPolyline,
+  Qo as default
 };

package/libs/PanoMeasurePlugin/typings/data.d.ts

@@ -23,8 +23,8 @@ export interface OpenParameter {
 }
 /** 长度达到一定值时，自动结束线段，null 的话不自动结束 */
 export interface autoEndConfig {
-    line: number | null;
-    area: number | null;
+    line?: number | null;
+    area?: number | null;
 }
 export type MeasureType = 'line' | 'area';
 export interface EditParameter {
@@ -37,6 +37,11 @@ export interface EditParameter {
      * ['line', 'area']: 同时开启测距和测面积功能
      */
     allowMeasureType?: Array<MeasureType>;
+    /**
+     * @description: 选点的两种模式, 'fixed' 为固定选点为屏幕中心点，拖动five画布来选点，'mouse' 为跟随鼠标移动
+     * @default: 'fixed'
+     */
+    pointSelectorMode?: 'fixed' | 'cursor';
     autoEndConfig?: autoEndConfig;
 }
 export interface CrossHairParameter {

package/libs/PanoMeasurePlugin/utils/getIntersectionFromEvent.d.ts

@@ -1,4 +1,4 @@
 import type Hammer from 'hammerjs';
 import type { Five, Intersection } from '@realsee/five';
 /** 通过鼠标事件或者触摸事件，获取当前点击屏幕关联的射线与模型的交点 */
-export declare function getIntersectionFromEvent(five: Five, event: typeof Hammer['Input']): Intersection[];
+export declare function getIntersectionFromEvent(five: Five, event: (typeof Hammer)['Input']): Intersection[];

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let n = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    e(this, "VERSION", "2.21.0-dev.0");
+    e(this, "VERSION", "2.21.0-dev.2");
     e(this, "five");
     /**
      * 插件事件钩子