@realsee/dnalogel 3.77.1 → 3.77.2-alpha.0

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

@@ -2,34 +2,34 @@ var q = Object.defineProperty, G = Object.defineProperties;
 var J = Object.getOwnPropertyDescriptors;
 var W = Object.getOwnPropertySymbols;
 var K = Object.prototype.hasOwnProperty, Q = Object.prototype.propertyIsEnumerable;
-var T = (s, t, e) => t in s ? q(s, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[t] = e, f = (s, t) => {
-  for (var e in t || (t = {}))
-    K.call(t, e) && T(s, e, t[e]);
+var T = (s, e, n) => e in s ? q(s, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : s[e] = n, p = (s, e) => {
+  for (var n in e || (e = {}))
+    K.call(e, n) && T(s, n, e[n]);
   if (W)
-    for (var e of W(t))
-      Q.call(t, e) && T(s, e, t[e]);
+    for (var n of W(e))
+      Q.call(e, n) && T(s, n, e[n]);
   return s;
-}, u = (s, t) => G(s, J(t));
-var z = (s, t, e) => (T(s, typeof t != "symbol" ? t + "" : t, e), e);
-var D = (s, t, e) => new Promise((i, m) => {
-  var w = (d) => {
+}, P = (s, e) => G(s, J(e));
+var N = (s, e, n) => (T(s, typeof e != "symbol" ? e + "" : e, n), n);
+var D = (s, e, n) => new Promise((a, f) => {
+  var u = (c) => {
     try {
-      a(e.next(d));
-    } catch (P) {
-      m(P);
+      i(n.next(c));
+    } catch (m) {
+      f(m);
     }
-  }, l = (d) => {
+  }, l = (c) => {
     try {
-      a(e.throw(d));
-    } catch (P) {
-      m(P);
+      i(n.throw(c));
+    } catch (m) {
+      f(m);
     }
-  }, a = (d) => d.done ? i(d.value) : Promise.resolve(d.value).then(w, l);
-  a((e = e.apply(s, t)).next());
+  }, i = (c) => c.done ? a(c.value) : Promise.resolve(c.value).then(u, l);
+  i((n = n.apply(s, e)).next());
 });
 import { BaseObject as X } from "../Base/index.js";
 import * as r from "three";
-import { PolylineWithDotsMesh as M } from "../../Meshes/Polyline.js";
+import { PolylineWithDotsMesh as L } from "../../Meshes/Polyline.js";
 import { RectangleMeshEditor as Y } from "../../Editors/RectangleMeshEditor.js";
 import { RectangleMesh as Z } from "../../Meshes/Rectangle.js";
 import { RectangleWithEdgeMesh as B } from "../../Meshes/RectangleWithEdge.js";
@@ -40,19 +40,19 @@ import { anyPositionToVector3 as j } from "../../../shared-utils/positionToVecto
 import { withResolvers as U } from "../../../shared-utils/promise/withResolvers.js";
 import { PolygonMesh as S } from "../../Meshes/Polygon.js";
 import { getNormal as ee } from "../../../shared-utils/three/getNormal.js";
-class ye extends X {
-  constructor(e, i) {
-    super(e, i);
-    z(this, "type", "Rectangle");
-    z(this, "rectangleMesh");
-    z(this, "_editor");
-    e && (this.rectangleMesh = new B(f(f({}, e.style), e)), this.add(this.rectangleMesh));
+class ge extends X {
+  constructor(n, a) {
+    super(n, a);
+    N(this, "type", "Rectangle");
+    N(this, "rectangleMesh");
+    N(this, "_editor");
+    n && (this.rectangleMesh = new B(p(p({}, n.style), n)), this.add(this.rectangleMesh));
   }
   get editor() {
     return this._editor || (this._editor = new Y(this.rectangleMesh)), this._editor;
   }
   get data() {
-    return u(f({}, this.baseData), {
+    return P(p({}, this.baseData), {
       points: $(this.applyObjectMatrixWorld(this.rectangleMesh.points, this.rectangleMesh)),
       style: {
         color: this.rectangleMesh.color.getHex(),
@@ -62,144 +62,142 @@ class ye extends X {
       }
     });
   }
-  setData(e) {
-    e.points && this.rectangleMesh.setPoints(this.applyObjectReversalMatrixWorld(e.points.map(j), this.rectangleMesh)), this.rectangleMesh.setStyle(e.style), this._editor && this._editor.initialHelperMatrix();
+  setData(n) {
+    n.points && this.rectangleMesh.setPoints(this.applyObjectReversalMatrixWorld(n.points.map(j), this.rectangleMesh)), this.rectangleMesh.setStyle(n.style), this._editor && this._editor.initialHelperMatrix();
   }
   highlight() {
-    var e;
-    (e = this.rectangleMesh) == null || e.highlight();
+    var n;
+    (n = this.rectangleMesh) == null || n.highlight();
   }
   unhighlight() {
-    var e;
-    (e = this.rectangleMesh) == null || e.unhighlight();
+    var n;
+    (n = this.rectangleMesh) == null || n.unhighlight();
   }
-  create(e) {
+  create(n) {
     return D(this, null, function* () {
       this.removeChildren();
-      const i = new B(e);
-      this.rectangleMesh = i, this.add(this.rectangleMesh), yield te(this.rectangleMesh, this.pointSelector, e), this.config.defaultAction && this.editor.enable();
+      const a = new B(n);
+      this.rectangleMesh = a, this.add(this.rectangleMesh), yield te(this.rectangleMesh, this.pointSelector, n), this.config.defaultAction && this.editor.enable();
     });
   }
 }
-function te(s, t, e) {
-  var m;
-  return ((m = e == null ? void 0 : e.drawMethod) != null ? m : "diagonal") === "diagonal" ? se(s, t, e) : oe(s, t, e);
+function te(s, e, n) {
+  var f;
+  return ((f = n == null ? void 0 : n.drawMethod) != null ? f : "diagonal") === "diagonal" ? se(s, e, n) : oe(s, e, n);
 }
-function ne(s, t) {
-  const e = [];
-  return s.scene.traverse((i) => {
-    var m;
-    if (i.visible && !((m = t == null ? void 0 : t.excludes) != null && m.includes(i)) && (i instanceof Z || i instanceof S)) {
-      const w = i.points.map((l) => {
-        const a = new r.Face3(l.x, l.y, l.z, i.normal);
-        return i.style.occlusionVisibility && (a.IsAlwaysVisible = !0), a;
+function ne(s, e) {
+  const n = [];
+  return s.scene.traverse((a) => {
+    var f;
+    if (a.visible && !((f = e == null ? void 0 : e.excludes) != null && f.includes(a)) && (a instanceof Z || a instanceof S)) {
+      const u = a.points.map((l) => {
+        const i = new r.Face3(l.x, l.y, l.z, a.normal);
+        return a.style.occlusionVisibility && (i.IsAlwaysVisible = !0), i;
       });
-      e.push(...w);
+      n.push(...u);
     }
-  }), e;
+  }), n;
 }
-function se(s, t, e) {
-  var A;
-  const { promise: i, reject: m, resolve: w } = U(), l = s.parent;
+function se(s, e, n) {
+  var C;
+  const { promise: a, reject: f, resolve: u } = U(), l = s.parent;
   if (!l)
-    return m(new Error("No container"));
-  const a = (A = e == null ? void 0 : e.limit) != null ? A : "none", d = new M(u(f({}, s.style), { dashed: !0 })), P = new M(u(f({}, s.style), { dashed: !0, lengthEnable: !1 })), y = new M(u(f({}, s.style), { dashed: !1, lengthEnable: !1 }));
-  l.add(d, y, P), t.enable();
-  const n = [];
-  let h = new r.Vector3(), b = new r.Vector3();
-  const c = new r.Plane(), x = () => {
-    var o;
-    n.push(h.clone()), (o = e == null ? void 0 : e.onPointPlaced) == null || o.call(e), n.length === 1 ? (a === "xoz" && c.setFromNormalAndCoplanarPoint(new r.Vector3(0, 1, 0), n[0]), a === "none" && c.setFromNormalAndCoplanarPoint(b, n[0])) : n.length === 2 ? a === "y" || a === "xoz" ? (v(), w()) : y.setPoints([n[0], n[1]]) : n.length === 3 && (v(), w());
-  }, E = (o) => {
-    var R, N;
+    return f(new Error("No container"));
+  const i = (C = n == null ? void 0 : n.limit) != null ? C : "none", c = new L(P(p({}, s.style), { dashed: !0 })), m = new L(P(p({}, s.style), { dashed: !0, lengthEnable: !1 })), g = new L(P(p({}, s.style), { dashed: !1, lengthEnable: !1 }));
+  l.add(c, g, m), e.enable();
+  const t = [];
+  let d = new r.Vector3(), M = new r.Vector3();
+  const h = new r.Plane(), b = () => {
+    t.push(d.clone()), t.length === 1 ? (i === "xoz" && h.setFromNormalAndCoplanarPoint(new r.Vector3(0, 1, 0), t[0]), i === "none" && h.setFromNormalAndCoplanarPoint(M, t[0])) : t.length === 2 ? i === "y" || i === "xoz" ? (v(), u()) : g.setPoints([t[0], t[1]]) : t.length === 3 && (v(), u());
+  }, x = (o) => {
+    var A, R;
     if (!(o != null && o.raycaster))
       return;
-    const L = (R = n.at(-1)) == null ? void 0 : R.clone();
-    if (n.length === 0) {
-      h = o.point.clone(), b = (N = o.face) == null ? void 0 : N.normal;
+    const z = (A = t.at(-1)) == null ? void 0 : A.clone();
+    if (t.length === 0) {
+      d = o.point.clone(), M = (R = o.face) == null ? void 0 : R.normal;
       return;
     }
-    if (n.length === 1 && a === "y") {
-      const p = new r.Line3(new r.Vector3(0, 1, 0).add(n[0]), new r.Vector3(0, -1, 0).add(n[0])).closestPointToPoint(o.point, !1, new r.Vector3());
-      s.setPoints([n[0], p, o.point]);
+    if (t.length === 1 && i === "y") {
+      const w = new r.Line3(new r.Vector3(0, 1, 0).add(t[0]), new r.Vector3(0, -1, 0).add(t[0])).closestPointToPoint(o.point, !1, new r.Vector3());
+      s.setPoints([t[0], w, o.point]);
       return;
     }
-    if (n.length === 1 && a === "xoz") {
-      const V = new r.Line3(new r.Vector3(1, 0, 0).add(n[0]), new r.Vector3(-1, 0, 0).add(n[0])), p = o.raycaster.ray.intersectPlane(c, new r.Vector3()), g = V.closestPointToPoint(p, !1, new r.Vector3());
-      s.setPoints([n[0], g, p]);
+    if (t.length === 1 && i === "xoz") {
+      const y = new r.Line3(new r.Vector3(1, 0, 0).add(t[0]), new r.Vector3(-1, 0, 0).add(t[0])), w = o.raycaster.ray.intersectPlane(h, new r.Vector3()), V = y.closestPointToPoint(w, !1, new r.Vector3());
+      s.setPoints([t[0], V, w]);
       return;
     }
-    if (n.length === 1 && a === "none") {
-      c ? (h = o.raycaster.ray.intersectPlane(c, new r.Vector3()), P.setPoints([h, o.point])) : h = o.point.clone(), d.setPoints([L, h]);
+    if (t.length === 1 && i === "none") {
+      h ? (d = o.raycaster.ray.intersectPlane(h, new r.Vector3()), m.setPoints([d, o.point])) : d = o.point.clone(), c.setPoints([z, d]);
       return;
     }
-    if (n.length === 2 && a === "none") {
-      l.remove(d);
-      const V = o.raycaster.ray.intersectPlane(c, new r.Vector3()), p = n[0].distanceTo(n[1]) / 2, g = new r.Vector3().lerpVectors(n[0], n[1], 0.5), _ = new r.Vector3().subVectors(V, g).normalize();
-      h = new r.Vector3().addVectors(g, _.multiplyScalar(p));
-      const F = [n[0], h, n[1]], O = H(F, I.modules.five.camera.position);
+    if (t.length === 2 && i === "none") {
+      l.remove(c);
+      const y = o.raycaster.ray.intersectPlane(h, new r.Vector3()), w = t[0].distanceTo(t[1]) / 2, V = new r.Vector3().lerpVectors(t[0], t[1], 0.5), _ = new r.Vector3().subVectors(y, V).normalize();
+      d = new r.Vector3().addVectors(V, _.multiplyScalar(w));
+      const F = [t[0], d, t[1]], O = H(F, I.modules.five.camera.position);
       s.setPoints(O);
       return;
     }
   }, v = () => {
-    t.off("select", x), t.off("intersectionUpdate", E), t.off("disable", C), t.disable(), l == null || l.remove(d, y, P);
-  }, C = () => {
-    v(), l == null || l.remove(s), m(new Error("Cancelled"));
+    e.off("select", b), e.off("intersectionUpdate", x), e.off("disable", E), e.disable(), l == null || l.remove(c, g, m);
+  }, E = () => {
+    v(), l == null || l.remove(s), f(new Error("Cancelled"));
   };
-  return t.on("select", x), t.on("intersectionUpdate", E), t.on("disable", C), i;
+  return e.on("select", b), e.on("intersectionUpdate", x), e.on("disable", E), a;
 }
-function oe(s, t, e) {
-  var A;
-  const { promise: i, reject: m, resolve: w } = U(), l = s.parent;
+function oe(s, e, n) {
+  var C;
+  const { promise: a, reject: f, resolve: u } = U(), l = s.parent;
   if (!l)
-    return m(new Error("No container"));
-  const a = (A = e == null ? void 0 : e.limit) != null ? A : "none", d = new M(u(f({}, s.style), { dashed: !0 })), P = new M(u(f({}, s.style), { dashed: !0, lengthEnable: !1 })), y = new M(u(f({}, s.style), { dashed: !1, lengthEnable: !1 }));
-  l.add(d, y, P), t.enable(), t.setAdherePoints(ne(t.five, { excludes: [s] }));
-  const n = [];
-  let h = new r.Vector3(), b = new r.Vector3();
-  const c = new r.Plane(), x = () => {
-    var o;
-    if (n.push(h.clone()), (o = e == null ? void 0 : e.onPointPlaced) == null || o.call(e), n.length === 1)
-      t.planeMode = "onlyPlane", a === "y" && (t.adhereLine = [new r.Line3(n[0], new r.Vector3(0, 1, 0).add(n[0]))]), a === "xoz" && (c.setFromNormalAndCoplanarPoint(new r.Vector3(0, 1, 0), n[0]), t.plane = c), a === "none" && (c.setFromNormalAndCoplanarPoint(b, n[0]), t.plane = c);
-    else if (n.length === 2) {
-      t.planeMode = "vertical", a === "y" && (t.adhereLine = []);
-      let L = !1;
-      n[0].x === n[1].x && n[0].z === n[1].z && (L = !0), a === "y" && !L && (c.setFromCoplanarPoints(n[0], n[1], new r.Vector3(0, 1, 0).add(n[0])), t.plane = c), y.setPoints([n[0], n[1]]);
+    return f(new Error("No container"));
+  const i = (C = n == null ? void 0 : n.limit) != null ? C : "none", c = new L(P(p({}, s.style), { dashed: !0 })), m = new L(P(p({}, s.style), { dashed: !0, lengthEnable: !1 })), g = new L(P(p({}, s.style), { dashed: !1, lengthEnable: !1 }));
+  l.add(c, g, m), e.enable(), e.setAdherePoints(ne(e.five, { excludes: [s] }));
+  const t = [];
+  let d = new r.Vector3(), M = new r.Vector3();
+  const h = new r.Plane(), b = () => {
+    if (t.push(d.clone()), t.length === 1)
+      e.planeMode = "onlyPlane", i === "y" && (e.adhereLine = [new r.Line3(t[0], new r.Vector3(0, 1, 0).add(t[0]))]), i === "xoz" && (h.setFromNormalAndCoplanarPoint(new r.Vector3(0, 1, 0), t[0]), e.plane = h), i === "none" && (h.setFromNormalAndCoplanarPoint(M, t[0]), e.plane = h);
+    else if (t.length === 2) {
+      e.planeMode = "vertical", i === "y" && (e.adhereLine = []);
+      let o = !1;
+      t[0].x === t[1].x && t[0].z === t[1].z && (o = !0), i === "y" && !o && (h.setFromCoplanarPoints(t[0], t[1], new r.Vector3(0, 1, 0).add(t[0])), e.plane = h), g.setPoints([t[0], t[1]]);
     } else
-      n.length === 3 && (v(), w());
-  }, E = (o) => {
-    var R, N, V, p;
+      t.length === 3 && (v(), u());
+  }, x = (o) => {
+    var A, R, y, w;
     if (!o || !(o != null && o.raycaster))
       return;
-    const L = (R = n.at(-1)) == null ? void 0 : R.clone();
-    if (n.length === 0) {
-      h = o.point.clone(), b = (N = o.face) == null ? void 0 : N.normal;
+    const z = (A = t.at(-1)) == null ? void 0 : A.clone();
+    if (t.length === 0) {
+      d = o.point.clone(), M = (R = o.face) == null ? void 0 : R.normal;
       return;
     }
-    if (n.length === 1) {
-      h = o.point, P.setPoints([(V = o.originalPoint) != null ? V : o.point, o.point]), d.setPoints([L, h]);
+    if (t.length === 1) {
+      d = o.point, m.setPoints([(y = o.originalPoint) != null ? y : o.point, o.point]), c.setPoints([z, d]);
       return;
     }
-    if (n.length === 2) {
-      if (!t.plane) {
-        const k = ee([n[0], n[1], o.point]);
-        c.setFromNormalAndCoplanarPoint(k, n[0]);
+    if (t.length === 2) {
+      if (!e.plane) {
+        const k = ee([t[0], t[1], o.point]);
+        h.setFromNormalAndCoplanarPoint(k, t[0]);
       }
-      P.setPoints([(p = o.originalPoint) != null ? p : o.point, o.point]);
-      const g = new r.Vector3().crossVectors(n[0].clone().sub(n[1]), c.normal).normalize();
-      h = new r.Line3(n[1].clone().add(g), n[1].clone().sub(g)).closestPointToPoint(o.point, !1, new r.Vector3());
-      const F = [n[0], n[1], h], O = H(F, I.modules.five.camera.position);
+      m.setPoints([(w = o.originalPoint) != null ? w : o.point, o.point]);
+      const V = new r.Vector3().crossVectors(t[0].clone().sub(t[1]), h.normal).normalize();
+      d = new r.Line3(t[1].clone().add(V), t[1].clone().sub(V)).closestPointToPoint(o.point, !1, new r.Vector3());
+      const F = [t[0], t[1], d], O = H(F, I.modules.five.camera.position);
       s.setPoints(O);
       return;
     }
   }, v = () => {
-    t.setAdherePoints([]), t.adhereLine = [], t.adherePlane = [], t.plane = void 0, t.off("select", x), t.off("intersectionUpdate", E), t.off("disable", C), t.disable(), l == null || l.remove(d, y, P);
-  }, C = () => {
-    v(), l == null || l.remove(s), m(new Error("Cancelled"));
+    e.setAdherePoints([]), e.adhereLine = [], e.adherePlane = [], e.plane = void 0, e.off("select", b), e.off("intersectionUpdate", x), e.off("disable", E), e.disable(), l == null || l.remove(c, g, m);
+  }, E = () => {
+    v(), l == null || l.remove(s), f(new Error("Cancelled"));
   };
-  return t.on("select", x), t.on("intersectionUpdate", E), t.on("disable", C), i;
+  return e.on("select", b), e.on("intersectionUpdate", x), e.on("disable", E), a;
 }
 export {
-  ye as Rectangle,
+  ge as Rectangle,
   te as createRectangle
 };

package/libs/base/BasePlugin.js

@@ -1,7 +1,7 @@
 var e = Object.defineProperty;
 var s = (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) => (s(o, typeof t != "symbol" ? t + "" : t, i), i);
-import { Subscribe as m } from "../shared-utils/Subscribe.js";
+import { Subscribe as l } from "../shared-utils/Subscribe.js";
 import "../shared-utils/tag.js";
 import "three";
 import "../vendor/hammerjs/hammer.js";
@@ -15,7 +15,7 @@ import "../shared-utils/three/blink.js";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../vendor/earcut/src/earcut.js";
-import { FiveUtil as l } from "../shared-utils/Utils/FiveUtil.js";
+import { FiveUtil as m } from "../shared-utils/Utils/FiveUtil.js";
 import { DEFAULT_STATIC_PREFIX as p } from "../shared-utils/url/defaultUrls.js";
 import "../shared-utils/five/FivePuppet.js";
 let I = class {
@@ -23,7 +23,7 @@ let I = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    r(this, "VERSION", "3.77.1");
+    r(this, "VERSION", "3.77.2-alpha.0");
     r(this, "NAME");
     r(this, "five");
     r(this, "workUtil");
@@ -31,9 +31,9 @@ let I = class {
     /**
      * @description: 插件事件钩子
      */
-    r(this, "hooks", new m());
+    r(this, "hooks", new l());
     r(this, "staticPrefix", p);
-    this.five = t, this.fiveUtil = new l(t), this.workUtil = this.fiveUtil.workUtil, i != null && i.staticPrefix && (this.staticPrefix = i.staticPrefix);
+    this.five = t, this.fiveUtil = new m(t), this.workUtil = this.fiveUtil.workUtil, i != null && i.staticPrefix && (this.staticPrefix = i.staticPrefix);
   }
   set workCode(t) {
     this.workUtil.workCode = t, this.onWorkCodeChange();

package/libs/floorplan/MapviewFloorplanPlugin/Controller.d.ts

@@ -67,26 +67,10 @@ export declare class Controller extends BasePlugin.Controller<State, EventMap, P
     changeConfigs(config: Partial<Config>, userAction?: boolean): void;
     /** 更新户型图大小 */
     updateSize: () => boolean;
-    /** 根据旋转角度计算 pxmm
-     * @description 当 longitude 大于 45° 或小于 -45°（相对于基准方向）时，使用 Z 轴计算
-     */
-    private getPxmmWithRotation;
-    /** 使用 Z 轴计算 pxmm
-     * @description 当相机旋转导致 X 轴接近垂直于屏幕时，改用 Z 轴计算
-     */
-    private getPxmmZAxis;
     /** 更新户型图位置 */
     updatePosition(): void;
     highlight: (highlightData: HighlightData) => void;
     unhighlight: () => void;
-    /** 更新展示状态
-     * @description 可以更新 longitude、latitude、offset 等参数
-     * @param showState 需要更新的状态，会与现有状态合并
-     * @example
-     * // 更新 longitude
-     * plugin.updateShowState({ longitude: Math.PI / 2 })
-     */
-    updateShowState: (showState: Partial<ShowState>) => void;
     protected formatData(serverData: PluginServerData): Promise<PluginData>;
     private _disable;
     private _enable;
@@ -111,11 +95,6 @@ export declare class Controller extends BasePlugin.Controller<State, EventMap, P
     private onFivePanoArrived;
     /** cameraUpdate 时判断户型图是否应该自动隐藏 */
     private onFiveCameraUpdate;
-    /** 获取相对于 showState 的 pose 偏差
-     * @description 将当前相机状态的 longitude 减去 showState.longitude，归一化后返回
-     * 这样自动隐藏逻辑会检查相对偏差，而不是绝对值
-     */
-    private getRelativePose;
     /** 户型图展示中，转动三维模型，结束时应该自动修复模型状态 */
     private onFiveWantsPanGesture;
     /** 阻止点击分间走点 */