@realsee/dnalogel 3.21.1 → 3.22.0

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

@@ -14,18 +14,18 @@ var m = (i, t, e) => (g(i, typeof t != "symbol" ? t + "" : t, e), e);
 var E = (i, t, e) => new Promise((r, s) => {
   var d = (o) => {
     try {
-      l(e.next(o));
+      n(e.next(o));
     } catch (a) {
       s(a);
     }
-  }, n = (o) => {
+  }, l = (o) => {
     try {
-      l(e.throw(o));
+      n(e.throw(o));
     } catch (a) {
       s(a);
     }
-  }, l = (o) => o.done ? r(o.value) : Promise.resolve(o.value).then(d, n);
-  l((e = e.apply(i, t)).next());
+  }, n = (o) => o.done ? r(o.value) : Promise.resolve(o.value).then(d, l);
+  n((e = e.apply(i, t)).next());
 });
 import { hotkeys as L } from "../../../vendor/hotkeys-js/dist/hotkeys.esm.js";
 import { BaseObject as O } from "../Base/index.js";
@@ -79,30 +79,30 @@ function B(i, t) {
     }
     const d = new x({ dashed: !0, lineColor: i.lineColor, lineWidth: i.lineWidth });
     s == null || s.add(d);
-    const n = new x({ dashed: !0, lineColor: i.lineColor, lineWidth: i.lineWidth });
-    s == null || s.add(n), t.enable();
-    const l = [];
+    const l = new x({ dashed: !0, lineColor: i.lineColor, lineWidth: i.lineWidth });
+    s == null || s.add(l), t.enable();
+    const n = [];
     let o, a = !1;
     const u = (h) => {
-      const p = l.length === 0 ? h.point : o.clone();
-      l.push(p.clone()), i.setPoints(l, !1), a && (y(), e());
+      const f = n.length === 0 ? h.point : o.clone();
+      n.push(f.clone()), i.setPoints(n, { closed: !1 }), a && (y(), e());
     }, P = (h) => {
       var v;
       if (!((v = i.points) != null && v.length) || !h)
         return;
-      const p = l.at(-1).clone();
+      const f = n.at(-1).clone();
       if (i.points.length <= 2)
-        o = h.point, d.setPoints([p, o]), s != null && s.children.includes(n) && s.remove(n);
+        o = h.point, d.setPoints([f, o]), s != null && s.children.includes(l) && s.remove(l);
       else {
         o = i.projectPoint(h.point);
-        const f = i.points[0], C = 0.2;
-        f.distanceTo(o) < C || f.distanceTo(h.point) < C ? (o = f, h.point.copy(f), t.pointSelectorHelper.updateWithIntersect(h, { emitEvent: !1 }), a = !0) : a = !1, n.setPoints([o, h.point]), s != null && s.children.includes(n) || s == null || s.add(n);
+        const p = i.points[0], C = 0.2;
+        p.distanceTo(o) < C || p.distanceTo(h.point) < C ? (o = p, h.point.copy(p), t.pointSelectorHelper.updateWithIntersect(h, { emitEvent: !1 }), a = !0) : a = !1, l.setPoints([o, h.point]), s != null && s.children.includes(l) || s == null || s.add(l);
       }
-      d.setPoints([p, o]), l.length >= 2 && i.polygon.setPoints([...l, o]);
+      d.setPoints([f, o]), n.length >= 2 && i.setPoints([...n, o], { closed: !1 });
     }, y = () => {
-      t.off("select", u), t.off("intersectionUpdate", P), t.off("disable", w), t.disable(), s == null || s.remove(d, n);
+      t.off("select", u), t.off("intersectionUpdate", P), t.off("disable", w), t.disable(), s == null || s.remove(d, l);
     }, w = () => {
-      y(), s == null || s.remove(i, n, d), r(new Error("Cancelled"));
+      y(), s == null || s.remove(i, l, d), r(new Error("Cancelled"));
     };
     t.on("select", u), t.on("intersectionUpdate", P), t.on("disable", w);
   });

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

@@ -3,11 +3,10 @@ import type { FiveDomEvent } from '../../../shared-utils/five/FiveDomEvents';
 import type { Polyline } from '.';
 import type * as THREE from 'three';
 import { PointMesh } from '../../Meshes/Point';
