@realsee/dnalogel 2.20.5 → 2.21.0-dev.2

package/libs/PanoMeasurePlugin/Components/Controller1.js

@@ -0,0 +1,255 @@
+import { SvelteComponent as D, init as W, safe_not_equal as F, append_styles as G, element as k, create_component as P, space as $, attr as v, toggle_class as E, insert as q, mount_component as S, append as c, listen as K, transition_in as b, transition_out as w, check_outros as H, detach as B, destroy_component as T, run_all as I, onMount as J, onDestroy as L, group_outros as N } from "../../vendor/svelte/internal/index.js";
+import O from "./Common/Switcher1.js";
+import Q from "./Common/CircleButton.js";
+import R from "../Controller/EditController.js";
+import U from "./Common/Exit.js";
+import "../Modules/UIController/mobileHTML.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 "../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";
+function V(l) {
+  G(l, "svelte-12klgza", ".Measure-Controller.svelte-12klgza.svelte-12klgza{pointer-events:none;color:white}.Measure-Controller.svelte-12klgza .mode-switcher.svelte-12klgza{margin-top:2.25rem}.Measure-Controller.svelte-12klgza .bottom.svelte-12klgza{position:absolute;width:100%;bottom:2.5rem}.Measure-Controller.svelte-12klgza .bottom .center.svelte-12klgza{display:flex;flex-direction:column;align-items:center}.Measure-Controller.svelte-12klgza .controller.svelte-12klgza{pointer-events:all;display:flex;align-items:center}.Measure-Controller.svelte-12klgza .controller .button.svelte-12klgza{cursor:pointer;display:flex;align-items:center;justify-content:center;height:2.5rem;padding-left:1rem;padding-right:1rem;border-radius:624.9375rem;font-size:0.875rem;background-color:rgba(0, 0, 0, 0.2)}.Measure-Controller.svelte-12klgza .controller .main-button.svelte-12klgza{margin-left:1.75rem;margin-right:1.75rem}.Measure-Controller.svelte-12klgza .controller .main-button.forbid.svelte-12klgza{pointer-events:none;opacity:0.5}");
+}
+function j(l) {
+  let n, o, t;
+  return o = new O({
+    props: {
+      options: [{ key: "line", value: "测距离" }, { key: "area", value: "测面积" }],
+      defaultKey: (
+        /*measureController*/
+        l[0].currentMeasureType
+      ),
+      onChange: (
+        /*func*/
+        l[8]
+      )
+    }
+  }), {
+    c() {
+      n = k("div"), P(o.$$.fragment), v(n, "class", "mode-switcher svelte-12klgza");
+    },
+    m(i, a) {
+      q(i, n, a), S(o, n, null), t = !0;
+    },
+    p(i, a) {
+      const m = {};
+      a & /*measureController*/
+      1 && (m.defaultKey = /*measureController*/
+      i[0].currentMeasureType), a & /*measureController*/
+      1 && (m.onChange = /*func*/
+      i[8]), o.$set(m);
+    },
+    i(i) {
+      t || (b(o.$$.fragment, i), t = !0);
+    },
+    o(i) {
+      w(o.$$.fragment, i), t = !1;
+    },
+    d(i) {
+      i && B(n), T(o);
+    }
+  };
+}
+function X(l) {
+  let n, o, t, i, a, m, s, f, h, u, p, z, g, C, _, M;
+  o = new U({
+    props: {
+      onClick: (
+        /*measureController*/
+        l[0].disable
+      )
+    }
+  });
+  let r = (
+    /*measureController*/
+    l[0].allowMeasureType.length >= 2 && j(l)
+  );
+  return p = new Q({
+    props: {
+      onClick: (
+        /*func_1*/
+        l[10]
+      ),
+      text: (
+        /*buttonTextMap*/
+        l[3][
+          /*buttonState*/
+          l[2]
+        ]
+      ),
+      color: (
+        /*buttonColorMap*/
+        l[4][
+          /*buttonState*/
+          l[2]
+        ]
+      )
+    }
+  }), {
+    c() {
+      n = k("div"), P(o.$$.fragment), t = $(), i = k("div"), a = k("div"), r && r.c(), m = $(), s = k("div"), f = k("div"), f.textContent = "撤销", h = $(), u = k("div"), P(p.$$.fragment), z = $(), g = k("div"), g.textContent = "结束", v(f, "class", "button svelte-12klgza"), v(u, "class", "main-button svelte-12klgza"), E(u, "forbid", !/*allowAddPoint*/
+      l[1]), v(g, "class", "button svelte-12klgza"), v(s, "class", "controller svelte-12klgza"), v(a, "class", "center svelte-12klgza"), v(i, "class", "bottom svelte-12klgza"), v(n, "class", "Measure-Controller svelte-12klgza");
+    },
+    m(e, d) {
+      q(e, n, d), S(o, n, null), c(n, t), c(n, i), c(i, a), r && r.m(a, null), c(a, m), c(a, s), c(s, f), c(s, h), c(s, u), S(p, u, null), c(s, z), c(s, g), C = !0, _ || (M = [
+        K(
+          f,
+          "click",
+          /*click_handler*/
+          l[9]
+        ),
+        K(
+          g,
+          "click",
+          /*click_handler_1*/
+          l[11]
+        )
+      ], _ = !0);
+    },
+    p(e, [d]) {
+      const A = {};
+      d & /*measureController*/
+      1 && (A.onClick = /*measureController*/
+      e[0].disable), o.$set(A), /*measureController*/
+      e[0].allowMeasureType.length >= 2 ? r ? (r.p(e, d), d & /*measureController*/
+      1 && b(r, 1)) : (r = j(e), r.c(), b(r, 1), r.m(a, m)) : r && (N(), w(r, 1, 1, () => {
+        r = null;
+      }), H());
+      const y = {};
+      d & /*buttonState*/
+      4 && (y.onClick = /*func_1*/
+      e[10]), d & /*buttonState*/
+      4 && (y.text = /*buttonTextMap*/
+      e[3][
+        /*buttonState*/
+        e[2]
+      ]), d & /*buttonState*/
+      4 && (y.color = /*buttonColorMap*/
+      e[4][
+        /*buttonState*/
+        e[2]
+      ]), p.$set(y), (!C || d & /*allowAddPoint*/
+      2) && E(u, "forbid", !/*allowAddPoint*/
+      e[1]);
+    },
+    i(e) {
+      C || (b(o.$$.fragment, e), b(r), b(p.$$.fragment, e), C = !0);
+    },
+    o(e) {
+      w(o.$$.fragment, e), w(r), w(p.$$.fragment, e), C = !1;
+    },
+    d(e) {
+      e && B(n), T(o), r && r.d(), T(p), _ = !1, I(M);
+    }
+  };
+}
+function Y(l, n, o) {
+  let { measureController: t } = n;
+  const i = { start: "开始", add: "添加", end: "结束" }, a = {
+    start: "white",
+    add: "white",
+    end: "blue"
+  };
+  let m = !0, s = "start";
+  const f = () => {
+    t.getCurrentMode() !== "Edit" ? t.changeMode("Edit") : (o(2, s = "add"), h());
+  }, h = () => {
+    t.controller instanceof R && t.controller.selectPoint();
+  }, u = () => {
+    h();
+  }, p = () => {
+    o(2, s = "end");
+  }, z = () => {
+    o(2, s = "start");
+  }, g = (e) => {
+    o(1, m = e === "allow");
+  };
+  J(() => {
+    t.hook.on("allowAddPointStateChange", g), t.hook.on("readyComplete", p), t.hook.on("complete", z);
+  }), L(() => {
+    t.hook.off("allowAddPointStateChange", g), t.hook.off("readyComplete", p), t.hook.off("complete", z);
+  });
+  const C = (e) => {
+    t.changeMeasureType(e);
+  }, _ = () => t.revoke(), M = () => {
+    s === "start" ? f() : s === "add" ? h() : s === "end" && u();
+  }, r = () => t.save({ mode: "Watch" });
+  return l.$$set = (e) => {
+    "measureController" in e && o(0, t = e.measureController);
+  }, [
+    t,
+    m,
+    s,
+    i,
+    a,
+    f,
+    h,
+    u,
+    C,
+    _,
+    M,
+    r
+  ];
+}
+class st extends D {
+  constructor(n) {
+    super(), W(this, n, Y, X, F, { measureController: 0 }, V);
+  }
+}
+export {
+  st as default
+};

