@realsee/dnalogel 3.64.10-alpha.1 → 3.64.10-alpha.2

package/libs/ModelMakerPlugin/Controller.js

@@ -1,7 +1,7 @@
-var k = Object.defineProperty;
+var W = Object.defineProperty;
 var T = Object.getOwnPropertySymbols;
 var P = Object.prototype.hasOwnProperty, S = Object.prototype.propertyIsEnumerable;
-var b = (l, p, e) => p in l ? k(l, p, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[p] = e, E = (l, p) => {
+var b = (l, p, e) => p in l ? W(l, p, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[p] = e, E = (l, p) => {
   for (var e in p || (p = {}))
     P.call(p, e) && b(l, e, p[e]);
   if (T)
@@ -31,7 +31,7 @@ import * as d from "three";
 import { ModelMakerBoxItem as j } from "./item/boxItem.js";
 import { PrismMesh as F } from "../Sculpt/Meshes/Prism.js";
 import { anyPositionToVector3 as L } from "../shared-utils/positionToVector3.js";
-import { PolyhedronWithEdgeMesh as A } from "../Sculpt/Meshes/PolyhedronWithEdge.js";
+import { PolygonWithEdgeMesh as A } from "../Sculpt/Meshes/PolygonWithEdge.js";
 import "../shared-utils/tag.js";
 import "../vendor/hammerjs/hammer.js";
 import "../shared-utils/three/PointSelector/index.js";
@@ -39,9 +39,9 @@ import "../shared-utils/three/CSS3DRenderer/index.js";
 import { waitFiveModelLoaded as H } from "../shared-utils/five/fiveModelLoad.js";
 import "../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "@realsee/five/line";
-import { notNil as y } from "../shared-utils/isNil.js";
+import { notNil as g } from "../shared-utils/isNil.js";
 import "../shared-utils/three/core/Five_LineMaterial2.js";
-import { boxVertex as g } from "../shared-utils/three/boundingBox.js";
+import { boxVertex as y } from "../shared-utils/three/boundingBox.js";
 import "../vendor/animejs/lib/anime.es.js";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../shared-utils/five/FivePuppet.js";
@@ -88,11 +88,9 @@ import "../Sculpt/Meshes/Polyline.js";
 import "../Sculpt/Meshes/LineWithDots.js";
 import "../Sculpt/Meshes/Point.js";
 import "../shared-utils/three/closeVectors.js";
-import "../Sculpt/Meshes/Polyhedron.js";
 import "../Sculpt/Meshes/Polygon.js";
 import "../shared-utils/three/generatePolygonGeometry.js";
 import "../PanoMeasurePlugin/utils/isIntersecting.js";
-import "../shared-utils/three/generatePolyhedronGeometry.js";
 import "../shared-utils/five/vector3ToScreen.js";
 import "../shared-utils/three/temp.js";
 import "../shared-utils/dom/resizeObserver.js";
@@ -124,7 +122,7 @@ import "../components/AreaLabel/Assets/roomLabelBg.js";
 import "../shared-utils/math/rad2Deg.js";
 import "../shared-utils/five/FiveDomEvents.js";
 import "../shared-utils/five/calculateThreeMouse.js";
-class jt extends D {
+class St extends D {
   constructor(e, s) {
     var a, i;
     super(e);
@@ -207,7 +205,7 @@ class jt extends D {
         var n;
         if (i.type === "triangles") {
           const o = new A();
-          y(i.id) && (o.uuid = i.id.toString()), o.setPoints(i.object_data.points), o.setStyle(s(i)), this.fiveDomEvents.addEventListener(o, "hover", () => o.highlight()), this.fiveDomEvents.addEventListener(o, "unHover", () => o.unhighlight());
+          g(i.id) && (o.uuid = i.id.toString()), o.setPoints(i.object_data.points, { checkLinesIntersect: !1 }), o.setStyle(s(i)), this.fiveDomEvents.addEventListener(o, "hover", () => o.highlight()), this.fiveDomEvents.addEventListener(o, "unHover", () => o.unhighlight());
           const t = new B({
             five: this.five,
             tagWrapper: this.tagWrapper,
@@ -219,7 +217,7 @@ class jt extends D {
           this.items.push(t);
         } else if (i.type === "prism") {
           const o = new F();
-          y(i.id) && (o.uuid = i.id.toString()), this.zFightingOffset += Q.Z_FIGHTING_OFFSET;
+          g(i.id) && (o.uuid = i.id.toString()), this.zFightingOffset += Q.Z_FIGHTING_OFFSET;
           const t = i.object_data.points.map((m) => {
             var v;
             return [m[0], m[1] + ((v = i.object_data.fixedY) != null ? v : 0), m[2]];
@@ -238,13 +236,13 @@ class jt extends D {
           this.items.push(u);
         } else if (i.type === "box") {
           const o = new F();
-          y(i.id) && (o.uuid = i.id.toString());
+          g(i.id) && (o.uuid = i.id.toString());
           const { start: t, end: r, rotation: c = [0, 0, 0, 0] } = i.object_data, u = new d.Vector3().fromArray(t), m = new d.Vector3().fromArray(r), v = new d.Euler().fromArray(c), R = new d.Quaternion().setFromEuler(v), M = R.clone().inverse(), _ = new d.Vector3().lerpVectors(u, m, 0.5), C = _.clone().negate(), x = u.clone().add(C).applyQuaternion(M), V = m.clone().add(C).applyQuaternion(M), f = new d.Box3(x.clone().max(V), x.clone().min(V));
           o.setPoints({
-            points: [g(f, 2), g(f, 3), g(f, 7), g(f, 6)],
-            heightPoint: g(f, 1)
+            points: [y(f, 2), y(f, 3), y(f, 7), y(f, 6)],
+            heightPoint: y(f, 1)
           }), o.position.copy(_), o.quaternion.copy(R), o.setStyle(s(i));
-          const W = new j({
+          const k = new j({
             five: this.five,
             tagWrapper: this.tagWrapper,
             model: o,
@@ -252,13 +250,13 @@ class jt extends D {
             type: i.type,
             rawData: i
           });
-          this.items.push(W);
+          this.items.push(k);
         }
       }), this.state.enabled ? this.handleEnable() : this.handleDisable(), this.state.visible ? this.handleShow() : this.handleHide(), this.updateTagRenderer(), this.hooks.emit("dataLoaded", e), this.five.needsRender = !0;
     });
   }
   setState(e) {
-    y(e.enabled) && this.state.enabled !== e.enabled && (this.state.enabled = e.enabled, e.enabled ? this.handleEnable() : this.handleDisable(), this.hooks.emit(e.enabled ? "enable" : "disable", { userAction: "我不知道捏" }), this.hooks.emit("stateChange", { state: this.state, userAction: "我不知道捏" })), y(e.visible) && this.state.visible !== e.visible && (this.state.visible = e.visible, e.visible ? this.handleShow() : this.handleHide(), this.hooks.emit(e.visible ? "show" : "hide", { userAction: "我不知道捏" }), this.hooks.emit("stateChange", { state: this.state, userAction: "我不知道捏" }));
+    g(e.enabled) && this.state.enabled !== e.enabled && (this.state.enabled = e.enabled, e.enabled ? this.handleEnable() : this.handleDisable(), this.hooks.emit(e.enabled ? "enable" : "disable", { userAction: "我不知道捏" }), this.hooks.emit("stateChange", { state: this.state, userAction: "我不知道捏" })), g(e.visible) && this.state.visible !== e.visible && (this.state.visible = e.visible, e.visible ? this.handleShow() : this.handleHide(), this.hooks.emit(e.visible ? "show" : "hide", { userAction: "我不知道捏" }), this.hooks.emit("stateChange", { state: this.state, userAction: "我不知道捏" }));
   }
   getItemById(e) {
     return this.items.find((s) => s.rawData.id === e);
@@ -298,5 +296,5 @@ class jt extends D {
   }
 }
 export {
-  jt as Controller
+  St as Controller
 };

package/libs/ModelMakerPlugin/index.js

@@ -77,16 +77,14 @@ import "../shared-utils/three/earcut3D.js";
 import "../vendor/earcut/src/earcut.js";
 import "../shared-utils/three/getNormal.js";
 import "../shared-utils/three/geometryUtil.js";
-import "../Sculpt/Meshes/PolyhedronWithEdge.js";
+import "../Sculpt/Meshes/PolygonWithEdge.js";
 import "../Sculpt/Meshes/Polyline.js";
 import "../Sculpt/Meshes/LineWithDots.js";
 import "../Sculpt/Meshes/Point.js";
 import "../shared-utils/three/closeVectors.js";
-import "../Sculpt/Meshes/Polyhedron.js";
 import "../Sculpt/Meshes/Polygon.js";
 import "../shared-utils/three/generatePolygonGeometry.js";
 import "../PanoMeasurePlugin/utils/isIntersecting.js";
-import "../shared-utils/three/generatePolyhedronGeometry.js";
 import "./utils/tagRenderer.js";
 import "./utils/Text.js";
 import "../vendor/svelte/internal/index.js";
@@ -97,7 +95,7 @@ import "./item/prismItem.js";
 import "./item/polygonItem.js";
 import "../CruisePlugin/utils/sleep.js";
 import "../shared-utils/constants.js";
-const Wo = (...o) => new r(...o);
+const Uo = (...o) => new r(...o);
 export {
-  Wo as ModelMakerPlugin
+  Uo as ModelMakerPlugin
 };

package/libs/Sculpt/Meshes/Polygon.d.ts

@@ -37,7 +37,9 @@ export declare class PolygonMesh extends ColoredMesh<THREE.BufferGeometry> {
     constructor(params?: Partial<PolygonStyle & PolygonData>);
     updateMatrixWorld(force?: boolean): void;
     setStyle(params: Partial<ColoredMeshStyle>): void;
-    setPoints(points: AnyPositions): void;
+    setPoints(points: AnyPositions, config?: {
+        checkLinesIntersect?: boolean;
+    }): void;
     /**
      * @description: 获取一个点投影在当前平面上的点
      */

package/libs/Sculpt/Meshes/Polygon.js

@@ -2,21 +2,21 @@ var g = Object.defineProperty, I = Object.defineProperties;
 var D = Object.getOwnPropertyDescriptors;
 var y = Object.getOwnPropertySymbols;
 var _ = Object.prototype.hasOwnProperty, H = Object.prototype.propertyIsEnumerable;
-var m = (r, t, e) => t in r ? g(r, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[t] = e, l = (r, t) => {
+var p = (o, t, e) => t in o ? g(o, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[t] = e, h = (o, t) => {
   for (var e in t || (t = {}))
-    _.call(t, e) && m(r, e, t[e]);
+    _.call(t, e) && p(o, e, t[e]);
   if (y)
     for (var e of y(t))
-      H.call(t, e) && m(r, e, t[e]);
-  return r;
-}, f = (r, t) => I(r, D(t));
-var i = (r, t, e) => (m(r, typeof t != "symbol" ? t + "" : t, e), e);
+      H.call(t, e) && p(o, e, t[e]);
+  return o;
+}, u = (o, t) => I(o, D(t));
+var i = (o, t, e) => (p(o, typeof t != "symbol" ? t + "" : t, e), e);
 import * as a from "three";
 import { generatePolygonGeometry as S } from "../../shared-utils/three/generatePolygonGeometry.js";
 import { anyPositionToVector3 as b } from "../../shared-utils/positionToVector3.js";
 import { ColoredMesh as v } from "../utils/three/ColoredMesh.js";
-import { getGeometryInfo as P } from "../../shared-utils/three/geometryUtil.js";
-import { LightTag as k } from "../../shared-utils/tag.js";
+import { getGeometryInfo as k } from "../../shared-utils/three/geometryUtil.js";
+import { LightTag as P } from "../../shared-utils/tag.js";
 import { getLengthHTML as w } from "../utils/Meshes/getLengthHTML.js";
 import { localToWorld as A } from "../../shared-utils/three/applyObjectMatrixWorld.js";
 import "../../vendor/hammerjs/hammer.js";
@@ -26,15 +26,15 @@ import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "@realsee/five/line";
 import { notNil as U } from "../../shared-utils/isNil.js";
 import "../../shared-utils/three/core/Five_LineMaterial2.js";
-import { transformUnitSquare as M } from "../utils/unit.js";
-import { RenderDom as h } from "../utils/renderDom.js";
+import { transformUnitSquare as L } from "../utils/unit.js";
+import { RenderDom as m } from "../utils/renderDom.js";
 import "../../shared-utils/three/core/Sphere.js";
 import "../../vendor/animejs/lib/anime.es.js";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../shared-utils/five/FivePuppet.js";
-const p = new a.BufferGeometry();
-p.name = "blankGeometry";
-p.isBlank = !0;
+const d = new a.BufferGeometry();
+d.name = "blankGeometry";
+d.isBlank = !0;
 class Y extends v {
   constructor(e) {
     super(e);
@@ -61,16 +61,16 @@ class Y extends v {
       this.areaDom && (this.areaDom.container.style.display = "none");
     });
     e != null && e.points && this.setPoints(e.points), this._paramsStyle = e != null ? e : {}, this.updateAreaItems(), this.addEventListener("removed", () => {
-      h.cacheObject.delete(this), h.checkDom(this);
+      m.cacheObject.delete(this), m.checkDom(this);
     }), this.addEventListener("added", () => {
-      h.cacheObject.add(this);
-    }), h.checkDomEveryFrame();
+      m.cacheObject.add(this);
+    }), m.checkDomEveryFrame();
   }
   get normal() {
     return this.points.length >= 3 ? new a.Vector3().crossVectors(this.points[1].clone().sub(this.points[0]), this.points[2].clone().sub(this.points[0])).normalize() : new a.Vector3(0, 0, 1);
   }
   get style() {
-    return f(l({}, super.style), { lengthEnable: this._paramsStyle.lengthEnable });
+    return u(h({}, super.style), { lengthEnable: this._paramsStyle.lengthEnable });
   }
   get isBlank() {
     return !!this.geometry.isBlank;
@@ -80,28 +80,28 @@ class Y extends v {
     return (e = this.geometryInfo) == null ? void 0 : e.center.clone();
   }
   get geometryInfo() {
-    return this.geometryInfoNeedUpdate && (this.isBlank ? this._geometryInfo = null : this._geometryInfo = P(this.geometry), this.geometryInfoNeedUpdate = !1), this._geometryInfo;
+    return this.geometryInfoNeedUpdate && (this.isBlank ? this._geometryInfo = null : this._geometryInfo = k(this.geometry), this.geometryInfoNeedUpdate = !1), this._geometryInfo;
   }
   get five() {
-    var e, o;
-    return (o = (e = window.globalModules) == null ? void 0 : e.five) != null ? o : window.$five;
+    var e, r;
+    return (r = (e = window.globalModules) == null ? void 0 : e.five) != null ? r : window.$five;
   }
   updateMatrixWorld(e) {
     if (super.updateMatrixWorld(e), this.center) {
-      const o = A(this, this.center).toArray().join(",");
-      o !== this.lastRenderAreaItem && (this.updateAreaItems(), this.lastRenderAreaItem = o);
+      const r = A(this, this.center).toArray().join(",");
+      r !== this.lastRenderAreaItem && (this.updateAreaItems(), this.lastRenderAreaItem = r);
     }
   }
   setStyle(e) {
-    var s;
-    this._paramsStyle = l(l({}, this._paramsStyle), e), super.setStyle(this._paramsStyle);
-    const o = (s = this._paramsStyle.occlusionVisibility) != null ? s : !0;
-    this.areaDom && (this.areaDom.intersectCheck = !o), this.updateAreaItems();
+    var n;
+    this._paramsStyle = h(h({}, this._paramsStyle), e), super.setStyle(this._paramsStyle);
+    const r = (n = this._paramsStyle.occlusionVisibility) != null ? n : !0;
+    this.areaDom && (this.areaDom.intersectCheck = !r), this.updateAreaItems();
   }
-  setPoints(e) {
-    var s;
-    const o = e.map(b);
-    this.points = o, this.geometry = (s = S(this.points, { checkLinesIntersect: !0 })) != null ? s : p, this.planeHelperNeedUpdate = !0, this.geometryInfoNeedUpdate = !0, this.updateAreaItems();
+  setPoints(e, r) {
+    var l, s;
+    const n = e.map(b);
+    this.points = n, this.geometry = (s = S(this.points, { checkLinesIntersect: (l = r == null ? void 0 : r.checkLinesIntersect) != null ? l : !0 })) != null ? s : d, this.planeHelperNeedUpdate = !0, this.geometryInfoNeedUpdate = !0, this.updateAreaItems();
   }
   /**
    * @description: 获取一个点投影在当前平面上的点
@@ -113,27 +113,26 @@ class Y extends v {
     this.points.length >= 3 ? this.planeHelper = new a.Plane().setFromCoplanarPoints(this.points[0], this.points[1], this.points[2]) : this.planeHelper = null, this.planeHelperNeedUpdate = !1;
   }
   updateAreaItems() {
-    var s, c;
+    var n, l;
     const e = () => {
-      var n;
-      (n = this.areaDom) == null || n.destroy(), this.areaDom = void 0;
+      var s;
+      (s = this.areaDom) == null || s.destroy(), this.areaDom = void 0;
     };
     if (!this._paramsStyle.lengthEnable || !this.geometryInfo)
       return e();
     if (!this.five)
       return console.error("Five not found");
-    this.areaDom = (s = this.areaDom) != null ? s : (() => {
-      var d;
-      const n = new k(this.five), u = (d = this._paramsStyle.occlusionVisibility) != null ? d : !0;
-      return n.intersectCheck = !u, n.simulate3D = !0, n;
+    this.areaDom = (n = this.areaDom) != null ? n : (() => {
+      var c;
+      const s = new P(this.five), f = (c = this._paramsStyle.occlusionVisibility) != null ? c : !0;
+      return s.intersectCheck = !f, s.simulate3D = !0, s;
     })(), this.areaDom.setPosition(this.center);
-    const o = M(this.geometryInfo.area, this._paramsStyle.lengthUnit);
-    o ? this.areaDom.container.innerHTML = w(o, {
-      style: `color: #${U((c = this.style) == null ? void 0 : c.color) ? new a.Color(this.style.color).getHexString() : "000000"}`
+    const r = L(this.geometryInfo.area, this._paramsStyle.lengthUnit);
+    r ? this.areaDom.container.innerHTML = w(r, {
+      style: `color: #${U((l = this.style) == null ? void 0 : l.color) ? new a.Color(this.style.color).getHexString() : "000000"}`
     }) : this.areaDom.container.innerHTML = "";
   }
 }
 export {
-  Y as PolygonMesh,
-  p as blankGeometry
+  Y as PolygonMesh
 };

package/libs/Sculpt/Meshes/PolygonWithEdge.d.ts

@@ -24,7 +24,8 @@ export declare class PolygonWithEdgeMesh extends PolygonMesh {
     constructor(params?: Partial<PolygonWithEdgeMeshStyle & PolygonData>);
     raycast(raycaster: THREE.Raycaster, intersects: THREE.Intersection[]): boolean;
     setPoints(points: AnyPositions, params?: {
-        closed: boolean;
+        closed?: boolean;
+        checkLinesIntersect?: boolean;
     }): void;
     setStyle(style: Partial<PolygonWithEdgeMeshStyle>): void;
     highlight(): void;

package/libs/Sculpt/Meshes/PolygonWithEdge.js

@@ -1,38 +1,38 @@
 var f = Object.defineProperty, p = Object.defineProperties;
 var P = Object.getOwnPropertyDescriptors;
-var n = Object.getOwnPropertySymbols;
-var g = Object.prototype.hasOwnProperty, u = Object.prototype.propertyIsEnumerable;
-var l = (i, e, t) => e in i ? f(i, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : i[e] = t, d = (i, e) => {
+var l = Object.getOwnPropertySymbols;
+var u = Object.prototype.hasOwnProperty, d = Object.prototype.propertyIsEnumerable;
+var o = (i, e, t) => e in i ? f(i, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : i[e] = t, n = (i, e) => {
   for (var t in e || (e = {}))
-    g.call(e, t) && l(i, t, e[t]);
-  if (n)
-    for (var t of n(e))
-      u.call(e, t) && l(i, t, e[t]);
+    u.call(e, t) && o(i, t, e[t]);
+  if (l)
+    for (var t of l(e))
+      d.call(e, t) && o(i, t, e[t]);
   return i;
 }, y = (i, e) => p(i, P(e));
 var c = (i, e) => {
   var t = {};
   for (var s in i)
-    g.call(i, s) && e.indexOf(s) < 0 && (t[s] = i[s]);
-  if (i != null && n)
-    for (var s of n(i))
-      e.indexOf(s) < 0 && u.call(i, s) && (t[s] = i[s]);
+    u.call(i, s) && e.indexOf(s) < 0 && (t[s] = i[s]);
+  if (i != null && l)
+    for (var s of l(i))
+      e.indexOf(s) < 0 && d.call(i, s) && (t[s] = i[s]);
   return t;
 };
-var o = (i, e, t) => (l(i, typeof e != "symbol" ? e + "" : e, t), t);
+var r = (i, e, t) => (o(i, typeof e != "symbol" ? e + "" : e, t), t);
 import { PolylineMesh as W } from "./Polyline.js";
 import { PolygonMesh as C } from "./Polygon.js";
 import { intersectWithoutLine as E } from "../../shared-utils/three/core/Raycaster.js";
 class w extends C {
   constructor(t) {
-    const r = t != null ? t : {}, { points: s } = r, h = c(r, ["points"]);
+    const g = t != null ? t : {}, { points: s } = g, h = c(g, ["points"]);
     super();
-    o(this, "name", "PolygonWithEdgeMesh");
-    o(this, "line", new W());
+    r(this, "name", "PolygonWithEdgeMesh");
+    r(this, "line", new W());
     s && this.setPoints(s), h && this.setStyle(h);
   }
   get style() {
-    return y(d({}, super.style), {
+    return y(n({}, super.style), {
       lineWidth: this.lineWidth,
       lineColor: this.lineColor
     });
@@ -48,8 +48,8 @@ class w extends C {
       E(h, t, s, !0);
     }), !1;
   }
-  setPoints(t, s = { closed: !0 }) {
-    super.setPoints(t), this.points && (this.line.setPoints(this.points, s), this.addIfNotExists(this.line));
+  setPoints(t, s) {
+    super.setPoints(t, n({ closed: !0 }, s)), this.points && (this.line.setPoints(this.points, n({ closed: !0 }, s)), this.addIfNotExists(this.line));
   }
   setStyle(t) {
     super.setStyle(t), this.line.setStyle(t);

package/libs/base/BasePlugin.js

@@ -21,7 +21,7 @@ let E = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.64.10-alpha.1");
+    i(this, "VERSION", "3.64.10-alpha.2");
     i(this, "NAME");
     i(this, "five");
     i(this, "workUtil");