@realsee/dnalogel 3.21.2 → 3.23.0

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.2");
+    i(this, "VERSION", "3.23.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/components/AreaLabel/LabelItem.js

@@ -1,82 +1,82 @@
-import { SvelteComponent as p, init as C, safe_not_equal as I, append_styles as L, element as v, attr as k, set_style as f, insert as b, noop as y, detach as _, onMount as x, onDestroy as B, text as M, space as O, toggle_class as z, append as j, listen as A, is_function as D, set_data as E, binding_callbacks as G } from "../../vendor/svelte/internal/index.js";
-import { ROOM_LABEL_BG as R } from "./Assets/roomLabelBg.js";
-function S(n) {
-  L(n, "svelte-qxepni", ".room-label-item.svelte-qxepni{position:absolute;font-size:0.5rem;z-index:0;transform:none;cursor:pointer;pointer-events:none;-webkit-user-select:none;-moz-user-select:none;user-select:none;color:#fff}.room-label-item__text.svelte-qxepni{position:absolute;left:0;top:-4rem;transform:translate(-50%, 0);display:flex;justify-content:center;align-items:center;height:1.25rem;min-width:2rem;padding:0 0.375rem;pointer-events:all;background-size:100% 100%;background-repeat:no-repeat;white-space:nowrap}.room-label-item__bar.svelte-qxepni{position:absolute;top:-2.75rem;height:3rem;width:0.0625rem;background-image:linear-gradient(to bottom, rgba(255, 255, 255, 1), rgba(255, 255, 255, 0))}.wide.svelte-qxepni{font-size:0.625rem}");
+import { SvelteComponent as w, init as C, safe_not_equal as D, append_styles as N, element as v, attr as k, set_style as f, insert as b, noop as y, detach as _, onMount as L, onDestroy as B, text as M, space as O, toggle_class as z, append as q, listen as A, is_function as E, set_data as G, binding_callbacks as R } from "../../vendor/svelte/internal/index.js";
+import { ROOM_LABEL_BG as S } from "./Assets/roomLabelBg.js";
+function F(i) {
+  N(i, "svelte-1s88cj8", ".room-label-item.svelte-1s88cj8{position:absolute;font-size:0.5rem;transform:none;cursor:pointer;pointer-events:none;-webkit-user-select:none;-moz-user-select:none;user-select:none;color:#fff}.room-label-item__text.svelte-1s88cj8{position:absolute;left:0;top:-4rem;transform:translate(-50%, 0);display:flex;justify-content:center;align-items:center;height:1.25rem;min-width:2rem;padding:0 0.375rem;pointer-events:all;background-size:100% 100%;background-repeat:no-repeat;white-space:nowrap}.room-label-item__bar.svelte-1s88cj8{position:absolute;top:-2.75rem;height:3rem;width:0.0625rem;background-image:linear-gradient(to bottom, rgba(255, 255, 255, 1), rgba(255, 255, 255, 0))}.wide.svelte-1s88cj8{font-size:0.625rem}");
 }
-function q(n) {
-  let e, i, l, o, a, m;
+function j(i) {
+  let e, n, l, o, a, m;
   return {
     c() {
-      e = v("span"), i = M(
+      e = v("span"), n = M(
         /*content*/
-        n[0]
-      ), l = O(), o = v("div"), k(e, "class", "room-label-item__text svelte-qxepni"), f(e, "background-image", "url(" + R + ")"), z(
+        i[0]
+      ), l = O(), o = v("div"), k(e, "class", "room-label-item__text svelte-1s88cj8"), f(e, "background-image", "url(" + S + ")"), z(
         e,
         "wide",
         /*content*/
-        n[0].length > 3
-      ), k(o, "class", "room-label-item__bar svelte-qxepni");
+        i[0].length > 3
+      ), k(o, "class", "room-label-item__bar svelte-1s88cj8");
     },
-    m(s, r) {
-      b(s, e, r), j(e, i), b(s, l, r), b(s, o, r), a || (m = A(e, "click", function() {
-        D(
+    m(r, s) {
+      b(r, e, s), q(e, n), b(r, l, s), b(r, o, s), a || (m = A(e, "click", function() {
+        E(
           /*onClick*/
-          n[4]
-        ) && n[4].apply(this, arguments);
+          i[4]
+        ) && i[4].apply(this, arguments);
       }), a = !0);
     },
-    p(s, r) {
-      n = s, r & /*content*/
-      1 && E(
-        i,
+    p(r, s) {
+      i = r, s & /*content*/
+      1 && G(
+        n,
         /*content*/
-        n[0]
-      ), r & /*content*/
+        i[0]
+      ), s & /*content*/
       1 && z(
         e,
         "wide",
         /*content*/
-        n[0].length > 3
+        i[0].length > 3
       );
     },
-    d(s) {
-      s && _(e), s && _(l), s && _(o), a = !1, m();
+    d(r) {
+      r && _(e), r && _(l), r && _(o), a = !1, m();
     }
   };
 }
-function F(n) {
-  let e, i = !/*renderer*/
-  n[5] && q(n);
+function H(i) {
+  let e, n = !/*rendererIfNeed*/
+  i[5] && j(i);
   return {
     c() {
-      e = v("div"), i && i.c(), k(e, "class", "room-label-item svelte-qxepni"), f(
+      e = v("div"), n && n.c(), k(e, "class", "room-label-item svelte-1s88cj8"), f(
         e,
         "z-index",
         /*zIndex*/
-        n[2]
+        i[2]
       ), f(
         e,
         "transform",
         /*transform*/
-        n[3]
+        i[3]
       ), f(
         e,
         "opacity",
         /*opacity*/
-        n[1]
+        i[1]
       ), f(
         e,
         "visibility",
         /*visibility*/
-        n[7]
+        i[7]
       );
     },
     m(l, o) {
-      b(l, e, o), i && i.m(e, null), n[10](e);
+      b(l, e, o), n && n.m(e, null), i[10](e);
     },
     p(l, [o]) {
-      /*renderer*/
-      l[5] ? i && (i.d(1), i = null) : i ? i.p(l, o) : (i = q(l), i.c(), i.m(e, null)), o & /*zIndex*/
+      /*rendererIfNeed*/
+      l[5] ? n && (n.d(1), n = null) : n ? n.p(l, o) : (n = j(l), n.c(), n.m(e, null)), o & /*zIndex*/
       4 && f(
         e,
         "z-index",
@@ -105,50 +105,50 @@ function F(n) {
     i: y,
     o: y,
     d(l) {
-      l && _(e), i && i.d(), n[10](null);
+      l && _(e), n && n.d(), i[10](null);
     }
   };
 }
-function H(n, e, i) {
-  let l, { content: o } = e, { visible: a } = e, { opacity: m = 1 } = e, { zIndex: s = 0 } = e, { transform: r } = e, { onClick: h = () => {
-  } } = e, { renderer: c } = e, { data: g } = e, u, d;
-  x(() => {
-    u && typeof c == "function" && (d = c(u, g));
+function J(i, e, n) {
+  let l, { content: o } = e, { visible: a = !0 } = e, { opacity: m = 1 } = e, { zIndex: r = 0 } = e, { transform: s = void 0 } = e, { onClick: h = () => {
+  } } = e, { rendererIfNeed: c = void 0 } = e, { rendererData: g = void 0 } = e, d, u;
+  L(() => {
+    d && typeof c == "function" && (u = c(d, g));
   }), B(() => {
-    d == null || d();
+    u == null || u();
   });
-  function w(t) {
-    G[t ? "unshift" : "push"](() => {
-      u = t, i(6, u);
+  function I(t) {
+    R[t ? "unshift" : "push"](() => {
+      d = t, n(6, d);
     });
   }
-  return n.$$set = (t) => {
-    "content" in t && i(0, o = t.content), "visible" in t && i(8, a = t.visible), "opacity" in t && i(1, m = t.opacity), "zIndex" in t && i(2, s = t.zIndex), "transform" in t && i(3, r = t.transform), "onClick" in t && i(4, h = t.onClick), "renderer" in t && i(5, c = t.renderer), "data" in t && i(9, g = t.data);
-  }, n.$$.update = () => {
-    n.$$.dirty & /*visible*/
-    256 && i(7, l = a ? "visible" : "hidden");
+  return i.$$set = (t) => {
+    "content" in t && n(0, o = t.content), "visible" in t && n(8, a = t.visible), "opacity" in t && n(1, m = t.opacity), "zIndex" in t && n(2, r = t.zIndex), "transform" in t && n(3, s = t.transform), "onClick" in t && n(4, h = t.onClick), "rendererIfNeed" in t && n(5, c = t.rendererIfNeed), "rendererData" in t && n(9, g = t.rendererData);
+  }, i.$$.update = () => {
+    i.$$.dirty & /*visible*/
+    256 && n(7, l = a ? "visible" : "hidden");
   }, [
     o,
     m,
-    s,
     r,
+    s,
     h,
     c,
-    u,
+    d,
     l,
     a,
     g,
-    w
+    I
   ];
 }
-class N extends p {
+class Q extends w {
   constructor(e) {
     super(), C(
       this,
       e,
+      J,
       H,
-      F,
-      I,
+      D,
       {
         content: 0,
         visible: 8,
@@ -156,13 +156,13 @@ class N extends p {
         zIndex: 2,
         transform: 3,
         onClick: 4,
-        renderer: 5,
-        data: 9
+        rendererIfNeed: 5,
+        rendererData: 9
       },
-      S
+      F
     );
   }
 }
 export {
-  N as LabelItem
+  Q as LabelItem
 };

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';