@realsee/dnalogel 3.74.3 → 3.74.4-alpha.0

package/dist/shared-utils/translateMode/getDistanceFromModel.d.ts

@@ -0,0 +1,2 @@
+import type { Model } from "@realsee/five";
+export declare function getDistanceFromModel(model: Model, fov: number, aspect: number): number;

package/libs/PanoTagPlugin/controller/Tag/PointTag.js

@@ -1,11 +1,11 @@
 var I = Object.defineProperty;
 var M = (p, h, t) => h in p ? I(p, h, { enumerable: !0, configurable: !0, writable: !0, value: t }) : p[h] = t;
 var c = (p, h, t) => (M(p, typeof h != "symbol" ? h + "" : h, t), t);
-import { BaseTag as U } from "./BaseTag.js";
+import { BaseTag as R } from "./BaseTag.js";
 import * as r from "three";
-import { Line as R } from "@realsee/five/line";
+import { Line as U } from "@realsee/five/line";
 import { anyPositionToVector3 as g } from "../../../shared-utils/positionToVector3.js";
-import { transformPosition as P } from "../../../shared-utils/five/transformPosition.js";
+import { transformPosition as D } from "../../../shared-utils/five/transformPosition.js";
 import "../../../shared-utils/Subscribe.js";
 import "../../utils/tag/calculateTagConfig.js";
 import "../../../vendor/object-assign-deep/objectAssignDeep.js";
@@ -88,8 +88,8 @@ import "../../../shared-utils/five/getFloorIndex.js";
 import "../../../shared-utils/safeObj.js";
 import "../../utils/Cache.js";
 import "../../../shared-utils/promise/withResolvers.js";