package/libs/PanoMeasurePlugin/Components/Controller1.svelte.d.ts

@@ -0,0 +1 @@
+export { SvelteComponentTyped as default } from 'svelte/internal';

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

@@ -1,13 +1,13 @@
-import type Magnifier from '../Modules/Magnifier';
 import type FiveHelper from '../Modules/FiveHelper';
-import type { Group } from 'three';
+import { type Group } from 'three';
 import type { Model } from '../Model';
 import type { Config } from '../typings';
 import type { PanoMeasurePluginEvent } from '../typings/event.type';
-import type { UserDistanceItem } from '../utils/distanceDom';
+import type { UserDistanceItem } from '../utils/dom/distanceItem';
 import type { Five, Intersection, IntersectMeshInterface, Subscribe } from '@realsee/five';
-import type { OpenParameter } from '../typings/data';
+import type { OpenParameter, EditParameter, MeasureType } from '../typings/data';
 import Line from '../Model/line';
+import type { Magnifier } from '../../shared-utils';
 export interface ControllerParams {
     five: Five;
     group: Group;
@@ -18,6 +18,9 @@ export interface ControllerParams {
     magnifier: Magnifier;
     fiveHelper: FiveHelper;
     openParams: OpenParameter;
+    editParams: EditParameter;
+    magnifierParams: ConstructorParameters<typeof Magnifier>[1];
+    getMeasureType: () => MeasureType;
     hook: Subscribe<PanoMeasurePluginEvent>;
     userDistanceItemCreator?: () => UserDistanceItem;
 }
@@ -27,14 +30,19 @@ export default class BaseController {
     protected group: Group;
     protected config: Config;
     protected dashed: Line;
+    protected perpendicularDashed: Line;
     protected disposed: boolean;
     protected isMobile: boolean;
     protected mouseGroup: Group;
     protected container: Element;
     protected fiveHelper: FiveHelper;
+    protected editParams: EditParameter;
+    protected magnifierParams: ConstructorParameters<typeof Magnifier>[1];
     protected hook: ControllerParams['hook'];
     protected magnifier: ControllerParams['magnifier'];
     protected userDistanceItemCreator: ControllerParams['userDistanceItemCreator'];
+    protected get currentMeasureType(): MeasureType;
+    private getMeasureType;
     constructor(params: ControllerParams);
     updateDistanceUI: () => void;
     protected removeLine(line: Line): void;

package/libs/PanoMeasurePlugin/Controller/BaseController.js

@@ -1,62 +1,69 @@
-var a = Object.defineProperty;
-var l = (i, e, o) => e in i ? a(i, e, { enumerable: !0, configurable: !0, writable: !0, value: o }) : i[e] = o;
-var t = (i, e, o) => (l(i, typeof e != "symbol" ? e + "" : e, o), o);
-import u from "../Model/line.js";
-import m from "../Model/point.js";
-import { preventDefault as r } from "../utils/ironbox.js";
+var m = Object.defineProperty;
+var u = (s, e, i) => e in s ? m(s, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : s[e] = i;
+var t = (s, e, i) => (u(s, typeof e != "symbol" ? e + "" : e, i), i);
+import { Color as l } from "three";
+import h from "../Model/line.js";
+import r from "../Model/point.js";
+import { preventDefault as n } from "../utils/ironbox.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/distanceDom.js";
+import "../utils/dom/distanceItem.js";
+import "../utils/dom/base.js";
 import "../utils/isNDCPointInScreen.js";
 import "../../shared-utils/removeArrayItem.js";
-class w {
+class k {
   constructor(e) {
     t(this, "model");
     t(this, "five");
     t(this, "group");
     t(this, "config");
     t(this, "dashed");
+    t(this, "perpendicularDashed");
     t(this, "disposed", !1);
     t(this, "isMobile");
     t(this, "mouseGroup");
     t(this, "container");
     t(this, "fiveHelper");
+    t(this, "editParams");
+    t(this, "magnifierParams");
     t(this, "hook");
     t(this, "magnifier");
     t(this, "userDistanceItemCreator");
+    t(this, "getMeasureType");
     t(this, "updateDistanceUI", () => {
       this.dashed.distanceItem.update(this.five), this.model.getAllLines().forEach((e) => e.distanceItem.update(this.five));
     });
-    var s, n;
-    this.five = e.five, this.hook = e.hook, this.model = e.model, this.config = e.config, this.magnifier = e.magnifier, this.container = e.container, this.fiveHelper = e.fiveHelper, this.isMobile = (n = (s = e.openParams) == null ? void 0 : s.isMobile) != null ? n : !1, this.userDistanceItemCreator = e.userDistanceItemCreator, this.group = e.group, this.mouseGroup = e.mouseGroup, this.dashed = new u(new m([0, 0, 0]), new m([0, 0, 0]), this.model), this.dashed.distanceItem.setItemSelectable(!1), this.dashed.mesh.setMaterial({ dashed: !0, dashScale: 100 }), this.dashed.mesh.name = "dashLine";
-    const o = this.five.getElement();
-    o && (o.addEventListener("touchstart", r), o.addEventListener("contextmenu", r));
+    var a, o;
+    this.five = e.five, this.hook = e.hook, this.model = e.model, this.getMeasureType = e.getMeasureType, this.config = e.config, this.magnifierParams = e.magnifierParams, this.magnifier = e.magnifier, this.container = e.container, this.fiveHelper = e.fiveHelper, this.editParams = e.editParams, this.isMobile = (o = (a = e.openParams) == null ? void 0 : a.isMobile) != null ? o : !1, this.userDistanceItemCreator = e.userDistanceItemCreator, this.group = e.group, this.mouseGroup = e.mouseGroup, this.dashed = new h(new r([0, 0, 0]), new r([0, 0, 0]), this.model), this.dashed.distanceItem.setCanSelect(!1), this.dashed.mesh.setMaterial({ dashed: !0, dashScale: 100 }), this.dashed.mesh.name = "dashLine", this.perpendicularDashed = new h(new r([0, 0, 0]), new r([0, 0, 0]), this.model), this.perpendicularDashed.distanceItem.setCanSelect(!1), this.perpendicularDashed.mesh.setMaterial({ dashed: !0, dashScale: 40, color: new l(10218089) }), this.perpendicularDashed.mesh.name = "perpendicularDashLine";
+    const i = this.five.getElement();
+    i && (i.addEventListener("touchstart", n), i.addEventListener("contextmenu", n));
+  }
+  get currentMeasureType() {
+    return this.getMeasureType();
   }
   removeLine(e) {
     this.group.remove(e.mesh, e.lightMesh), e.distanceItem.remove(), this.five.needsRender = !0;
   }
-  updateMouseGroup(e, o) {
+  updateMouseGroup(e, i) {
     if (!e)
       return this.mouseGroup;
-    const s = this.fiveHelper.getAdsorbentPoint(e), n = s || e.point;
-    if (this.mouseGroup.position.copy(n), o)
-      this.mouseGroup.quaternion.copy(o.quaternion);
+    if (this.mouseGroup.position.copy(e.point), i)
+      this.mouseGroup.quaternion.copy(i.quaternion);
     else if (e.face) {
-      const h = e.face.normal.clone().multiplyScalar(0.05), d = e.point.clone().add(h).clone().add(h);
+      const o = e.face.normal.clone().multiplyScalar(0.05), d = e.point.clone().add(o).clone().add(o);
       this.mouseGroup.lookAt(d);
     }
     return this.mouseGroup;
   }
   dispose() {
-    this.disposed = !0, this.magnifier.disable(), this.model.getAllLines().forEach((o) => this.removeLine(o));
+    this.disposed = !0, this.magnifier.disable(), this.model.getAllLines().forEach((i) => this.removeLine(i)), this.model.areas.forEach((i) => i.remove());
     const e = this.five.getElement();
-    e && (e.removeEventListener("touchstart", r), e.removeEventListener("contextmenu", r));
+    e && (e.removeEventListener("touchstart", n), e.removeEventListener("contextmenu", n));
   }
 }
 export {
-  w as default
+  k as default
 };

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

@@ -2,17 +2,19 @@ import Line from '../Model/line';
 import BaseController from './BaseController';
 import type { ControllerParams } from './BaseController';
 import { Polyline } from '../Model/polyline';
+import Area from '../Model/area';
 export default class EditController extends BaseController {
     type: string;
     polyline: Polyline;
+    area: Area;
     /** 拖动的控制点 */
     private pressPoint?;
     private hasAppendDashed;
-    private hasAppendMouseGroup;
     private fiveElement?;
     /** 上一个端点位置 */
     private lastPoint;
     private hammer?;
+    private pointSelector;
     /** 根据 intersection 更新放大镜和吸附点 */
     private onIntersectionUpdate;
     constructor(params: ControllerParams);
@@ -20,6 +22,15 @@ export default class EditController extends BaseController {
     getEditingLines(): Line[];
     /** 撤销编辑 */
     revoke: () => void;
+    /**
+     * @description: 测面积的撤销功能
+     */
+    revokeArea: () => void;
+    /**
+     * @description: 测距的撤销功能
+     */
+    revokeLine: (_polyline?: Polyline) => void;
+    selectPoint(): void;
     private onMouseLeave;
     /** 编辑线条发生改变时通知外部 */
     private onLineChanged;
@@ -33,12 +44,9 @@ export default class EditController extends BaseController {
     /**
      * 1. 如果存在上一个点，需要绘制当前点到上一个点的连线
      * 2. 把上一个点的位置更新为当前点的位置
-     * 3. 清除 mouseGroup 和 magnifier
+     * 3. 清除 pointSelector
      */
     private onTap;
-    private onWantsTapGesture;
-    /** 编辑时取消走点 */
-    private onWantsToMoveToPano;
     /** 存在长按点时不能移动全景 */
     private onWantsPanGesture;
     /** 移动全景时更新 distanceItem 在屏幕上的位置 */