@realsee/dnalogel 3.76.1-alpha.2 → 3.76.1-alpha.4

package/dist/index.js

@@ -43,7 +43,7 @@ import { LineGeometry as Cb, LineMaterial as Ib, THREE_Line2 as Eb, Line as k0 }
 import { GLTFLoader as Mb } from "@realsee/five/gltf-loader";
 function kb() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.76.1-alpha.2",
+    "%c %c@realsee/dnalogel %cv3.76.1-alpha.4",
     [
       "background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAMCAMAAACHgmeRAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABLFBMVEUAAAAapPoap/oaqvkbrfkbr/gZnfwZoPsaqfnD4v/E4/8Ylv0clPm93/+/4P/B4f8Yj/683/8Wif+33P8Uhv+x2f8ShP+s1v8Pgf+n0/8Nf/+h0f8Lff8Lff8Nf/9dl/+czv8KfP8KfP+Lxf+Uyv+Xy/+Hwv+Jw/+Mxf+Oxv+RyP8aovsapfoap/oZmfwZm/wZnvsYnPsYkf4YlP0NePsDYfgYcfi43f+63v8Xiv8Xjf4EWfwCV/sWZ/qz2v+02/8Vh/8WiP8EUf8CTf4WXv2u1/+v2P8Thf8Thv8ETf8CR/8VV/+o1f+q1f8Qgv8Rg/8DSv8BRf8UVP+j0v+k0v8OgP8Pgf8DR/8DQv9Nhf+dzv+fz/+Kv/+Vyv+Xy/+azf+Oxv+Qx/+SyP////8MUhLdAAAAK3RSTlMACEWQ2bd98uQECPXxqO7c+Pb49vj2+Pb49vj23Oul8fMHA+TwerXXjEIG2P+bHgAAAAFiS0dEY1y+LaoAAAB+SURBVAjXY2BgZGJmYWVgYGBgY9fW0eVg4ORi4NbTNzDk4eXjZxAwMjYxNTO3EGQQsrSytrG1sxdmEHFwdHJ2cXUTZRBz9/D08vbxFWeQ8PMPCAwKDpFkkAoNC4+IjIqWZpCRlZOPiY2LV2BQVGJQTkhMUlEFWaOmrqGpxQAAyg0S9Dq+VPYAAAAASUVORK5CYII=')",
       "background-repeat: no-repeat",
@@ -13506,7 +13506,7 @@ let ys = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    f(this, "VERSION", "3.76.1-alpha.2");
+    f(this, "VERSION", "3.76.1-alpha.4");
     f(this, "NAME");
     f(this, "five");
     f(this, "workUtil");
@@ -13934,20 +13934,22 @@ let dC = class extends fn {
     this.updateState({ config: e }, i), this.render();
   }
   /** 根据旋转角度计算 pxmm
-   * @description 当 longitude 大于 45° 或小于 -45°（相对于基准方向）时，使用欧几里得距离计算
+   * @description 当 longitude 大于 45° 或小于 -45°（相对于基准方向）时，使用 Z 轴计算
    */
   getPxmmWithRotation() {
     if (!this.wrapper)
       return 0;
     const e = this.state.config.attachedTo ? { attachedTo: this.state.config.attachedTo } : void 0, i = this.showState.longitude, s = Math.abs((i % (2 * Math.PI) + 2 * Math.PI) % (2 * Math.PI));
-    return s > Math.PI / 4 && s < 3 * Math.PI / 4 || s > 5 * Math.PI / 4 && s < 7 * Math.PI / 4 ? this.getPxmmEuclidean(e) : Td(this.five, this.wrapper, this.floorIndex, e);
+    return s > Math.PI / 4 && s < 3 * Math.PI / 4 || s > 5 * Math.PI / 4 && s < 7 * Math.PI / 4 ? this.getPxmmZAxis(e) : Td(this.five, this.wrapper, this.floorIndex, e);
   }
-  /** 使用欧几里得距离计算 pxmm */
-  getPxmmEuclidean(e) {
+  /** 使用 Z 轴计算 pxmm
+   * @description 当相机旋转导致 X 轴接近垂直于屏幕时，改用 Z 轴计算
+   */
+  getPxmmZAxis(e) {
     if (!this.wrapper)
       return 0;
-    const i = ia(this.five, this.floorIndex, e == null ? void 0 : e.attachedTo), s = new y.Vector3(0, i, 0), o = new y.Vector3(1, i, 0), r = s.clone().project(this.five.camera), a = o.clone().project(this.five.camera), l = a.x - r.x, c = a.y - r.y;
-    return Math.sqrt(l * l + c * c) / 1e3 * (this.wrapper.getBoundingClientRect().width / 2);
+    const i = ia(this.five, this.floorIndex, e == null ? void 0 : e.attachedTo), s = new y.Vector3(0, i, 0), o = new y.Vector3(0, i, 1), r = s.clone().project(this.five.camera), a = o.clone().project(this.five.camera);
+    return Math.abs((a.x - r.x) / 1e3) * (this.wrapper.getBoundingClientRect().width / 2);
   }
   formatData(e) {
     return te(this, null, function* () {
@@ -16850,7 +16852,10 @@ let pC = class extends fn {
       if (!i || this.state.visible || this.state.config.autoShowEnable === !1 || this.isHiddenByHideFunc)
         return;
       const s = this.five.getCurrentState();
-      s.mode === this.showState.mode && gC(s) && (this.updateState({ visible: !0 }, !0), this._show({ isAutoShow: !0 }));
+      if (s.mode !== this.showState.mode)
+        return;
+      const o = this.getRelativePose(s);
+      gC(o) && (this.updateState({ visible: !0 }, !0), this._show({ isAutoShow: !0 }));
     });
     /** panoIndex 改变时，更新 floorIndex */
     f(this, "onFivePanoArrived", (e) => {
@@ -16862,7 +16867,9 @@ let pC = class extends fn {
       if (!this.state.visible || this.showPromise)
         return;
       const s = this.five.getCurrentState();
-      this.updatePosition(), this.updateSize(), fC(s) && (this.updateState({ visible: !1 }, i), this._hide({ userAction: i }));
+      this.updatePosition(), this.updateSize();
+      const o = this.getRelativePose(s);
+      fC(o) && (this.updateState({ visible: !1 }, i), this._hide({ userAction: i }));
     });
     /** 户型图展示中，转动三维模型，结束时应该自动修复模型状态 */
     f(this, "onFiveWantsPanGesture", (e, i) => {
@@ -16984,20 +16991,22 @@ let pC = class extends fn {
     this.updateState({ config: e }, i), this.render();
   }
   /** 根据旋转角度计算 pxmm
-   * @description 当 longitude 大于 45° 或小于 -45°（相对于基准方向）时，使用欧几里得距离计算
+   * @description 当 longitude 大于 45° 或小于 -45°（相对于基准方向）时，使用 Z 轴计算
    */
   getPxmmWithRotation() {
     if (!this.wrapper)
       return 0;
     const e = this.state.config.attachedTo ? { attachedTo: this.state.config.attachedTo } : void 0, i = this.showState.longitude, s = Math.abs((i % (2 * Math.PI) + 2 * Math.PI) % (2 * Math.PI));
-    return s > Math.PI / 4 && s < 3 * Math.PI / 4 || s > 5 * Math.PI / 4 && s < 7 * Math.PI / 4 ? this.getPxmmEuclidean(e) : Td(this.five, this.wrapper, this.floorIndex, e);
+    return s > Math.PI / 4 && s < 3 * Math.PI / 4 || s > 5 * Math.PI / 4 && s < 7 * Math.PI / 4 ? this.getPxmmZAxis(e) : Td(this.five, this.wrapper, this.floorIndex, e);
   }
-  /** 使用欧几里得距离计算 pxmm */
-  getPxmmEuclidean(e) {
+  /** 使用 Z 轴计算 pxmm
+   * @description 当相机旋转导致 X 轴接近垂直于屏幕时，改用 Z 轴计算
+   */
+  getPxmmZAxis(e) {
     if (!this.wrapper)
       return 0;
-    const i = ia(this.five, this.floorIndex, e == null ? void 0 : e.attachedTo), s = new y.Vector3(0, i, 0), o = new y.Vector3(1, i, 0), r = s.clone().project(this.five.camera), a = o.clone().project(this.five.camera), l = a.x - r.x, c = a.y - r.y;
-    return Math.sqrt(l * l + c * c) / 1e3 * (this.wrapper.getBoundingClientRect().width / 2);
+    const i = ia(this.five, this.floorIndex, e == null ? void 0 : e.attachedTo), s = new y.Vector3(0, i, 0), o = new y.Vector3(0, i, 1), r = s.clone().project(this.five.camera), a = o.clone().project(this.five.camera);
+    return Math.abs((a.x - r.x) / 1e3) * (this.wrapper.getBoundingClientRect().width / 2);
   }
   /** 更新户型图位置 */
   updatePosition() {
@@ -17042,6 +17051,14 @@ let pC = class extends fn {
     const e = this.five;
     this.hasAddedEventListener = !1, e.off("modelLoaded", this.onFiveModelLoaded), e.off("modeChange", this.onFiveModeChange), e.off("panoArrived", this.onFivePanoArrived), e.off("cameraUpdate", this.onFiveCameraUpdate), e.off("wantsPanGesture", this.onFiveWantsPanGesture), e.off("wantsTapGesture", this.onFiveWantsTapGesture), e.off("wantsChangeMode", this.onFiveWantsChangeMode), e.off("modelShownFloorChange", this.onModelShownFloorChange);
   }
+  /** 获取相对于 showState 的 pose 偏差
+   * @description 将当前相机状态的 longitude 减去 showState.longitude，归一化后返回
+   * 这样自动隐藏逻辑会检查相对偏差，而不是绝对值
+   */
+  getRelativePose(e) {
+    const i = this.showState.longitude || 0, o = ((e.longitude - i) % (2 * Math.PI) + 2 * Math.PI) % (2 * Math.PI);
+    return he(V({}, e), { longitude: o });
+  }
   render(e) {
     if (!this.state.enabled || !this.container || !this.data || this.size.width === 0 || this.showPromise)
       return;