-const _ = new r.Vector2();
-class _i extends U {
+const P = new r.Vector2();
+class _i extends R {
   constructor(t, e) {
     var o, i, n, s, a;
     super(t, e);
@@ -133,8 +133,8 @@ class _i extends U {
     const t = this.config;
     if (!this.five.renderer || !((n = t == null ? void 0 : t.tagNormalLineConfig) != null && n.enabled) || !this.normalLineLength)
       return;
-    const e = this.five.renderer.getSize(_), o = this.five.renderer.getPixelRatio(), i = P(g(this.originPosition), this.plugin.workUtil.transform);
-    this.tagNormalLine = new R(new r.Vector3().fromArray(this.position), i), this.tagNormalLine.points.visible = !1, this.tagNormalLine.setMaterial({
+    const e = this.five.renderer.getSize(P), o = this.five.renderer.getPixelRatio(), i = D(g(this.originPosition), this.plugin.workUtil.transform);
+    this.tagNormalLine = new U(new r.Vector3().fromArray(this.position), i), this.tagNormalLine.points.visible = !1, this.tagNormalLine.setMaterial({
       color: new r.Vector3(1, 1, 1),
       linewidth: (a = (s = t == null ? void 0 : t.tagNormalLineConfig) == null ? void 0 : s.lineWidth) != null ? a : 1.2,
       dashed: !1
@@ -179,13 +179,12 @@ class _i extends U {
   }
   setPosition(t) {
     this.originPosition = t, this.position = (() => {
-      const e = this.plugin.workUtil.transform;
-      let o = P(g(t), e).toArray();
+      let e = g(t).toArray();
       if (this.normal && this.normalLineLength) {
-        const i = this.computeNormal();
-        o = new r.Vector3().fromArray(o).clone().add(i.clone().setLength(this.normalLineLength)).toArray();
+        const o = this.computeNormal();
+        e = new r.Vector3().fromArray(e).clone().add(o.clone().setLength(this.normalLineLength)).toArray();
       }
-      return o;
+      return e;
     })(), this.cache.clear(), this._lastUpdateCache.position = [0, 0, 0], this.updateVisible(), this.updateScreenPosition(), this.updateZIndex(), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
   }
   /**
@@ -193,7 +192,7 @@ class _i extends U {
    * 使用屏幕空间反投影方法，确保任意视角下都保持固定像素距离
    */
   updateTagNormalLinePosition(t) {
-    var L, x, C, N, S, T, D;
+    var b, L, x, C, N, S, T;
     if (!this.screenPosition || !this.tagNormalLine)
       return;
     const { force: e = !1 } = t != null ? t : {};
@@ -203,29 +202,32 @@ class _i extends U {
     }
     const i = this._lastUpdateCache;
     if (!(this.visible !== i.visible)) {
-      const u = Math.abs(this.position[0] - i.position[0]) > 1e-3 || Math.abs(this.position[1] - i.position[1]) > 1e-3 || Math.abs(this.position[2] - i.position[2]) > 1e-3, E = Math.abs(((L = this.screenPosition.leftPx) != null ? L : 0) - i.screenLeft) > 0.5 || Math.abs(((x = this.screenPosition.topPx) != null ? x : 0) - i.screenTop) > 0.5 || Math.abs(((C = this.screenPosition.scale) != null ? C : 1) - i.scale) > 2e-3;
+      const u = Math.abs(this.position[0] - i.position[0]) > 1e-3 || Math.abs(this.position[1] - i.position[1]) > 1e-3 || Math.abs(this.position[2] - i.position[2]) > 1e-3, E = Math.abs(((b = this.screenPosition.leftPx) != null ? b : 0) - i.screenLeft) > 0.5 || Math.abs(((L = this.screenPosition.topPx) != null ? L : 0) - i.screenTop) > 0.5 || Math.abs(((x = this.screenPosition.scale) != null ? x : 1) - i.scale) > 2e-3;
       if (!u && !E)
         return;
     }
-    if (i.position = new r.Vector3().fromArray(this.position).toArray(), i.screenLeft = (N = this.screenPosition.leftPx) != null ? N : 0, i.screenTop = (S = this.screenPosition.topPx) != null ? S : 0, i.scale = (T = this.screenPosition.scale) != null ? T : 1, i.visible = this.visible, !this.five.renderer)
+    if (i.position = new r.Vector3().fromArray(this.position).toArray(), i.screenLeft = (C = this.screenPosition.leftPx) != null ? C : 0, i.screenTop = (N = this.screenPosition.topPx) != null ? N : 0, i.scale = (S = this.screenPosition.scale) != null ? S : 1, i.visible = this.visible, !this.five.renderer)
       return;
-    const s = this.five.renderer.getSize(_), a = P(g(this.originPosition), this.plugin.workUtil.transform).toArray();
+    const s = this.five.renderer.getSize(P), a = D(
+      g(this.originPosition),
+      this.plugin.workUtil.transform
+    ).toArray();
     this._temp.lineStart.fromArray(a), this._temp.iconPos.fromArray(this.position), this._temp.lineStart.project(this.five.camera), this._temp.iconPos.project(this.five.camera), this._temp.screenDirPixel.set(
       (this._temp.iconPos.x - this._temp.lineStart.x) * s.x / 2,
       (this._temp.iconPos.y - this._temp.lineStart.y) * s.y / 2
     );
     const d = this._temp.screenDirPixel.length();
     this._temp.screenDirPixel.normalize();
-    const m = this.iconPixelGap * ((D = this.screenPosition.scale) != null ? D : 1);
+    const m = this.iconPixelGap * ((T = this.screenPosition.scale) != null ? T : 1);
     this._temp.targetNDC.set(
       (this._temp.iconPos.x * s.x / 2 - this._temp.screenDirPixel.x * m) / (s.x / 2),
       (this._temp.iconPos.y * s.y / 2 - this._temp.screenDirPixel.y * m) / (s.y / 2)
     ), this._temp.raycaster.setFromCamera(this._temp.targetNDC, this.five.camera);
     const l = this._temp.raycaster.ray;
     this._temp.lineStart.fromArray(a), this._temp.iconPos.fromArray(this.position), this._temp.lineDir.copy(this._temp.iconPos).sub(this._temp.lineStart).normalize(), this._temp.lineEnd.copy(l.origin).sub(this._temp.lineStart);
-    const A = l.direction.dot(l.direction), f = l.direction.dot(this._temp.lineDir), y = this._temp.lineDir.dot(this._temp.lineDir), w = l.direction.dot(this._temp.lineEnd), V = this._temp.lineDir.dot(this._temp.lineEnd), v = A * y - f * f;
-    let b = 0;
-    Math.abs(v) > 1e-4 && (b = (f * V - y * w) / v), this._temp.lineEnd.copy(l.origin).add(l.direction.multiplyScalar(Math.max(0, b)));
+    const A = l.direction.dot(l.direction), f = l.direction.dot(this._temp.lineDir), _ = this._temp.lineDir.dot(this._temp.lineDir), w = l.direction.dot(this._temp.lineEnd), V = this._temp.lineDir.dot(this._temp.lineEnd), y = A * _ - f * f;
+    let v = 0;
+    Math.abs(y) > 1e-4 && (v = (f * V - _ * w) / y), this._temp.lineEnd.copy(l.origin).add(l.direction.multiplyScalar(Math.max(0, v)));
     const k = this._temp.lineStart.distanceTo(this._temp.iconPos);
     if (this._temp.lineStart.distanceTo(this._temp.lineEnd) > k) {
       const u = Math.max(0, 1 - m / d);
@@ -254,7 +256,7 @@ class _i extends U {
           return 1;
         const l = 2 * Math.tan(0.5 * this.five.camera.fov / 180 * Math.PI);
         return Math.max(Math.min(1 - l * a / 40, 1), 0.7);
-      })(), m = this.five.renderer.getSize(_);
+      })(), m = this.five.renderer.getSize(P);
       this.screenPosition = {
         leftPx: (n.x + 1) / 2 * m.x,
         topPx: (-n.y + 1) / 2 * m.y,

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.74.3");
+    r(this, "VERSION", "3.74.4-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.js

@@ -101,6 +101,7 @@ import "../../shared-utils/five/transformPosition.js";
 import "../../shared-utils/five/getFiveModel.js";
 import "../../shared-utils/nearlyEqual.js";
 import "../../shared-utils/five/changeMode.js";
+import "../../shared-utils/translateMode/getDistanceFromModel.js";
 import "../../shared-utils/positionToVector3.js";
 import "../../shared-utils/five/vector3ToScreen.js";
 import "../../shared-utils/three/temp.js";
@@ -155,7 +156,7 @@ function Q(l) {
   const { latitude: h, longitude: t } = l, e = Math.abs(h - Math.PI / 2) < 10 * Math.PI / 180, i = t < 30 * (Math.PI / 180) || t > 330 * (Math.PI / 180);
   return e && i;
 }
-class mi extends G {
+class pi extends G {
   constructor(t, e) {
     var a, d;
     super(t);
@@ -513,5 +514,5 @@ class mi extends G {
   }
 }
 export {
-  mi as Controller
+  pi as Controller
 };

package/libs/floorplan/MapviewFloorplanPlugin/index.js

@@ -115,11 +115,12 @@ import "../utils/correctFiveState.js";
 import "../utils/constant.js";
 import "../../shared-utils/nearlyEqual.js";
 import "../../shared-utils/five/changeMode.js";
+import "../../shared-utils/translateMode/getDistanceFromModel.js";
 import "../../shared-utils/changeModelCanvasOpacity.js";
 import "../../shared-utils/url/replace-static-prefix.js";
 import "../../shared-utils/url/absoluteUrl.js";
-const gr = (o, r) => new t(o, r);
+const vr = (o, r) => new t(o, r);
 export {
-  gr as MapviewFloorplanPlugin,
-  gr as default
+  vr as MapviewFloorplanPlugin,
+  vr as default
 };

package/libs/floorplan/ModelFloorplanPlugin/Controller.js

@@ -99,6 +99,7 @@ import "../../shared-utils/five/transformPosition.js";
 import "../../shared-utils/five/getFiveModel.js";
 import "../../shared-utils/nearlyEqual.js";
 import "../../shared-utils/five/changeMode.js";
+import "../../shared-utils/translateMode/getDistanceFromModel.js";
 import "../../shared-utils/positionToVector3.js";
 import "../../shared-utils/five/vector3ToScreen.js";
 import "../../shared-utils/three/temp.js";
@@ -153,7 +154,7 @@ function z(d) {
   const { latitude: s, longitude: t } = d, e = Math.abs(s - Math.PI / 2) < 10 * Math.PI / 180, i = t < 30 * (Math.PI / 180) || t > 330 * (Math.PI / 180);
   return e && i;
 }
-class ti extends T {
+class ei extends T {
   constructor(t, e) {
     var a, p, c;
     super(t);
@@ -487,5 +488,5 @@ class ti extends T {
   }
 }
 export {
-  ti as Controller
+  ei as Controller
 };

package/libs/floorplan/ModelFloorplanPlugin/index.js

@@ -114,11 +114,12 @@ import "../utils/correctFiveState.js";
 import "../utils/constant.js";
 import "../../shared-utils/nearlyEqual.js";
 import "../../shared-utils/five/changeMode.js";
+import "../../shared-utils/translateMode/getDistanceFromModel.js";
 import "../../shared-utils/changeModelCanvasOpacity.js";
 import "../../shared-utils/url/replace-static-prefix.js";
 import "../../shared-utils/url/absoluteUrl.js";
-const gr = (o, r) => new t(o, r);
+const wr = (o, r) => new t(o, r);
 export {
-  gr as ModelFloorplanPlugin,
-  gr as default
+  wr as ModelFloorplanPlugin,
+  wr as default
 };

package/libs/floorplan/utils/correctFiveState.d.ts

@@ -6,6 +6,7 @@ export interface ShowState {
     fov?: number;
     mode: Mode;
     offset?: THREE.Vector3;
+    distance?: number;
 }
 /** 判断当前状态是否可以展示户型图 */
 export declare function checkShowState(five: Five, showState: ShowState): boolean;

package/libs/floorplan/utils/correctFiveState.js

@@ -1,54 +1,57 @@
-var l = (e, t, o) => new Promise((m, n) => {
-  var i = (r) => {
+var l = (t, r, o) => new Promise((m, n) => {
+  var f = (e) => {
     try {
-      u(o.next(r));
-    } catch (f) {
-      n(f);
+      i(o.next(e));
+    } catch (u) {
+      n(u);
     }
-  }, a = (r) => {
+  }, a = (e) => {
     try {
-      u(o.throw(r));
-    } catch (f) {
-      n(f);
+      i(o.throw(e));
+    } catch (u) {
+      n(u);
     }
-  }, u = (r) => r.done ? m(r.value) : Promise.resolve(r.value).then(i, a);
-  u((o = o.apply(e, t)).next());
+  }, i = (e) => e.done ? m(e.value) : Promise.resolve(e.value).then(f, a);
+  i((o = o.apply(t, r)).next());
 });
 import { to as s } from "../../shared-utils/to.js";
-import { FloorplanErrorType as p } from "./constant.js";
+import { FloorplanErrorType as g } from "./constant.js";
 import { nearlyEqual as d } from "../../shared-utils/nearlyEqual.js";
-import { changeMode as M } from "../../shared-utils/five/changeMode.js";
-import { omit as g } from "../../shared-utils/filter.js";
-function h(e, t) {
-  if (e.currentMode !== t.mode)
+import { changeMode as C } from "../../shared-utils/five/changeMode.js";
+import { omit as E } from "../../shared-utils/filter.js";
+import { getDistanceFromModel as y } from "../../shared-utils/translateMode/getDistanceFromModel.js";
+function h(t, r) {
+  if (t.currentMode !== r.mode)
     return !1;
-  const { latitude: o, longitude: m, fov: n, offset: i } = t, { latitude: a, longitude: u, offset: r } = e.getCurrentState(), f = e.camera.fov;
-  return !(!d(o, a, 2) || !d(m, u, 2) || i !== void 0 && i.distanceTo(r) > 0.01 || !d(n, f, 2));
+  const { latitude: o, longitude: m, fov: n, offset: f } = r, { latitude: a, longitude: i, offset: e } = t.getCurrentState(), u = t.camera.fov;
+  return !(!d(o, a, 2) || !d(m, i, 2) || f !== void 0 && f.distanceTo(e) > 0.01 || !d(n, u, 2));
 }
-function b(e, t, o = !0) {
+function x(t, r, o = !0) {
   return l(this, null, function* () {
-    if (h(e, t) === !0)
+    if (h(t, r) === !0)
       return;
-    const n = e.getCurrentState();
-    if (n.mode !== t.mode) {
-      const [c] = yield s(M(e, [t.mode, t, void 0, o]));
+    const n = t.getCurrentState();
+    if (n.mode !== r.mode) {
+      const p = t.models.find((M) => M.name === t.state.workCode);
+      r.distance = y(p, r.fov, t.camera.aspect);
+      const [c] = yield s(C(t, [r.mode, r, void 0, o]));
       if (c)
         throw c;
       return;
     }
-    const { latitude: i, longitude: a, fov: u } = n, r = Math.min(
+    const { latitude: f, longitude: a, fov: i } = n, e = Math.min(
       1e3,
       Math.max(
         200,
-        Math.abs(i - Math.PI / 2) * 1e3,
+        Math.abs(f - Math.PI / 2) * 1e3,
         (a > Math.PI ? 2 * Math.PI - a : a) * 500,
-        typeof t.fov == "number" ? Math.abs(u - t.fov) * 10 : 1 / 0
+        typeof r.fov == "number" ? Math.abs(i - r.fov) * 10 : 1 / 0
       )
-    ), [f] = yield s(e.updateCamera(g(t, ["mode"]), r, o));
-    if (f)
-      throw new Error(p.UpdateCameraError);
+    ), [u] = yield s(t.updateCamera(E(r, ["mode"]), e, o));
+    if (u)
+      throw new Error(g.UpdateCameraError);
   });
 }
 export {
-  b as correctFiveState
+  x as correctFiveState
 };