@realsee/dnalogel 3.81.21 → 3.81.23

package/libs/shared-utils/three/Magnifier.d.ts

@@ -18,11 +18,43 @@ interface MagnifierConfig {
 interface MagnifierEvent extends SubscribeEventMap {
     wantsPanGesture: (event: (typeof Hammer)['Input']) => boolean;
 }
+/** 自适应取景窗口参数 */
+export interface AdaptiveReadWindowOptions {
+    /** 放大镜内希望覆盖的世界宽度（米），默认 0.25 */
+    worldSize?: number;
+    /** 最大光学倍率（相对主视图），默认 8 */
+    maxZoom?: number;
+    /** 取景窗口允许的最小像素，避免倍率过高把贴图放大成色块，默认 24 */
+    minWindowPx?: number;
+    /** 窗口变化的平滑系数（0~1），越小越稳，默认 0.25 */
+    smoothing?: number;
+}
+/** 一帧的取景窗口：读哪块区域、按多少倍率重绘 */
+interface ReadWindowFrame {
+    readWidth: number;
+    readHeight: number;
+    radio: number;
+    imageWidth: number;
+    imageHeight: number;
+}
 /** 放大镜配置参数 */
 export interface MagnifierParameter extends Partial<MagnifierConfig> {
     width?: number;
     height?: number;
     scale?: number;
+    /**
+     * 读回像素的分辨率倍数（相对 CSS 像素）。
+     * 1 = 旧行为：retina 屏上放大镜只渲染 1x 像素，再由浏览器放大，画面会发虚；
+     * 2 = 按设备像素渲染，放大镜不再被二次放大。默认 1，只有显式传入才改变。
+     * 部分 App 内 WebView 读不到高分辨率像素时会自动降级回 1。
+     */
+    readPixelsPixelRatio?: number;
+    /**
+     * 自适应取景窗口：按落点距离动态缩小取景区域，让放大镜里看到的物体大小
+     * 基本恒定，远点也能得到真正的光学放大（而不是把一小块屏幕放大 2 倍）。
+     * 传 true 使用默认参数；不传 / false 时保持旧的固定 2x 行为。
+     */
+    adaptiveReadWindow?: boolean | AdaptiveReadWindowOptions;
 }
 export declare class Magnifier {
     width: number;
@@ -34,6 +66,8 @@ export declare class Magnifier {
     state: {
         enabled: boolean;
     };
+    /** 读回像素的分辨率倍数；运行时可能因读回失败被降级为 1 */
+    readPixelsPixelRatio: number;
     private five;
     private scale;
     private offset;
@@ -43,6 +77,14 @@ export declare class Magnifier {
     private offsetRange?;
     private isPanning;
     private imageData;
+    /** 自适应取景参数 */
+    private adaptiveReadWindow;
+    /** 平滑后的取景窗口（CSS 像素），0 表示还没初始化 */
+    private smoothedReadWindowPx;
+    /** 最近一次真正用于读像素的窗口，叠加层必须和这次像素严格对应 */
+    private lastReadWindow?;
+    /** 读回失败后关闭自适应，退回旧的固定窗口 */
+    private adaptiveDisabled;
     constructor(five: Five, options: MagnifierParameter);
     enable(): this;
     disable(): this;
@@ -59,6 +101,19 @@ export declare class Magnifier {
         y: number;
     }): void;
     resetOffset(): void;
+    /** 更新读回分辨率倍数；V2 用它按设备像素渲染，读回失败的机型可随时降级 */
+    setReadPixelsPixelRatio(ratio: number): void;
+    /** 是否让放大镜强制渲染模型（true）还是沿用主视图的全景 / 模型状态（false） */
+    setSkipPanorama(enabled: boolean): void;
+    getReadPixelsPixelRatio(): number;
+    getCanvasPixelSize(): {
+        width: number;
+        height: number;
+    };
+    /** 读出区域与像素映射的唯一真值来源，叠加层也需要用同一份数据 */
+    getReadWindowInfo(): ReadWindowFrame;
+    /** 运行时开关自适应取景，用于对比新旧行为 */
+    setAdaptiveReadWindow(enabled: boolean | AdaptiveReadWindowOptions): void;
     /** 更新放大镜的缩放比例 */
     updateScale(newScale: number): void;
     /** 更新放大镜的尺寸 */
@@ -68,6 +123,24 @@ export declare class Magnifier {
         x: number;
         y: number;
     };
+    /** 旧的固定窗口：始终取 width / scale 大小的屏幕区域，倍率恒为 scale */
+    private getBaseReadWindow;
+    private isAdaptiveActive;
+    /**
+     * 按落点距离计算本帧取景窗口。
+     *
+     * 目标：放大镜里始终覆盖固定大小的世界范围（worldSize），
+     * 所以远点的取景窗口更小、光学倍率更高；近点退化为旧的 2x 窗口。
+     */
+    private getReadWindow;
+    /** 由取景宽度反推读回倍率，让 canvas 的设备像素尺寸与旧版保持一致 */
+    private frameFromReadWidth;
+    /** 落点到相机的距离；屏幕坐标模式下无法计算，返回 undefined */
+    private getDistanceToCamera;
+    /** 自适应窗口会让 canvas backing 随帧变化，尺寸变化时才重设 */
+    private syncCanvasSize;
+    private readPixels;
+    private applyCanvasSize;
     private _appendTo;
     private autoFixPCPosition;
     private initStyle;

package/libs/shared-utils/three/Magnifier.js

@@ -1,57 +1,67 @@
-var D = Object.defineProperty;
-var C = (s, t, e) => t in s ? D(s, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[t] = e;
-var r = (s, t, e) => (C(s, typeof t != "symbol" ? t + "" : t, e), e);
-import { hammerExports as w } from "../../vendor/hammerjs/hammer.js";
-import * as p from "three";
-import { Subscribe as R } from "../Subscribe.js";
-class L {
+var R = Object.defineProperty;
+var p = (s, t, e) => t in s ? R(s, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[t] = e;
+var r = (s, t, e) => (p(s, typeof t != "symbol" ? t + "" : t, e), e);
+import { hammerExports as W } from "../../vendor/hammerjs/hammer.js";
+import * as m from "three";
+import { Subscribe as y } from "../Subscribe.js";
+class S {
   constructor(t, e) {
     r(this, "width");
     r(this, "height");
     r(this, "containerDom");
-    r(this, "hooks", new R());
+    r(this, "hooks", new y());
     r(this, "canvas", document.createElement("canvas"));
     r(this, "config");
     r(this, "state", { enabled: !1 });
+    /** 读回像素的分辨率倍数；运行时可能因读回失败被降级为 1 */
+    r(this, "readPixelsPixelRatio");
     r(this, "five");
     r(this, "scale");
     r(this, "offset", { x: 0, y: 0 });
     r(this, "context");
-    r(this, "renderCenter", new p.Vector3());
+    r(this, "renderCenter", new m.Vector3());
     r(this, "hammer");
     r(this, "offsetRange");
     r(this, "isPanning", !1);
     r(this, "imageData", new ImageData(1, 1));
+    /** 自适应取景参数 */
+    r(this, "adaptiveReadWindow");
+    /** 平滑后的取景窗口（CSS 像素），0 表示还没初始化 */
+    r(this, "smoothedReadWindowPx", 0);
+    /** 最近一次真正用于读像素的窗口，叠加层必须和这次像素严格对应 */
+    r(this, "lastReadWindow");
+    /** 读回失败后关闭自适应，退回旧的固定窗口 */
+    r(this, "adaptiveDisabled", !1);
     r(this, "onPanstart", () => {
       this.isPanning = !0, this.canvas.style.boxShadow = "0 2px 30px 0 rgba(0,0,0,0.20)";
     });
     r(this, "onPan", (t) => {
       if (!this.isPanning || !this.offsetRange || this.hooks.emit("wantsPanGesture", t))
         return;
-      const { translateX: i, translateY: h } = this.getPanOffset(t, this.offsetRange);
-      this.canvas.style.transform = `translate3d(${i}px, ${h}px, 100px)`;
+      const { translateX: a, translateY: h } = this.getPanOffset(t, this.offsetRange);
+      this.canvas.style.transform = `translate3d(${a}px, ${h}px, 100px)`;
     });
     r(this, "onPanend", (t) => {
       if (this.isPanning = !1, this.canvas.style.boxShadow = "none", !this.offsetRange)
         return;
-      const { translateX: e, translateY: i } = this.getPanOffset(t, this.offsetRange);
-      this.canvas.style.transform = `translate3d(${e}px, ${i}px, 100px)`, this.offset = { x: e, y: i };
+      const { translateX: e, translateY: a } = this.getPanOffset(t, this.offsetRange);
+      this.canvas.style.transform = `translate3d(${e}px, ${a}px, 100px)`, this.offset = { x: e, y: a };
     });
-    var h, n, l, o;
+    var h, i, o, n;
     if (!t.renderer) {
       console.error("Five Render 未初始化");
       return;
     }
-    this.five = t, this.scale = (h = e == null ? void 0 : e.scale) != null ? h : 2, this.width = (n = e == null ? void 0 : e.width) != null ? n : 190, this.height = (o = (l = e == null ? void 0 : e.height) != null ? l : e == null ? void 0 : e.width) != null ? o : 190, this.config = {
+    this.five = t, this.scale = (h = e == null ? void 0 : e.scale) != null ? h : 2, this.width = (i = e == null ? void 0 : e.width) != null ? i : 190, this.height = (n = (o = e == null ? void 0 : e.height) != null ? o : e == null ? void 0 : e.width) != null ? n : 190, this.readPixelsPixelRatio = v(e == null ? void 0 : e.readPixelsPixelRatio), this.adaptiveReadWindow = P(e == null ? void 0 : e.adaptiveReadWindow), this.config = {
       dragEnabled: (e == null ? void 0 : e.dragEnabled) || !1,
       autoFixPCPosition: (e == null ? void 0 : e.autoFixPCPosition) || !1,
       initialPosition: (e == null ? void 0 : e.initialPosition) || { left: "0", top: "0" },
       skipPanorama: (e == null ? void 0 : e.skipPanorama) || !1
     };
-    const i = this.canvas.getContext("2d");
-    if (!i)
+    const a = this.canvas.getContext("2d");
+    if (!a)
       throw new Error("CANNOT CREATE CONTEXT2D");
-    this.context = i, this.config.dragEnabled && (this.hammer = new w(this.canvas), this.hammer.on("pan", this.onPan), this.hammer.on("panstart", this.onPanstart), this.hammer.on("panend", this.onPanend)), this.initStyle();
+    this.context = a, this.config.dragEnabled && (this.hammer = new W(this.canvas), this.hammer.on("pan", this.onPan), this.hammer.on("panstart", this.onPanstart), this.hammer.on("panend", this.onPanend)), this.initStyle();
   }
   enable() {
     if (!this.state.enabled)
@@ -86,124 +96,222 @@ class L {
   resetOffset() {
     this.offset = { x: 0, y: 0 }, this.canvas.style.transform = "translate3d(0px, 0px, 100px)";
   }
+  /** 更新读回分辨率倍数；V2 用它按设备像素渲染，读回失败的机型可随时降级 */
+  setReadPixelsPixelRatio(t) {
+    const e = v(t);
+    e !== this.readPixelsPixelRatio && (this.readPixelsPixelRatio = e, this.applyCanvasSize(), this.clear());
+  }
+  /** 是否让放大镜强制渲染模型（true）还是沿用主视图的全景 / 模型状态（false） */
+  setSkipPanorama(t) {
+    this.config.skipPanorama = t;
+  }
+  getReadPixelsPixelRatio() {
+    return this.readPixelsPixelRatio;
+  }
+  getCanvasPixelSize() {
+    var e;
+    const t = (e = this.lastReadWindow) != null ? e : this.getBaseReadWindow();
+    return { width: t.imageWidth, height: t.imageHeight };
+  }
+  /** 读出区域与像素映射的唯一真值来源，叠加层也需要用同一份数据 */
+  getReadWindowInfo() {
+    var t;
+    return (t = this.lastReadWindow) != null ? t : this.getBaseReadWindow();
+  }
+  /** 运行时开关自适应取景，用于对比新旧行为 */
+  setAdaptiveReadWindow(t) {
+    this.adaptiveReadWindow = P(t), this.adaptiveDisabled = !1, this.smoothedReadWindowPx = 0, this.lastReadWindow = void 0, this.applyCanvasSize(), this.clear();
+  }
   /** 更新放大镜的缩放比例 */
   updateScale(t) {
     t > 0 && (this.scale = t);
   }
   /** 更新放大镜的尺寸 */
   updateSize(t, e) {
-    if (t > 0) {
-      this.width = t, this.height = e || t;
-      const i = 1;
-      this.canvas.setAttribute("width", (this.width * i).toString()), this.canvas.setAttribute("height", (this.height * i).toString()), this.canvas.style.width = this.width + "px", this.canvas.style.height = this.height + "px";
-      const h = Math.floor(this.width * i), n = Math.floor(this.height * i);
-      this.imageData = new ImageData(h, n), this.clear();
-    }
+    t > 0 && (this.width = t, this.height = e || t, this.applyCanvasSize(), this.clear());
   }
   render() {
     if (!this.five.renderer || !this.containerDom)
       return;
-    const { scale: t, context: e, width: i, height: h } = this, n = this.five.renderer.getSize(new p.Vector2()), [l, o] = (() => {
+    const { context: t } = this, e = this.five.renderer.getSize(new m.Vector2()), [a, h] = (() => {
       if (this.renderCenter.isVector3) {
-        const a = this.renderCenter.clone().project(this.five.camera);
-        return [(a.x + 1) / 2 * n.x, (a.y + 1) / 2 * n.y];
+        const n = this.renderCenter.clone().project(this.five.camera);
+        return [(n.x + 1) / 2 * e.x, (n.y + 1) / 2 * e.y];
       } else
-        return [this.renderCenter.x, n.y - this.renderCenter.y];
-    })(), c = 1, m = i / t, d = h / t, x = c * t, v = /* @__PURE__ */ new Map();
-    this.five.scene.traverse((a) => {
-      a.disableGetPixel === !0 && (v.set(a, a.visible), a.visible = !1);
+        return [this.renderCenter.x, e.y - this.renderCenter.y];
+    })();
+    let i = this.getReadWindow(this.getDistanceToCamera());
+    this.lastReadWindow = i, this.syncCanvasSize(i);
+    const o = /* @__PURE__ */ new Map();
+    this.five.scene.traverse((n) => {
+      n.disableGetPixel === !0 && (o.set(n, n.visible), n.visible = !1);
     });
     try {
-      const a = this.five.getPixels({
-        x: l - m / 2,
-        y: o - m / 2,
-        width: m,
-        height: d,
-        pixelRatio: x,
-        skipPanorama: this.config.skipPanorama
-      });
-      v.forEach((P, b) => {
-        b.visible = P;
-      });
-      const f = Math.floor(i * c), g = Math.floor(h * c), y = f * g * 4;
-      if (!a || a.length !== y) {
+      let n = this.readPixels(i, a, h);
+      if (!n && (this.readPixelsPixelRatio > 1 || this.isAdaptiveActive()) && (this.readPixelsPixelRatio = 1, this.adaptiveDisabled = !0, this.smoothedReadWindowPx = 0, this.applyCanvasSize(), i = this.getBaseReadWindow(), this.lastReadWindow = i, this.syncCanvasSize(i), n = this.readPixels(i, a, h)), o.forEach((d, l) => {
+        l.visible = d;
+      }), !n) {
         console.warn("Magnifier: Invalid pixel data", {
-          pixelsLength: a == null ? void 0 : a.length,
-          expectedLength: y,
-          imageWidth: f,
-          imageHeight: g
+          expectedLength: i.imageWidth * i.imageHeight * 4,
+          imageWidth: i.imageWidth,
+          imageHeight: i.imageHeight,
+          readPixelsPixelRatio: this.readPixelsPixelRatio
         });
         return;
       }
-      E(a, f, g), (this.imageData.width !== f || this.imageData.height !== g) && (this.imageData = new ImageData(f, g)), this.imageData.data.length !== a.length && (console.warn("Magnifier: ImageData size mismatch", {
+      b(n, i.imageWidth, i.imageHeight), (this.imageData.width !== i.imageWidth || this.imageData.height !== i.imageHeight) && (this.imageData = new ImageData(i.imageWidth, i.imageHeight)), this.imageData.data.length !== n.length && (console.warn("Magnifier: ImageData size mismatch", {
         imageDataLength: this.imageData.data.length,
-        pixelsLength: a.length,
-        imageWidth: f,
-        imageHeight: g
-      }), this.imageData = new ImageData(f, g));
+        pixelsLength: n.length,
+        imageWidth: i.imageWidth,
+        imageHeight: i.imageHeight
+      }), this.imageData = new ImageData(i.imageWidth, i.imageHeight));
       try {
-        this.imageData.data.set(a);
-      } catch (P) {
+        this.imageData.data.set(n);
+      } catch (d) {
         console.error("Magnifier: Failed to set pixel data", {
-          error: P,
+          error: d,
           imageDataLength: this.imageData.data.length,
-          pixelsLength: a.length,
-          imageWidth: f,
-          imageHeight: g
+          pixelsLength: n.length,
+          imageWidth: i.imageWidth,
+          imageHeight: i.imageHeight
         });
         return;
       }
-      e.putImageData(this.imageData, 0, 0), this.canvas.style.visibility = "visible";
-    } catch (a) {
-      console.error("Magnifier render error:", a), v.forEach((f, g) => {
-        g.visible = f;
+      t.putImageData(this.imageData, 0, 0), this.canvas.style.visibility = "visible";
+    } catch (n) {
+      console.error("Magnifier render error:", n), o.forEach((d, l) => {
+        l.visible = d;
       });
     }
   }
   getRenderCenter() {
     return this.renderCenter;
   }
+  /** 旧的固定窗口：始终取 width / scale 大小的屏幕区域，倍率恒为 scale */
+  getBaseReadWindow() {
+    const { width: t, height: e, scale: a } = this, h = Math.max(1, Math.ceil(t / a)), i = Math.max(1, Math.ceil(e / a)), o = Math.max(1, Math.ceil(this.readPixelsPixelRatio * a));
+    return {
+      readWidth: h,
+      readHeight: i,
+      radio: o,
+      imageWidth: h * o,
+      imageHeight: i * o
+    };
+  }
+  isAdaptiveActive() {
+    return this.adaptiveReadWindow.enabled && !this.adaptiveDisabled;
+  }
+  /**
+   * 按落点距离计算本帧取景窗口。
+   *
+   * 目标：放大镜里始终覆盖固定大小的世界范围（worldSize），
+   * 所以远点的取景窗口更小、光学倍率更高；近点退化为旧的 2x 窗口。
+   */
+  getReadWindow(t) {
+    var x, u;
+    const e = this.getBaseReadWindow(), a = this.adaptiveReadWindow;
+    if (!this.isAdaptiveActive() || !t || !Number.isFinite(t) || t <= 0)
+      return e;
+    const h = (x = this.five) == null ? void 0 : x.renderer, i = (u = this.five) == null ? void 0 : u.camera;
+    if (!h || !i || i.isOrthographicCamera)
+      return e;
+    const o = i.fov;
+    if (!Number.isFinite(o) || o <= 0)
+      return e;
+    const n = h.getSize(new m.Vector2());
+    if (!n || n.y <= 0)
+      return e;
+    const d = 2 * t * Math.tan(m.MathUtils.degToRad(Math.min(179, o)) / 2) / n.y;
+    if (!Number.isFinite(d) || d <= 0)
+      return e;
+    const l = e.readWidth, c = Math.max(
+      1,
+      Math.min(l, Math.max(a.minWindowPx, this.width / Math.max(1, a.maxZoom)))
+    ), g = Math.min(l, Math.max(c, a.worldSize / d)), w = Math.min(1, Math.max(0.05, a.smoothing));
+    return this.smoothedReadWindowPx = this.smoothedReadWindowPx > 0 ? this.smoothedReadWindowPx + (g - this.smoothedReadWindowPx) * w : g, this.frameFromReadWidth(Math.max(1, Math.round(this.smoothedReadWindowPx)), e);
+  }
+  /** 由取景宽度反推读回倍率，让 canvas 的设备像素尺寸与旧版保持一致 */
+  frameFromReadWidth(t, e) {
+    const a = this.width > 0 ? this.height / this.width : 1, h = Math.max(1, Math.round(t * a)), i = Math.max(1, Math.min(32, Math.ceil(e.imageWidth / t)));
+    return {
+      readWidth: t,
+      readHeight: h,
+      radio: i,
+      imageWidth: t * i,
+      imageHeight: h * i
+    };
+  }
+  /** 落点到相机的距离；屏幕坐标模式下无法计算，返回 undefined */
+  getDistanceToCamera() {
+    var h;
+    const t = this.renderCenter, e = (h = this.five) == null ? void 0 : h.camera;
+    if (!e || !(t != null && t.isVector3))
+      return;
+    const a = t.distanceTo(e.position);
+    return Number.isFinite(a) ? a : void 0;
+  }
+  /** 自适应窗口会让 canvas backing 随帧变化，尺寸变化时才重设 */
+  syncCanvasSize(t) {
+    this.canvas.width === t.imageWidth && this.canvas.height === t.imageHeight || (this.canvas.setAttribute("width", String(t.imageWidth)), this.canvas.setAttribute("height", String(t.imageHeight)));
+  }
+  readPixels(t, e, a) {
+    try {
+      const h = this.five.getPixels({
+        x: e - t.readWidth / 2,
+        y: a - t.readHeight / 2,
+        width: t.readWidth,
+        height: t.readHeight,
+        pixelRatio: t.radio,
+        skipPanorama: this.config.skipPanorama
+      });
+      return !h || h.length !== t.imageWidth * t.imageHeight * 4 ? null : h;
+    } catch (h) {
+      return console.warn("Magnifier: getPixels failed", h), null;
+    }
+  }
+  applyCanvasSize() {
+    const t = this.getBaseReadWindow();
+    this.canvas.setAttribute("width", String(t.imageWidth)), this.canvas.setAttribute("height", String(t.imageHeight)), this.canvas.style.width = this.width + "px", this.canvas.style.height = this.height + "px", this.imageData = new ImageData(t.imageWidth, t.imageHeight);
+  }
   _appendTo(t) {
     if (this.resetOffset(), t.appendChild(this.canvas), !this.offsetRange) {
-      const e = this.canvas.getBoundingClientRect(), i = t.getBoundingClientRect(), h = i.right - e.right, n = i.bottom - e.bottom, l = i.left - e.left, o = i.top - e.top;
+      const e = this.canvas.getBoundingClientRect(), a = t.getBoundingClientRect(), h = a.right - e.right, i = a.bottom - e.bottom, o = a.left - e.left, n = a.top - e.top;
       this.offsetRange = {
-        min: { x: l, y: o },
-        max: { x: h, y: n }
+        min: { x: o, y: n },
+        max: { x: h, y: i }
       };
     }
   }
   autoFixPCPosition() {
     if (!this.containerDom)
       return;
-    const { width: t, height: e } = this, { clientWidth: i, clientHeight: h } = this.containerDom, [n, l, o] = (() => {
+    const { width: t, height: e } = this, { clientWidth: a, clientHeight: h } = this.containerDom, [i, o, n] = (() => {
       if (this.renderCenter.isVector3) {
-        const c = this.renderCenter.clone().project(this.five.camera);
+        const d = this.renderCenter.clone().project(this.five.camera);
         return [
           //
-          (c.x + 1) / 2 * i,
-          -(c.x - 1) / 2 * i,
-          -(c.y - 1) / 2 * h
+          (d.x + 1) / 2 * a,
+          -(d.x - 1) / 2 * a,
+          -(d.y - 1) / 2 * h
         ];
       } else
-        return [this.renderCenter.x, i - this.renderCenter.x, this.renderCenter.y];
+        return [this.renderCenter.x, a - this.renderCenter.x, this.renderCenter.y];
     })();
-    n < 183 ? (this.canvas.style.top = -e / 2 + "px", this.canvas.style.left = "90px") : o < 183 ? (this.canvas.style.top = "90px", this.canvas.style.left = -t / 2 + "px") : l < 183 ? (this.canvas.style.top = -e / 2 + "px", this.canvas.style.left = -t - 90 + "px") : (this.canvas.style.left = -t / 2 + "px", this.canvas.style.top = -e - 90 + "px"), this.canvas.style.transform = `translate3d(${n}px, ${o}px, 10px)`, this.offset = { x: n, y: o };
+    i < 183 ? (this.canvas.style.top = -e / 2 + "px", this.canvas.style.left = "90px") : n < 183 ? (this.canvas.style.top = "90px", this.canvas.style.left = -t / 2 + "px") : o < 183 ? (this.canvas.style.top = -e / 2 + "px", this.canvas.style.left = -t - 90 + "px") : (this.canvas.style.left = -t / 2 + "px", this.canvas.style.top = -e - 90 + "px"), this.canvas.style.transform = `translate3d(${i}px, ${n}px, 10px)`, this.offset = { x: i, y: n };
   }
   initStyle() {
     const t = this.canvas;
-    t.classList.add("five-plugin__magnifier"), t.style.position = "absolute", t.style.pointerEvents = this.config.dragEnabled ? "all" : "none", t.style.borderRadius = "50%", t.style.zIndex = "99";
-    const e = 1;
-    t.setAttribute("width", (this.width * e).toString()), t.setAttribute("height", (this.height * e).toString()), t.style.border = "2px solid rgba(255,255,255,0.20)", t.style.width = this.width + "px", t.style.height = this.height + "px", t.style.top = this.config.initialPosition.top, t.style.left = this.config.initialPosition.left, t.style.transform = "translate(0,0,100px)", t.style.visibility = "hidden", this.config.dragEnabled && (this.canvas.style.cursor = "pointer");
+    t.classList.add("five-plugin__magnifier"), t.style.position = "absolute", t.style.pointerEvents = this.config.dragEnabled ? "all" : "none", t.style.borderRadius = "50%", t.style.zIndex = "99", t.style.border = "2px solid rgba(255,255,255,0.20)", t.style.top = this.config.initialPosition.top, t.style.left = this.config.initialPosition.left, t.style.transform = "translate(0,0,100px)", t.style.visibility = "hidden", this.applyCanvasSize(), this.config.dragEnabled && (this.canvas.style.cursor = "pointer");
   }
   getPanOffset(t, e) {
     const {
-      min: { x: i, y: h },
-      max: { x: n, y: l }
-    } = e, o = this.offset.x + t.deltaX, c = this.offset.y + t.deltaY, m = Math.min(Math.max(o, i), n), d = Math.min(Math.max(c, h), l);
-    return { translateX: m, translateY: d };
+      min: { x: a, y: h },
+      max: { x: i, y: o }
+    } = e, n = this.offset.x + t.deltaX, d = this.offset.y + t.deltaY, l = Math.min(Math.max(n, a), i), c = Math.min(Math.max(d, h), o);
+    return { translateX: l, translateY: c };
   }
 }
-function u(s, t, e) {
+function f(s, t, e) {
   if (!s || t < 0 || e < 0 || t >= s.length || e >= s.length) {
     console.warn("exchange: Index out of bounds", {
       arrayLength: s == null ? void 0 : s.length,
@@ -212,33 +320,46 @@ function u(s, t, e) {
     });
     return;
   }
-  const i = s[t], h = s[e];
-  s[t] = h, s[e] = i;
+  const a = s[t], h = s[e];
+  s[t] = h, s[e] = a;
+}
+function v(s) {
+  return Number.isFinite(s) ? Math.min(4, Math.max(1, Math.round(s))) : 1;
+}
+function P(s) {
+  const t = typeof s == "object" && s !== null ? s : {};
+  return {
+    enabled: s === !0 || typeof s == "object" && s !== null,
+    worldSize: Number.isFinite(t.worldSize) ? Math.max(0.01, t.worldSize) : 0.25,
+    maxZoom: Number.isFinite(t.maxZoom) ? Math.max(1, t.maxZoom) : 8,
+    minWindowPx: Number.isFinite(t.minWindowPx) ? Math.max(1, t.minWindowPx) : 24,
+    smoothing: Number.isFinite(t.smoothing) ? Math.min(1, Math.max(0.05, t.smoothing)) : 0.25
+  };
 }
-function E(s, t, e) {
+function b(s, t, e) {
   if (!s || t <= 0 || e <= 0) {
     console.warn("flipPixelsY: Invalid parameters", { pixelsLength: s == null ? void 0 : s.length, width: t, height: e });
     return;
   }
-  const i = t * e * 4;
-  if (s.length < i) {
+  const a = t * e * 4;
+  if (s.length < a) {
     console.warn("flipPixelsY: Pixel array too small", {
       actualLength: s.length,
-      expectedLength: i,
+      expectedLength: a,
       width: t,
       height: e
     });
     return;
   }
   const h = e / 2;
-  for (let n = 1; n <= h; n++) {
-    const l = e - (n - 1);
-    for (let o = 1; o <= t; o++) {
-      const c = (n - 1) * t + o - 1, m = (l - 1) * t + o - 1, d = c * 4, x = m * 4;
-      d + 3 < s.length && x + 3 < s.length && (u(s, d + 0, x + 0), u(s, d + 1, x + 1), u(s, d + 2, x + 2), u(s, d + 3, x + 3));
+  for (let i = 1; i <= h; i++) {
+    const o = e - (i - 1);
+    for (let n = 1; n <= t; n++) {
+      const d = (i - 1) * t + n - 1, l = (o - 1) * t + n - 1, c = d * 4, g = l * 4;
+      c + 3 < s.length && g + 3 < s.length && (f(s, c + 0, g + 0), f(s, c + 1, g + 1), f(s, c + 2, g + 2), f(s, c + 3, g + 3));
     }
   }
 }
 export {
-  L as Magnifier
+  S as Magnifier
 };

package/libs/shared-utils/three/PointSelector/index.d.ts

@@ -98,7 +98,7 @@ export declare class PointSelector extends Subscribe<EventMap> {
     /**
      * @description 吸附功能总开关，方便临时的一键开启/关闭
      */
-    private adhereEnabled;
+    protected adhereEnabled: boolean;
     /**
      * @description 吸附半径
      */
@@ -115,11 +115,14 @@ export declare class PointSelector extends Subscribe<EventMap> {
     private _outOfFive;
     private set enabled(value);
     private _enabled;
-    private mode;
+    protected mode: PointerSelectorMode;
     /** 长按屏幕的动作触发后为true，手指抬起后为false */
     private pressDown;
     /** 一组吸附的点，光标靠近这些点时，会将helper以及放大镜的位置设置为这些点 */
-    private adherePoints;
+    protected adherePoints: ((params: {
+        intersection: PointIntersection;
+        pointSelectorInstance: PointSelector;
+    }) => AdherePoint[]) | null;
     /** 有值时表明处于按压检查阶段 */
     private setPressDown?;
     private lastFiveHelperVisible?;
@@ -128,7 +131,10 @@ export declare class PointSelector extends Subscribe<EventMap> {
     private _mouseDownInfo;
     private _touchStartInfo;
     private config;
-    private get mouseNdcPosition();
+    protected get mouseNdcPosition(): {
+        x: number;
+        y: number;
+    } | null;
     constructor(five: Five, config?: PointSelectorConfig);
     enable(): void;
     disable(): void;
@@ -152,7 +158,7 @@ export declare class PointSelector extends Subscribe<EventMap> {
     /**
      * @description: 鼠标进入five canvas时
      */
-    private onEnter;
+    protected onEnter: () => void;
     /**
      * @description: 鼠标进入five canvas时
      */
@@ -170,11 +176,14 @@ export declare class PointSelector extends Subscribe<EventMap> {
     /**
      * @description: 根据鼠标位置计算焦点位置并更新
      */
-    private updateByNdcPosition;
+    protected updateByNdcPosition: (ndcPosition: {
+        x: number;
+        y: number;
+    }) => boolean;
     /**
      * @description: 更新 pointSelectorHelper 的焦点位置
      */
-    private updatePointSelectorHelperIntersect;
+    protected updatePointSelectorHelperIntersect: (intersect?: PointIntersection | null) => void;
     private mousePositionToNdcPosition;
     private onFiveWantsPanGesture;
     private renderScreenCenter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.81.21",
+  "version": "3.81.23",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",

package/docs/functions/validatePolygon.html

@@ -1 +0,0 @@
-<!DOCTYPE html><html class="default" lang="en"><head><meta charset="utf-8"/><meta http-equiv="x-ua-compatible" content="IE=edge"/><title>validatePolygon | 如视空间交互插件合集 - v3.81.21</title><meta name="description" content="Documentation for 如视空间交互插件合集"/><meta name="viewport" content="width=device-width, initial-scale=1"/><link rel="stylesheet" href="../assets/style.css"/><link rel="stylesheet" href="../assets/highlight.css"/><link rel="stylesheet" href="../assets/custom.css"/><script defer src="../assets/main.js"></script><script async src="../assets/icons.js" id="tsd-icons-script"></script><script async src="../assets/search.js" id="tsd-search-script"></script><script async src="../assets/navigation.js" id="tsd-nav-script"></script></head><body><script>document.documentElement.dataset.theme = localStorage.getItem("tsd-theme") || "os";document.body.style.display="none";setTimeout(() => app?app.showPage():document.body.style.removeProperty("display"),500)</script><header class="tsd-page-toolbar"><div class="tsd-toolbar-contents container"><div class="table-cell" id="tsd-search" data-base=".."><div class="field"><label for="tsd-search-field" class="tsd-widget tsd-toolbar-icon search no-caption"><svg width="16" height="16" viewBox="0 0 16 16" fill="none"><use href="../assets/icons.svg#icon-search"></use></svg></label><input type="text" id="tsd-search-field" aria-label="Search"/></div><div class="field"><div id="tsd-toolbar-links"></div></div><ul class="results"><li class="state loading">Preparing search index...</li><li class="state failure">The search index is not available</li></ul><a href="../index.html" class="title">如视空间交互插件合集 - v3.81.21</a></div><div class="table-cell" id="tsd-widgets"><a href="#" class="tsd-widget tsd-toolbar-icon menu no-caption" data-toggle="menu" aria-label="Menu"><svg width="16" height="16" viewBox="0 0 16 16" fill="none"><use href="../assets/icons.svg#icon-menu"></use></svg></a></div></div></header><div class="container container-main"><div class="col-content"><div class="tsd-page-title"><ul class="tsd-breadcrumb"><li><a href="../modules.html">如视空间交互插件合集</a></li><li><a href="validatePolygon.html">validatePolygon</a></li></ul><h1>Function validatePolygon</h1></div><section class="tsd-panel"><ul class="tsd-signatures"><li class="tsd-signature tsd-anchor-link"><a id="validatePolygon" class="tsd-anchor"></a><span class="tsd-kind-call-signature">validate<wbr/>Polygon</span><span class="tsd-signature-symbol">(</span><span class="tsd-kind-parameter">points</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">boolean</span><a href="#validatePolygon" aria-label="Permalink" class="tsd-anchor-icon"><svg viewBox="0 0 24 24"><use href="../assets/icons.svg#icon-anchor"></use></svg></a></li><li class="tsd-description"><div class="tsd-parameters"><h4 class="tsd-parameters-title">Parameters</h4><ul class="tsd-parameter-list"><li><span><span class="tsd-kind-parameter">points</span>: <span class="tsd-signature-type">Vector3</span><span class="tsd-signature-symbol">[]</span></span></li></ul></div><h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">boolean</span></h4><aside class="tsd-sources"><ul><li>Defined in plugins/src/MeasurePlugin/utils/validatePolygon.ts:4</li></ul></aside></li></ul></section></div><div class="col-sidebar"><div class="page-menu"><div class="tsd-navigation settings"><details class="tsd-accordion"><summary class="tsd-accordion-summary"><h3><svg width="20" height="20" viewBox="0 0 24 24" fill="none"><use href="../assets/icons.svg#icon-chevronDown"></use></svg>Settings</h3></summary><div class="tsd-accordion-details"><div class="tsd-filter-visibility"><span class="settings-label">Member Visibility</span><ul id="tsd-filter-options"><li class="tsd-filter-item"><label class="tsd-filter-input"><input type="checkbox" id="tsd-filter-inherited" name="inherited" checked/><svg width="32" height="32" viewBox="0 0 32 32" aria-hidden="true"><rect class="tsd-checkbox-background" width="30" height="30" x="1" y="1" rx="6" fill="none"></rect><path class="tsd-checkbox-checkmark" d="M8.35422 16.8214L13.2143 21.75L24.6458 10.25" stroke="none" stroke-width="3.5" stroke-linejoin="round" fill="none"></path></svg><span>Inherited</span></label></li></ul></div><div class="tsd-theme-toggle"><label class="settings-label" for="tsd-theme">Theme</label><select id="tsd-theme"><option value="os">OS</option><option value="light">Light</option><option value="dark">Dark</option></select></div></div></details></div></div><div class="site-menu"><nav class="tsd-navigation"><a href="../modules.html"><svg class="tsd-kind-icon" viewBox="0 0 24 24"><use href="../assets/icons.svg#icon-1"></use></svg><span>如视空间交互插件合集 - v3.81.21</span></a><ul class="tsd-small-nested-navigation" id="tsd-nav-container" data-base=".."><li>Loading...</li></ul></nav></div></div></div><footer></footer><div class="overlay"></div></body></html>