-import type { LineWithDotsMesh } from '../../Meshes/LineWithDots';
 export declare abstract class LineEditor<OriginObject extends THREE.Object3D = THREE.Object3D> extends BaseEditor<OriginObject> {
     protected draggingPoints: PointMesh[];
-    protected get points(): PointMesh[];
-    abstract get lines(): LineWithDotsMesh[];
+    protected get pointMeshes(): PointMesh[];
+    abstract get points(): THREE.Vector3[];
     get pointHandles(): PointMesh[];
     constructor(originObject: OriginObject);
     enable(): void;
@@ -17,9 +16,7 @@ export declare abstract class LineEditor<OriginObject extends THREE.Object3D = T
     protected abstract onDrag(event: FiveDomEvent): void;
 }
 export declare class PolylineEditor extends LineEditor<Polyline> {
-    get lines(): LineWithDotsMesh[];
+    get points(): THREE.Vector3[];
     constructor(originObject: Polyline);
-    enable(): void;
-    disable(): void;
     protected onDrag: (event: FiveDomEvent) => void;
 }

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

@@ -1,39 +1,39 @@
-var a = Object.defineProperty;
-var d = (s, i, t) => i in s ? a(s, i, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[i] = t;
-var r = (s, i, t) => (d(s, typeof i != "symbol" ? i + "" : i, t), t);
-import { BaseEditor as g } from "../Base/Editor.js";
-import { Sculpt as o } from "../../index.js";
-import { PointMesh as l } from "../../Meshes/Point.js";
-import { getIntersectByRaycaster as p } from "../../../shared-utils/five/getPosition.js";
+var g = Object.defineProperty;
+var d = (s, e, t) => e in s ? g(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t;
+var n = (s, e, t) => (d(s, typeof e != "symbol" ? e + "" : e, t), t);
+import { BaseEditor as p } from "../Base/Editor.js";
+import { Sculpt as r } from "../../index.js";
+import { PointMesh as a } from "../../Meshes/Point.js";
+import { getIntersectByRaycaster as h } from "../../../shared-utils/five/getPosition.js";
 import "hammerjs";
 import "three";
 import "@realsee/five";
 import "../../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import { notNil as h } from "../../../shared-utils/isNil.js";
-class m extends g {
+import { notNil as l } from "../../../shared-utils/isNil.js";
+class m extends p {
   constructor(t) {
     super(t);
-    r(this, "draggingPoints", []);
-    r(this, "onDragstart", (t) => {
-      const e = t.target;
-      this.draggingPoints = this.points.filter((n) => n.position.equals(e.position));
+    n(this, "draggingPoints", []);
+    n(this, "onDragstart", (t) => {
+      const i = t.target;
+      this.draggingPoints = this.pointMeshes.filter((o) => o.position.equals(i.position));
     });
-    r(this, "onDragend", (t) => {
+    n(this, "onDragend", (t) => {
       this.draggingPoints = [];
     });
   }
-  get points() {
-    return this.children.filter((t) => t instanceof l);
+  get pointMeshes() {
+    return this.children.filter((t) => t instanceof a);
   }
   get pointHandles() {
     return this.children;
   }
   enable() {
-    super.enable(), this.lines.flatMap((t) => t.visiblePointMeshes).filter(h).forEach((t) => {
-      const e = t.clone();
-      e.visible = !1, e.draggable = !0, o.modules.fiveDomEvents.addEventListener(e, "drag", this.onDrag), o.modules.fiveDomEvents.addEventListener(e, "dragstart", this.onDragstart), o.modules.fiveDomEvents.addEventListener(e, "dragend", this.onDragend), this.add(e);
+    super.enable(), this.points.filter(l).forEach((t) => {
+      const i = new a();
+      i.visible = !1, i.position.copy(t), i.draggable = !0, r.modules.fiveDomEvents.addEventListener(i, "drag", this.onDrag), r.modules.fiveDomEvents.addEventListener(i, "dragstart", this.onDragstart), r.modules.fiveDomEvents.addEventListener(i, "dragend", this.onDragend), this.add(i);
     });
   }
   disable() {
@@ -43,24 +43,16 @@ class m extends g {
 class j extends m {
   constructor(t) {
     super(t);
-    r(this, "onDrag", (t) => {
+    n(this, "onDrag", (t) => {
       if (!this.draggingPoints || this.draggingPoints.length === 0)
         return;
-      const e = p(o.modules.five, t.raycaster);
-      this.draggingPoints.forEach((n) => n.position.copy(e.point)), this.originObject.polyLineMesh.setPoints(this.points.map((n) => n.position));
+      const i = h(r.modules.five, t.raycaster);
+      this.draggingPoints.forEach((o) => o.position.copy(i.point)), this.originObject.polyLineMesh.setPoints(this.pointMeshes.map((o) => o.position));
     });
   }
-  get lines() {
-    return this.originObject.polyLineMesh.lines;
-  }
-  enable() {
-    super.enable();
-  }
-  disable() {
-    super.disable();
+  get points() {
+    return this.originObject.polyLineMesh.points;
   }
-  // private onDblclick = (event: FiveDomEvent) => {
-  // }
 }
 export {
   m as LineEditor,

package/libs/Sculpt/index.d.ts

@@ -137,35 +137,59 @@ export declare class Sculpt extends Subscribe<Event> {
     /**
      * @description: 开始绘制点
      */
-    createPoint(params?: Parameters<Point['create']>[0]): Promise<BaseObject<any, any, BaseObjectConfig>>;
+    createPoint(params?: Parameters<Point['create']>[0]): Promise<BaseObject<any, {
+        [x: string]: any;
+        id: string | number;
+    }, BaseObjectConfig>>;
     /**
      * @description: 开始绘制空间折线
      */
-    createPolyline(params?: Parameters<Polyline['create']>[0]): Promise<BaseObject<any, any, BaseObjectConfig>>;
+    createPolyline(params?: Parameters<Polyline['create']>[0]): Promise<BaseObject<any, {
+        [x: string]: any;
+        id: string | number;
+    }, BaseObjectConfig>>;
     /**
      * @description: 开始绘制平面多边形
      */
-    createPolygon(params?: Parameters<Polygon['create']>[0]): Promise<BaseObject<any, any, BaseObjectConfig>>;
+    createPolygon(params?: Parameters<Polygon['create']>[0]): Promise<BaseObject<any, {
+        [x: string]: any;
+        id: string | number;
+    }, BaseObjectConfig>>;
     /**
      * @description: 开始绘制多棱柱
      */
-    createPrism(params?: Parameters<Prism['create']>[0]): Promise<BaseObject<any, any, BaseObjectConfig>>;
+    createPrism(params?: Parameters<Prism['create']>[0]): Promise<BaseObject<any, {
+        [x: string]: any;
+        id: string | number;
+    }, BaseObjectConfig>>;
     /**
      * @description: 开始绘制矩形
      */
-    createRectangle(params?: Parameters<Rectangle['create']>[0]): Promise<BaseObject<any, any, BaseObjectConfig>>;
+    createRectangle(params?: Parameters<Rectangle['create']>[0]): Promise<BaseObject<any, {
+        [x: string]: any;
+        id: string | number;
+    }, BaseObjectConfig>>;
     /**
      * @description: 开始绘制圆形
      */
-    createCircle(params?: Parameters<Circle['create']>[0]): Promise<BaseObject<any, any, BaseObjectConfig>>;
+    createCircle(params?: Parameters<Circle['create']>[0]): Promise<BaseObject<any, {
+        [x: string]: any;
+        id: string | number;
+    }, BaseObjectConfig>>;
     /**
      * @description: 开始绘制圆柱
      */
-    createCylinder(params?: Parameters<Cylinder['create']>[0]): Promise<BaseObject<any, any, BaseObjectConfig>>;
+    createCylinder(params?: Parameters<Cylinder['create']>[0]): Promise<BaseObject<any, {
+        [x: string]: any;
+        id: string | number;
+    }, BaseObjectConfig>>;
     /**
      * @description: 开始绘制 Box
      */
-    createBox(params?: Parameters<Box['create']>[0]): Promise<BaseObject<any, any, BaseObjectConfig>>;
+    createBox(params?: Parameters<Box['create']>[0]): Promise<BaseObject<any, {
+        [x: string]: any;
+        id: string | number;
+    }, BaseObjectConfig>>;
     /**
      * @description: 撤销
      */

package/libs/Sculpt/index.js

@@ -42,8 +42,8 @@ import { Polyline as w } from "./Objects/Polyline/index.js";
 import { Point as I } from "./Objects/Point/index.js";
 import { Polygon as P } from "./Objects/Polygon/index.js";
 import { Prism as b } from "./Objects/Prism/index.js";
-import { Rectangle as C } from "./Objects/Rectangle/index.js";
-import { Circle as v } from "./Objects/Circle/index.js";
+import { Rectangle as v } from "./Objects/Rectangle/index.js";
+import { Circle as C } from "./Objects/Circle/index.js";
 import { Cylinder as j } from "./Objects/Cylinder/index.js";
 import { Box as x } from "./Objects/Box/index.js";
 const h = class extends E {
@@ -52,7 +52,7 @@ const h = class extends E {
     a(this, "group");
     a(this, "five");
     a(this, "theme");
-    console.log(e), this.five = e, this.theme = t, this.group = new L(), this.group.name = "Sculpt", e.scene.add(this.group), h.modules.init(e), h.modules.fiveDomEvents.addEventListener(this.group, "click", ({ intersects: o }) => {
+    this.five = e, this.theme = t, this.group = new L(), this.group.name = "Sculpt", e.scene.add(this.group), h.modules.init(e), h.modules.fiveDomEvents.addEventListener(this.group, "click", ({ intersects: o }) => {
       var s;
       const l = S((s = o == null ? void 0 : o[0]) == null ? void 0 : s.object, (n) => n.isSculptObject);
       return l ? this.emit("click", l) : !1;
@@ -83,7 +83,7 @@ const h = class extends E {
       const n = g(r({}, s), {
         style: r(r({}, (c = this.theme) == null ? void 0 : c[s.type.toLowerCase()]), s.style)
       });
-      return s.type === "Point" ? new I(n, t) : s.type === "Polyline" ? new w(n, t) : s.type === "Polygon" ? new P(n, t) : s.type === "Prism" ? new b(n, t) : s.type === "Rectangle" ? new C(n, t) : s.type === "Circle" ? new v(n, t) : s.type === "Cylinder" ? new j(n, t) : s.type === "Box" ? new x(n, t) : null;
+      return s.type === "Point" ? new I(n, t) : s.type === "Polyline" ? new w(n, t) : s.type === "Polygon" ? new P(n, t) : s.type === "Prism" ? new b(n, t) : s.type === "Rectangle" ? new v(n, t) : s.type === "Circle" ? new C(n, t) : s.type === "Cylinder" ? new j(n, t) : s.type === "Box" ? new x(n, t) : null;
     });
     this.group.add(...o), this.needsRender();
   }
@@ -144,7 +144,7 @@ const h = class extends E {
   createRectangle(e) {
     return u(this, null, function* () {
       var t;
-      return this.createItem(C, r(r({}, (t = this.theme) == null ? void 0 : t.rectangle), e));
+      return this.createItem(v, r(r({}, (t = this.theme) == null ? void 0 : t.rectangle), e));
     });
   }
   /**
@@ -153,7 +153,7 @@ const h = class extends E {
   createCircle(e) {
     return u(this, null, function* () {
       var t;
-      return this.createItem(v, r(r({}, (t = this.theme) == null ? void 0 : t.circle), e));
+      return this.createItem(C, r(r({}, (t = this.theme) == null ? void 0 : t.circle), e));
     });
   }
   /**

package/libs/Sculpt/typings/utils.type.d.ts

@@ -1,7 +1,10 @@
 import type * as THREE from 'three';
-import type { LiteralUnion, UnknownArray } from 'type-fest';
+import type { LiteralUnion, Merge, UnknownArray } from 'type-fest';
 import type { IsNull, NonRecursiveType } from 'type-fest/source/internal';
 export type LiteralString<T> = LiteralUnion<T, string>;
+export type ImportDataToExportData<T> = Merge<JsonData<T>, {
+    id: string | number;
+}>;
 export type JsonVector3<T> = ReplaceDeep<T, THREE.Vector3, number[]>;
 export type JsonColor<T> = ReplaceDeep<T, THREE.Color>;
 export type JsonData<T> = JsonColor<JsonVector3<T>>;

package/libs/base/BasePlugin.d.ts

@@ -84,11 +84,11 @@ declare abstract class Controller<PluginState extends State, PluginEventMap exte
     /**
      * 展示UI
      */
-    show?(options?: BaseOptions): Promise<void>;
+    show?(options?: BaseOptions): Promise<void> | void;
     /**
      * 隐藏UI
      */
-    hide?(options?: BaseOptions): Promise<void>;
+    hide?(options?: BaseOptions): Promise<void> | void;
     /**
      * 设置state
      * @param state 插件的目标状态

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let b = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.21.1");
+    i(this, "VERSION", "3.22.0");
     i(this, "five");
     /**
      * @description: 插件事件钩子

package/libs/base/BasePluginWithData.d.ts

@@ -15,8 +15,6 @@ declare abstract class Controller<PluginState extends State, PluginEventMap exte
      * @param state 插件 State
      */
     abstract load(serverData: PluginServerData, state?: PluginState, userAction?: boolean): Promise<void>;
-    /** 把原始数据转化为插件数据 */
-    protected abstract formatData?(serverData: PluginServerData): Promise<PluginData> | PluginData;
 }
 export type { State, EventMap, Config };
 export type { BaseOptions } from './BasePlugin';

package/libs/index.d.ts

@@ -25,4 +25,5 @@ export * from './PipelinePlugin';
 export * from './AreaMakerPlugin';
 export * from './CurrentPanoImagePlugin';
 export * from './Sculpt';
+export * from './ModelMakerPlugin';
 export * as Util from './shared-utils';