@realsee/dnalogel 3.76.1-alpha.1 → 3.76.1-alpha.3

package/libs/Sculpt/index.js

@@ -2,7 +2,7 @@ var O = Object.defineProperty, S = Object.defineProperties;
 var U = Object.getOwnPropertyDescriptors;
 var y = Object.getOwnPropertySymbols;
 var D = Object.prototype.hasOwnProperty, L = Object.prototype.propertyIsEnumerable;
-var p = (l, n, e) => n in l ? O(l, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[n] = e, f = (l, n) => {
+var p = (l, n, e) => n in l ? O(l, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[n] = e, g = (l, n) => {
   for (var e in n || (n = {}))
     D.call(n, e) && p(l, e, n[e]);
   if (y)
@@ -35,7 +35,6 @@ import "three";
 import "../vendor/hammerjs/hammer.js";
 import "../shared-utils/three/PointSelector/index.js";
 import "../shared-utils/three/CSS3DRenderer/index.js";
-import "@realsee/five";
 import "../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "@realsee/five/line";
 import { notNil as k } from "../shared-utils/isNil.js";
@@ -59,7 +58,7 @@ import { forReverseEach as H } from "../shared-utils/forReverseEach.js";
 import { Line as C } from "./Objects/Line/index.js";
 import { hotkeys as x } from "../vendor/hotkeys-js/dist/hotkeys.esm.js";
 import { withResolvers as M } from "../shared-utils/promise/withResolvers.js";
-const d = class d extends E {
+const d = class extends E {
   constructor(e, t, i) {
     super();
     u(this, "group");
@@ -89,7 +88,7 @@ const d = class d extends E {
       const e = this.items.find((t) => t.selected && t.type === "Polygon");
       e && typeof e.redo == "function" && (e.redo(), this.five.needsRender = !0);
     });
-    this.five = e, this.theme = t, this.config = f({
+    this.five = e, this.theme = t, this.config = g({
       magnifier: { width: 190, height: 190, scale: 2, dragEnabled: !0 }
     }, i), this.group = new z(), this.group.name = "Sculpt", this.group.__sculpt__ = this, e.scene.add(this.group), d.modules.init(e, this.config), x("ctrl+z, command+z", this.undo), x("ctrl+shift+z, command+shift+z", this.redo), d.modules.fiveDomEvents.addEventListener(this.group, "click", ({ intersects: c, origDomEvent: s }) => {
       var o;
@@ -119,8 +118,8 @@ const d = class d extends E {
     this.clear();
     const i = (c = e == null ? void 0 : e.items) == null ? void 0 : c.map((s) => {
       var o;
-      const r = a(f({}, s), {
-        style: f(f({}, (o = this.theme) == null ? void 0 : o[s.type.toLowerCase()]), s.style)
+      const r = a(g({}, s), {
+        style: g(g({}, (o = this.theme) == null ? void 0 : o[s.type.toLowerCase()]), s.style)
       });
       return s.type === "Point" ? new _(r, t) : s.type === "line" ? new C(r, t) : s.type === "Polyline" ? new I(r, t) : s.type === "Polygon" ? new w(r, t) : s.type === "Prism" ? new b(r, t) : s.type === "Rectangle" ? new j(r, t) : s.type === "Circle" ? new v(r, t) : s.type === "Cylinder" ? new P(r, t) : s.type === "Box" ? new R(r, t) : null;
     });
@@ -276,17 +275,17 @@ const d = class d extends E {
     });
   }
 };
-u(d, "modules", B);
-let g = d;
-const _e = (l, n, e) => {
+let f = d;
+u(f, "modules", B);
+const Ie = (l, n, e) => {
   if (n && typeof n == "object" && ("theme" in n || "config" in n)) {
     const t = n;
-    return new g(l, t.theme, t.config);
+    return new f(l, t.theme, t.config);
   }
-  return new g(l, n, e);
-}, we = (l, n) => new g(l, n == null ? void 0 : n.theme, n == null ? void 0 : n.config);
+  return new f(l, n, e);
+}, _e = (l, n) => new f(l, n == null ? void 0 : n.theme, n == null ? void 0 : n.config);
 export {
-  g as Sculpt,
-  _e as SculptPlugin,
-  we as SculptPluginForFive
+  f as Sculpt,
+  Ie as SculptPlugin,
+  _e as SculptPluginForFive
 };

package/libs/Sculpt/utils/renderDom.js

@@ -1,12 +1,12 @@
 var s = Object.defineProperty;
 var m = (a, e, c) => e in a ? s(a, e, { enumerable: !0, configurable: !0, writable: !0, value: c }) : a[e] = c;
-var i = (a, e, c) => (m(a, typeof e != "symbol" ? e + "" : e, c), c);
-const t = class t {
+var n = (a, e, c) => (m(a, typeof e != "symbol" ? e + "" : e, c), c);
+const t = class {
   static checkDom(e) {
-    let c = e, r = !0;
+    let c = e, i = !0;
     for (; c.parent; )
-      r === !0 && c.visible === !1 && (r = !1), c = c.parent;
-    c.type === "Scene" ? (e._onAdded(), r ? e._onShowed() : e._onHidden()) : e._onRemoved();
+      i === !0 && c.visible === !1 && (i = !1), c = c.parent;
+    c.type === "Scene" ? (e._onAdded(), i ? e._onShowed() : e._onHidden()) : e._onRemoved();
   }
   static checkDomEveryFrame() {
     t.checkDomEveryFrameIsRunning || (t.checkDomEveryFrameIsRunning = !0, t._checkDomEveryFrame());
@@ -15,8 +15,8 @@ const t = class t {
     t.cacheObject.forEach((e) => t.checkDom(e)), requestAnimationFrame(t._checkDomEveryFrame);
   }
 };
-i(t, "cacheObject", /* @__PURE__ */ new Set()), i(t, "checkDomEveryFrameIsRunning", !1);
-let n = t;
+let r = t;
+n(r, "cacheObject", /* @__PURE__ */ new Set()), n(r, "checkDomEveryFrameIsRunning", !1);
 export {
-  n as RenderDom
+  r as RenderDom
 };

package/libs/Sculpt/utils/sortPositionsByCameraPosition.js

@@ -1,10 +1,9 @@
-import "three";
 import { getNormal as m } from "../../shared-utils/three/getNormal.js";
-import { centerPoint as i } from "../../shared-utils/three/centerPoint.js";
-function l(r, t) {
-  const e = m(r), o = i(...r), n = t.clone().sub(o);
-  return e.dot(n) >= 0 ? r : r.slice().reverse();
+import { centerPoint as a } from "../../shared-utils/three/centerPoint.js";
+function f(r, t) {
+  const e = m(r), n = a(...r), o = t.clone().sub(n);
+  return e.dot(o) >= 0 ? r : r.slice().reverse();
 }
 export {
-  l as sortPositionsByCameraPosition
+  f as sortPositionsByCameraPosition
 };

package/libs/Sculpt/utils/three/ColoredMesh.js

@@ -1,23 +1,22 @@
 var y = Object.defineProperty;
 var u = Object.getOwnPropertySymbols;
-var f = Object.prototype.hasOwnProperty, p = Object.prototype.propertyIsEnumerable;
-var g = (o, e, t) => e in o ? y(o, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[e] = t, m = (o, e) => {
+var f = Object.prototype.hasOwnProperty, B = Object.prototype.propertyIsEnumerable;
+var g = (o, e, t) => e in o ? y(o, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[e] = t, a = (o, e) => {
   for (var t in e || (e = {}))
     f.call(e, t) && g(o, t, e[t]);
   if (u)
     for (var t of u(e))
-      p.call(e, t) && g(o, t, e[t]);
+      B.call(e, t) && g(o, t, e[t]);
   return o;
 };
 var s = (o, e, t) => (g(o, typeof e != "symbol" ? e + "" : e, t), t);
 import * as i from "three";
-import { DEFAULT_COLOR as B, DEFAULT_OPACITY as F, DEFAULT_HIGHLIGHT_OPACITY as T } from "../../typings/style.js";
+import { DEFAULT_COLOR as p, DEFAULT_OPACITY as F, DEFAULT_HIGHLIGHT_OPACITY as T } from "../../typings/style.js";
 import { IObject3D as M } from "../../../shared-utils/three/IObject3D.js";
 import "../../../shared-utils/tag.js";
 import "../../../vendor/hammerjs/hammer.js";
 import "../../../shared-utils/three/PointSelector/index.js";
 import "../../../shared-utils/three/CSS3DRenderer/index.js";
-import "@realsee/five";
 import "../../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "@realsee/five/line";
 import { notNil as n } from "../../../shared-utils/isNil.js";
@@ -28,9 +27,9 @@ import "../../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../../vendor/earcut/src/earcut.js";
 import "../../../shared-utils/five/FivePuppet.js";
-class U extends M {
+class x extends M {
   constructor(t) {
-    var d, a;
+    var d, m;
     super();
     s(this, "name", "ColoredMesh");
     s(this, "meshFont");
@@ -42,13 +41,13 @@ class U extends M {
     s(this, "colorBeforeHighlight");
     this.paramsStyle = t != null ? t : {};
     const h = new i.MeshBasicMaterial({
-      color: new i.Color((d = t == null ? void 0 : t.color) != null ? d : B).convertSRGBToLinear(),
+      color: new i.Color((d = t == null ? void 0 : t.color) != null ? d : p).convertSRGBToLinear(),
       // 给 MeshBasicMaterial 的颜色必须是 linear，要不颜色不对
       transparent: !0,
       side: i.DoubleSide,
       depthTest: !0,
       depthWrite: !1,
-      opacity: (a = t == null ? void 0 : t.opacity) != null ? a : F
+      opacity: (m = t == null ? void 0 : t.opacity) != null ? m : F
     }), r = new i.MeshBasicMaterial({
       color: 16777215,
       transparent: !0,
@@ -86,7 +85,7 @@ class U extends M {
     return this._geometry;
   }
   setStyle(t) {
-    this.paramsStyle = m(m({}, this.paramsStyle), t), n(t.color) && (this.meshFont.material.color.set(new i.Color(t.color).convertSRGBToLinear()), this.needsRender = !0), n(t.opacity) && (this.meshFont.material.opacity = t.opacity, this.meshBackground.material.opacity = 0.3 / 0.5 * this.meshFont.material.opacity, this.needsRender = !0), this.setOcclusionVisibility(t);
+    this.paramsStyle = a(a({}, this.paramsStyle), t), n(t.color) && (this.meshFont.material.color.set(new i.Color(t.color).convertSRGBToLinear()), this.needsRender = !0), n(t.opacity) && (this.meshFont.material.opacity = t.opacity, this.meshBackground.material.opacity = 0.3 / 0.5 * this.meshFont.material.opacity, this.needsRender = !0), this.setOcclusionVisibility(t);
   }
   highlight(t) {
     var h, r;
@@ -102,5 +101,5 @@ class U extends M {
   }
 }
 export {
-  U as ColoredMesh
+  x as ColoredMesh
 };

package/libs/_commonjsHelpers.js

@@ -1,8 +1,4 @@
-var o = typeof globalThis != "undefined" ? globalThis : typeof window != "undefined" ? window : typeof global != "undefined" ? global : typeof self != "undefined" ? self : {};
-function l(e) {
-  return e && e.__esModule && Object.prototype.hasOwnProperty.call(e, "default") ? e.default : e;
-}
+var e = typeof globalThis != "undefined" ? globalThis : typeof window != "undefined" ? window : typeof global != "undefined" ? global : typeof self != "undefined" ? self : {};
 export {
-  o as commonjsGlobal,
-  l as getDefaultExportFromCjs
+  e as commonjsGlobal
 };

package/libs/base/BasePlugin.js

@@ -1,13 +1,12 @@
 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";
 import "../shared-utils/three/PointSelector/index.js";
 import "../shared-utils/three/CSS3DRenderer/index.js";
-import "@realsee/five";
 import "../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "@realsee/five/line";
 import "../shared-utils/three/core/Five_LineMaterial2.js";
@@ -16,15 +15,15 @@ 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 p } from "../shared-utils/Utils/FiveUtil.js";
-import { DEFAULT_STATIC_PREFIX as l } from "../shared-utils/url/defaultUrls.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 T = class {
+let I = class {
   constructor(t, i) {
     /**
      * @realsee/dnalogel 版本号
      */
-    r(this, "VERSION", "3.76.1-alpha.1");
+    r(this, "VERSION", "3.76.1-alpha.3");
     r(this, "NAME");
     r(this, "five");
     r(this, "workUtil");
@@ -32,9 +31,9 @@ let T = class {
     /**
      * @description: 插件事件钩子
      */
-    r(this, "hooks", new m());
-    r(this, "staticPrefix", l);
-    this.five = t, this.fiveUtil = new p(t), this.workUtil = this.fiveUtil.workUtil, i != null && i.staticPrefix && (this.staticPrefix = i.staticPrefix);
+    r(this, "hooks", new l());
+    r(this, "staticPrefix", p);
+    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();
@@ -55,5 +54,5 @@ let T = class {
   }
 };
 export {
-  T as Controller
+  I as Controller
 };

package/libs/floorplan/FloorplanGuidePlugin/Controller.js

@@ -33,7 +33,6 @@ import "three";
 import "../../vendor/hammerjs/hammer.js";
 import "../../shared-utils/three/PointSelector/index.js";
 import "../../shared-utils/three/CSS3DRenderer/index.js";
-import "@realsee/five";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "@realsee/five/line";
 import "../../shared-utils/three/core/Five_LineMaterial2.js";
@@ -82,7 +81,6 @@ import "../../shared-utils/three/core/Raycaster.js";
 import "../../shared-utils/dom/resizeObserver.js";
 import "../../shared-utils/five/fiveEveryReadyListener.js";
 import "../../shared-utils/five/fiveModelLoad.js";
-import "../../_commonjsHelpers.js";
 import "../../shared-utils/three/PointSelector/utils/PointSelectorHelper.js";
 import "../../shared-utils/three/Magnifier.js";
 import "../../shared-utils/three/PointSelector/utils/PointHelper.js";
@@ -120,11 +118,12 @@ import "../../vendor/animejs/lib/anime.es.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
 import "../../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
+import "@realsee/five";
 import "../../shared-utils/url/absoluteUrl.js";
 import "../../shared-utils/isTruelyObject.js";
 import "../../base/BasePlugin.js";
 import "../Assets/floorplanExtraObject.js";
-class Fi extends k {
+class Si extends k {
   constructor(t, i) {
     var o, s;
     super(t);
@@ -346,5 +345,5 @@ class Fi extends k {
   }
 }
 export {
-  Fi as Controller
+  Si as Controller
 };

package/libs/floorplan/FloorplanGuidePlugin/index.js

@@ -26,7 +26,6 @@ import "../../shared-utils/positionToVector3.js";
 import "three";
 import "../../shared-utils/five/vector3ToScreen.js";
 import "../../shared-utils/five/getFiveModel.js";
-import "@realsee/five";
 import "../../shared-utils/Utils/FiveUtil.js";
 import "../../shared-utils/Utils/BaseUtil.js";
 import "../../shared-utils/Subscribe.js";
@@ -37,7 +36,6 @@ import "../../shared-utils/three/core/Raycaster.js";
 import "../../shared-utils/dom/resizeObserver.js";
 import "../../shared-utils/five/fiveEveryReadyListener.js";
 import "../../vendor/hammerjs/hammer.js";
-import "../../_commonjsHelpers.js";
 import "../../shared-utils/three/PointSelector/index.js";
 import "../../shared-utils/three/PointSelector/utils/PointSelectorHelper.js";
 import "../../shared-utils/three/Magnifier.js";
@@ -81,6 +79,7 @@ import "../../Sculpt/utils/unit.js";
 import "../../Sculpt/utils/renderDom.js";
 import "../../vendor/earcut/src/earcut.js";
 import "../../shared-utils/five/FivePuppet.js";
+import "@realsee/five";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DSprite.js";
 import "../../shared-utils/isTouchDevice.js";
 import "../../shared-utils/five/getPosition.js";
@@ -96,8 +95,8 @@ import "../../base/BasePluginWithData.js";
 import "../../base/BasePlugin.js";
 import "../utils/formatData.js";
 import "../Assets/floorplanExtraObject.js";
-const Wo = (o, r) => new t(o, r);
+const Vo = (o, r) => new t(o, r);
 export {
-  Wo as FloorplanGuidePlugin,
-  Wo as default
+  Vo as FloorplanGuidePlugin,
+  Vo as default
 };

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

@@ -67,6 +67,14 @@ 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;