@realsee/dnalogel 2.21.0-dev.10 → 2.21.0-dev.12

package/libs/PanoMeasurePlugin/Model/area.js

@@ -1,6 +1,6 @@
 var m = Object.defineProperty;
-var d = (o, e, i) => e in o ? m(o, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : o[e] = i;
-var t = (o, e, i) => (d(o, typeof e != "symbol" ? e + "" : e, i), i);
+var d = (s, t, i) => t in s ? m(s, t, { enumerable: !0, configurable: !0, writable: !0, value: i }) : s[t] = i;
+var e = (s, t, i) => (d(s, typeof t != "symbol" ? t + "" : t, i), i);
 import * as h from "three";
 import { uuid as f } from "../../shared-utils/uuid.js";
 import { Subscribe as c } from "@realsee/five";
@@ -22,50 +22,57 @@ import "../../shared-utils/removeArrayItem.js";
 import "../utils/geometryUtil.js";
 import "../../shared-utils/three/centerPoint.js";
 class O {
-  constructor(e, i) {
-    t(this, "id", f());
-    t(this, "selected", !1);
-    t(this, "text");
-    t(this, "type", "area");
-    t(this, "lightMesh");
-    t(this, "areaItem");
-    t(this, "hook", new c());
+  constructor(t, i) {
+    e(this, "id", f());
+    e(this, "selected", !1);
+    e(this, "text");
+    e(this, "type", "area");
+    e(this, "lightMesh");
+    e(this, "areaItem");
+    e(this, "hook", new c());
     /** 多边形mesh */
-    t(this, "polygon");
+    e(this, "polygon");
     /** 多边形顶点 */
-    t(this, "points", []);
+    e(this, "points", []);
     /** 多边形前三个点组成的平面，用来使得后面加的点也落在这个平面上 */
-    t(this, "planeHelper");
+    e(this, "planeHelper");
     /** 多边形边框 */
-    t(this, "polyline");
+    e(this, "polyline");
     /** 多边形mesh容器 */
-    t(this, "meshContainer");
+    e(this, "meshContainer");
     /** 多边形dom容器 */
-    t(this, "domContainer");
-    t(this, "five");
-    t(this, "model");
+    e(this, "domContainer");
+    e(this, "five");
+    e(this, "model");
     /**
      * @description: five camera update 时，更新Dom的位置
      */
-    t(this, "updateDom", () => {
-      this.five && (this.polyline.lines.forEach((e) => e.distanceItem.update(this.five)), this.areaItem.updateDomPosition(this.five));
+    e(this, "updateDom", () => {
+      this.five && (this.polyline.lines.forEach((t) => t.distanceItem.update(this.five)), this.areaItem.updateDomPosition(this.five));
     });
     var n;
-    e && (this.points = e), this.model = i.model, this.polygon = new v(e), this.polyline = new y({ model: i.model }), this.areaItem = new C({
+    t && (this.points = t), this.model = i.model, this.polygon = new v(t), this.polyline = new y({ model: i.model }), this.areaItem = new C({
       area: this,
-      clickCallback: (a, s) => {
+      clickCallback: (a, o) => {
         const r = a.clientX + "px", l = a.clientY + "px";
         this.hook.emit("selected", this, { left: r, top: l });
       }
     }), this.domContainer = i.domContainer || null, this.meshContainer = i.meshContainer || null, this.five = i.five || null, this.areaItem.appendTo(this.domContainer), (n = this.five) == null || n.on("cameraUpdate", this.updateDom);
   }
-  addPoints(e) {
+  /**
+   * @description: 多边形的端点是否闭合
+   */
+  get isClosed() {
+    var t;
+    return this.points.length >= 4 && ((t = this.points.at(0)) == null ? void 0 : t.equals(this.points.at(-1)));
+  }
+  addPoints(t) {
     var a;
-    this.points = this.points.concat(e);
+    this.points = this.points.concat(t);
     const i = this.points.at(-2), n = this.points.at(-1);
     if (i && n) {
-      const s = new u(new p(i), new p(n), this.polyline.model);
-      this.polyline.addLine(s), this.meshContainer.add(s.mesh), this.five && (s.distanceItem.setCanSelect(!1), s.distanceItem.appendTo(this.domContainer), s.distanceItem.update(this.five));
+      const o = new u(new p(i), new p(n), this.polyline.model);
+      this.polyline.addLine(o), this.meshContainer.add(o.mesh), this.five && (o.distanceItem.setCanSelect(!1), o.distanceItem.appendTo(this.domContainer), o.distanceItem.update(this.five));
     }
     (a = this.meshContainer) != null && a.children.includes(this.polygon) || this.meshContainer.add(this.polygon), this.polygon.updatePoints(this.points), this.areaItem.updateArea(this.five), this.points.length === 3 ? this.planeHelper = new h.Plane().setFromCoplanarPoints(this.points[0], this.points[1], this.points[2]) : this.points.length < 3 && (this.planeHelper = null);
   }
@@ -74,8 +81,8 @@ class O {
    */
   popPoint() {
     this.points.pop();
-    const e = this.polyline.lines.pop();
-    e == null || e.remove(), this.polygon.updatePoints(this.points), this.areaItem.updateArea(this.five), this.points.length < 3 && (this.planeHelper = null);
+    const t = this.polyline.lines.pop();
+    t == null || t.remove(), this.polygon.updatePoints(this.points), this.areaItem.updateArea(this.five), this.points.length < 3 && (this.planeHelper = null);
   }
   /**
    * @description: 自动补全多边形的各个边
@@ -92,11 +99,11 @@ class O {
   /**
    * @description: 获取一个点投影在当前平面上的点
    */
-  projectPoint(e) {
-    return e && (this.planeHelper ? this.planeHelper.projectPoint(e, new h.Vector3()) : e);
+  projectPoint(t) {
+    return t && (this.planeHelper ? this.planeHelper.projectPoint(t, new h.Vector3()) : t);
   }
   remove() {
-    this.polygon.removeFromParent(), this.areaItem.remove(), this.polyline.lines.forEach((e) => e.remove());
+    this.polygon.removeFromParent(), this.areaItem.remove(), this.polyline.lines.forEach((t) => t.remove());
   }
   /**
    * @todo: 没写完

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

@@ -1,25 +1,29 @@
 import type MeasureController from '../Controller';
+import type { PartialObjectDeep } from '../../typings/typings';
+import type { PointSelectorMode } from '../typings/data';
+export interface MeasureTip {
+    select?: string;
+    line: {
+        start: string;
+    };
+    area: {
+        start: string;
+        close: string;
+    };
+}
 export interface GuideControllerParams {
     container?: Element;
+    tips?: PartialObjectDeep<MeasureTip>;
     startTip?: string;
     endTip?: string;
     firstPointTip?: string;
     nextPointTip?: string;
+    pointSelectorMode?: PointSelectorMode;
 }
 export declare class GuideController {
-    private measureController;
-    private textDom;
-    private container;
-    private hasAnchor;
-    /** 是否曾经切换到 Watch 模式过 */
-    private hasChangedToWatch;
-    private _params;
+    private tipSvelteDom?;
     constructor(measureController: MeasureController, params: GuideControllerParams);
     dispose(): void;
     show(): this;
     hide(): this;
-    private initDom;
-    private onModelChange;
-    private anchorChange;
-    private onEditedLineChange;
 }

package/libs/PanoMeasurePlugin/Modules/GuideController.js

@@ -1,52 +1,79 @@
-var o = Object.defineProperty;
-var a = (n, t, e) => t in n ? o(n, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[t] = e;
-var i = (n, t, e) => (a(n, typeof t != "symbol" ? t + "" : t, e), e);
-class r {
-  constructor(t, e) {
-    i(this, "measureController");
-    i(this, "textDom", document.createElement("span"));
-    i(this, "container", document.createElement("div"));
-    i(this, "hasAnchor", !1);
-    /** 是否曾经切换到 Watch 模式过 */
-    i(this, "hasChangedToWatch", !1);
-    i(this, "_params");
-    i(this, "onModelChange", (t) => {
-      var e;
-      if (t === "View") {
-        this.hide();
-        return;
-      }
-      if (t === "Watch") {
-        this.hasChangedToWatch ? (this.textDom.innerText = "", this.hide()) : (this.show(), this.hasChangedToWatch = !0);
-        return;
+var e = Object.defineProperty;
+var p = (o, t, i) => t in o ? e(o, t, { enumerable: !0, configurable: !0, writable: !0, value: i }) : o[t] = i;
+var r = (o, t, i) => (p(o, typeof t != "symbol" ? t + "" : t, i), i);
+import { objectAssignDeepExports as m } from "../../vendor/object-assign-deep/objectAssignDeep.js";
+import s from "../Components/Tip.js";
+import "../../vendor/svelte/internal/index.js";
+import "../../vendor/svelte/transition/index.js";
+import "../../vendor/svelte/easing/index.js";
+import "@realsee/five/line";
+import "../utils/constants.js";
+import "three";
+import "@realsee/five";
+import "../Model/polygon.js";
+import "../../shared-utils/three/IObject3D.js";
+import "../utils/generatePolygonGeometry.js";
+import "earcut";
+import "hammerjs";
+import "../../vendor/@tweenjs/tween/dist/tween.esm.js.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 "../../shared-utils/three/centerPoint.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
+import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
+const l = {
+  select: "点击按钮选择功能",
+  line: {
+    start: "点击开始测量"
+  },
+  area: {
+    start: "点击开始测量",
+    close: "选择三个点后将闭合平面，点击结束自动闭合"
+  }
+}, c = {
+  select: "点击按钮选择功能",
+  line: {
+    start: "点击开始按钮打点"
+  },
+  area: {
+    start: "点击开始按钮打点",
+    close: "选择三个点后将闭合平面，点击结束自动闭合"
+  }
+};
+class K {
+  constructor(t, i) {
+    r(this, "tipSvelteDom");
+    this.tipSvelteDom = new s({
+      target: i.container,
+      props: {
+        measureController: t,
+        tips: m({}, i.pointSelectorMode === "fixed" ? c : l, i.tips),
+        visible: !0
       }
-      t === "Edit" && (this.textDom.innerText = (e = this._params.firstPointTip) != null ? e : "请选择第一个测量点，Esc或单击鼠标右键可取消选择", this.show());
     });
-    i(this, "anchorChange", (t) => {
-      var e, s;
-      !this.hasAnchor && t ? (this.hasAnchor = !0, this.textDom.innerText = (e = this._params.nextPointTip) != null ? e : "选择下一个测量点，Esc或单击鼠标右键取消选择") : t || (this.hasAnchor = !1, this.textDom.innerText = (s = this._params.firstPointTip) != null ? s : "请选择第一个测量点，Esc或单击鼠标右键可取消选择");
-    });
-    i(this, "onEditedLineChange", (t) => {
-      var e;
-      t.lines.length === 1 && (this.textDom.innerText = (e = this._params.endTip) != null ? e : "可以连续选择测量点，或点击下方“结束”按钮完成测量（Esc取消，Command+S保存）");
-    });
-    this._params = e, this.initDom(), e.container.append(this.container), this.measureController = t, t.hook.on("modeChange", this.onModelChange), t.hook.on("anchorChange", this.anchorChange), t.hook.on("editedPolylineChange", this.onEditedLineChange);
   }
   dispose() {
-    this.hide(), this.container.remove();
+    var t;
+    (t = this.tipSvelteDom) == null || t.$destroy();
   }
   show() {
-    return this.container.style.opacity = "1", this.container.style.transform = "translate(0, 0)", this;
+    var t;
+    return (t = this.tipSvelteDom) == null || t.set({ visible: !0 }), this;
   }
   hide() {
-    return this.container.style.opacity = "0", this.container.style.transform = "translate(0, -10px)", this.measureController.hook.off("modeChange", this.onModelChange), this.measureController.hook.off("anchorChange", this.anchorChange), this.measureController.hook.off("editedPolylineChange", this.onEditedLineChange), this;
-  }
-  initDom() {
-    var s;
-    const t = this.container, e = this.textDom;
-    t.classList.add("fpm__guide-container"), t.style.position = "absolute", t.style.top = "0px", t.style.left = "0px", t.style.width = "100%", t.style.height = "110px", t.style.display = "flex", t.style.alignItems = "center", t.style.justifyContent = "center", t.style.transform = "translate(0, -10px)", t.style.background = "linear-gradient(180deg, rgba(0,0,0,0.40) 0%, rgba(0,0,0,0.00) 100%)", t.style.transition = "opacity 500ms ease-in-out, transform 500ms ease-in-out", t.style.opacity = "0", e.classList.add("fpm__guide-text"), e.style.color = "#fff", e.style.fontSize = "20px", e.innerText = (s = this._params.startTip) != null ? s : "点击下方“开始”按钮开始测距", t.appendChild(e);
+    var t;
+    return (t = this.tipSvelteDom) == null || t.set({ visible: !1 }), this;
   }
 }
 export {
-  r as GuideController
+  K as GuideController
 };

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

@@ -42,7 +42,6 @@ import "../../../shared-utils/three/PointSelector.js";
 import "../../../shared-utils/three/PointSelectorHelper.js";
 import "../../../shared-utils/three/Magnifier.js";
 import "hammerjs";
-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";
@@ -70,6 +69,7 @@ import "../../../shared-utils/animationFrame/index.js";
 import "../../../shared-utils/isTouchDevice.js";
 import "../../../shared-utils/getIntersectionFromEvent.js";
 import "../../../shared-utils/getPointFromHammerEvent.js";
+import "../../../shared-utils/three/getIntersect.js";
 import "../DeleteDom/index.js";
 import "../DeleteDom/_Assets/delete.svg.js";
 import "../DeleteDom/_Assets/delete_bg.png.js";

package/libs/PanoMeasurePlugin/index.js

@@ -1,9 +1,9 @@
 import t from "./Controller/index.js";
-import { default as Wo } from "./Modules/Magnifier.js";
-import { Model as Yo } from "./Model/index.js";
-import { default as _o } from "./Model/point.js";
-import { default as or } from "./Model/line.js";
-import { Polyline as tr } from "./Model/polyline.js";
+import { default as Yo } from "./Modules/Magnifier.js";
+import { Model as _o } from "./Model/index.js";
+import { default as or } from "./Model/point.js";
+import { default as tr } from "./Model/line.js";
+import { Polyline as mr } from "./Model/polyline.js";
 import "./Modules/FiveHelper.js";
 import "three";
 import "./Controller/EditController.js";
@@ -32,7 +32,6 @@ import "../shared-utils/three/PointSelector.js";
 import "../shared-utils/three/PointSelectorHelper.js";
 import "../shared-utils/three/Magnifier.js";
 import "hammerjs";
-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";
@@ -60,6 +59,7 @@ import "../shared-utils/animationFrame/index.js";
 import "../shared-utils/isTouchDevice.js";
 import "../shared-utils/getIntersectionFromEvent.js";
 import "../shared-utils/getPointFromHammerEvent.js";
+import "../shared-utils/three/getIntersect.js";
 import "./Modules/DeleteDom/index.js";
 import "./Modules/DeleteDom/_Assets/delete.svg.js";
 import "./Modules/DeleteDom/_Assets/delete_bg.png.js";
@@ -95,17 +95,19 @@ import "./Components/Common/CircleButton.js";
 import "../vendor/svelte/transition/index.js";
 import "../vendor/svelte/easing/index.js";
 import "./Modules/GuideController.js";
+import "../vendor/object-assign-deep/objectAssignDeep.js";
+import "./Components/Tip.js";
 import "./Controller/ShortcutKeyController.js";
 import "../shared-utils/safeObj.js";
-const To = function(o, r) {
+const Vo = function(o, r) {
   return new t(o, r);
 };
 export {
-  Wo as Magnifier,
-  To as PanoMeasurePlugin,
-  or as PanoMeasurePluginLine,
-  Yo as PanoMeasurePluginModel,
-  _o as PanoMeasurePluginPoint,
-  tr as PanoMeasurePluginPolyline,
-  To as default
+  Yo as Magnifier,
+  Vo as PanoMeasurePlugin,
+  tr as PanoMeasurePluginLine,
+  _o as PanoMeasurePluginModel,
+  or as PanoMeasurePluginPoint,
+  mr as PanoMeasurePluginPolyline,
+  Vo as default
 };

package/libs/PanoMeasurePlugin/typings/event.type.d.ts

@@ -27,8 +27,12 @@ type EditEvent = {
     revoke: (params: {
         isEmpty: boolean;
     }) => void;
-    /** 差最后一次打点就可以完成完成 */
+    /** 点一下按钮就可以完成，如：测距中，差最后一次打点就可以完成线段；测面积中，当前点吸附到了多边形的开始点上，点一下就可以闭合多边形 */
     readyComplete: () => void;
+    /** 点击了撤销或者其他原因导致刚刚的 readyComplete 失效 */
+    notReadyComplete: () => void;
+    /** 选点 */
+    pointsChange: (points: any[]) => void;
     /** 一条线段或者一个面积编辑完成 */
     complete: () => void;
     /** 测量面积时，是否可以打点的状态是会一直变的 */

package/libs/PanoTagPlugin/controller/index.d.ts

@@ -1,8 +1,9 @@
-import type { Tag, TagId, Tags, TagInstance, State, AddTagConfig, LoadTagConfig, ContentTypeConfigKey, TagConfig, PartialObjectDeep } from '../typings';
+import type { Tag, TagId, Tags, TagInstance, State, AddTagConfig, LoadTagConfig, ContentTypeConfigKey, TagConfig } from '../typings';
 import type { PickTagContentTypeInContentTypeConfigKey, TagContentType } from '..';
 import type { ArrayPosition } from '../typings';
 import { type Five } from '@realsee/five';
 import { TagRender } from './TagRender';
+import type { PartialObjectDeep } from '../../typings/typings';
 export declare const pluginFlag: (name: string) => string;
 declare class PanoTagPluginController extends TagRender {
     /** state */

package/libs/PanoTagPlugin/typings/tag/TagConfig.d.ts

@@ -2,8 +2,8 @@ import type { Create3DDomContainerParamsType } from '../../../CSS3DRenderPlugin/
 import type { Five, Mode } from '@realsee/five';
 import type { ContentTypeMap, TagContentType } from './TagData';
 import type { MinMax } from './Utils';
-import type { PartialObjectDeep } from './Utils';
 import type { TagInstance } from './TagInstance';
+import type { PartialObjectDeep } from '../../../typings/typings';
 type ConfigFunction = (five: Five, tagState: {
     tag: TagInstance<any>;
     /** 标签点或中心点的到摄像机的距离 */

package/libs/PanoTagPlugin/typings/tag/TagInstance.d.ts

@@ -1,7 +1,7 @@
 import type { Tag } from './Tag';
 import type TagContentSvelte from '../../Components/Tag/index.svelte';
 import type { TagContentType } from './TagData';
-import type { PartialObjectDeep, StickType, TagGLTFObject } from './Utils';
+import type { StickType, TagGLTFObject } from './Utils';
 import type { Create3DDomContainerReturnType } from '../../../CSS3DRenderPlugin';
 import type { Vector3 } from 'three';
 import type { ImagePlane, VideoPlane } from '../../utils/model/mediaPlane';
@@ -9,6 +9,7 @@ import type { TagEvents } from '../controller';
 import type { TagConfig } from './TagConfig';
 import type { Subscribe } from '@realsee/five';
 import type { SetRequired } from 'type-fest';
+import type { PartialObjectDeep } from '../../../typings/typings';
 type RequiredTag<C extends TagContentType = TagContentType, S extends StickType = StickType> = SetRequired<Tag<C, S>, 'id' | 'data' | 'enabled' | 'config' | 'stickType' | 'contentType'>;
 export type TagInstance<C extends TagContentType = TagContentType, S extends StickType = StickType> = RequiredTag<C, S> & Partial<{
     screenPosition: {

package/libs/PanoTagPlugin/typings/tag/Utils.d.ts

@@ -2,16 +2,12 @@ import type { GLTFObject } from '@realsee/five/gltf-loader';
 import type { Group } from 'three';
 import type { TagContentType } from './TagData';
 import type { ImagePlane } from '../../utils/model/mediaPlane';
-import type { PartialDeep } from 'type-fest';
 import type { TagInstance } from './TagInstance';
 export type TagId = string | number;
 export type ArrayPosition = number[];
 export type Position = ArrayPosition;
 export type PanoIndex = number;
 export type WorkCode = string;
-export type PartialObjectDeep<ObjectType extends object> = {
-    [KeyType in keyof ObjectType]?: PartialDeep<ObjectType[KeyType]>;
-};
 export interface MinMax {
     min?: number;
     max?: number;

package/libs/base/BasePlugin.js

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