@realsee/dnalogel 3.47.3 → 3.47.4

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

@@ -40,6 +40,7 @@ export declare class Magnifier {
     private hammer?;
     private offsetRange?;
     private isPanning;
+    private imageData;
     constructor(five: Five, options: MagnifierParameter);
     enable(): this;
     disable(): this;

package/libs/Sculpt/Meshes/Line.js

@@ -14,10 +14,10 @@ import * as a from "three";
 import { DEFAULT_LINE_COLOR as m, DEFAULT_LINE_WIDTH as M, DEFAULT_HIGHLIGHT_OPACITY as D } from "../typings/style.js";
 import { LineGeometry as L, LineMaterial as w, THREE_Line2 as H } from "../../shared-utils/five/FiveLine.js";
 import { anyPositionToVector3 as C } from "../../shared-utils/positionToVector3.js";
-import { IObject3D as I } from "../../shared-utils/three/IObject3D.js";
+import { IObject3D as p } from "../../shared-utils/three/IObject3D.js";
 import "hammerjs";
 import "three/examples/jsm/renderers/CSS3DRenderer";
-import { centerPoint as p } from "../../shared-utils/three/centerPoint.js";
+import { centerPoint as I } from "../../shared-utils/three/centerPoint.js";
 import { LightTag as R } from "../../shared-utils/tag.js";
 import { globalModules as x } from "../utils/Modules/Global.js";
 import { removeAllTag as v } from "../utils/removeAllTag.js";
@@ -50,7 +50,7 @@ class T extends H {
     h(this, "name", "Line3");
   }
 }
-class J extends I {
+class J extends p {
   constructor(e) {
     var l, r, g, u, d;
     super();
@@ -139,15 +139,17 @@ class J extends I {
   }
   updateLengthItems() {
     var e, n;
-    if (this.points.length < 2 && (this.lengthDoms.forEach((t) => t.destroy()), this.lengthDoms = []), this.paramsStyle.lengthEnable) {
+    if ((!this.points || this.points.length < 2) && (this.lengthDoms.forEach((t) => t.destroy()), this.lengthDoms = []), this.paramsStyle.lengthEnable) {
       const t = (n = (e = this.points) == null ? void 0 : e.map((i, l) => {
         if (l !== 0)
           return [this.points[l - 1], i];
       }).filter(c)) != null ? n : [];
       t.forEach(([i, l], r) => {
         var d;
-        const g = p(i, l), u = i.distanceTo(l).toFixed(2) + "m";
-        this.lengthDoms[r] = (d = this.lengthDoms[r]) != null ? d : new R(x.five), this.lengthDoms[r].setPosition(g), this.lengthDoms[r].container.innerHTML = `<div style="pointer-events:none;color:white;">${u}</div>`;
+        const g = I(i, l), u = i.distanceTo(l).toFixed(2) + "m";
+        this.lengthDoms[r] = (d = this.lengthDoms[r]) != null ? d : new R(x.five), this.lengthDoms[r].setPosition(g), this.lengthDoms[r].container.innerHTML = `
+          <div style="pointer-events:none;color:white;">${u}</div>
+        `;
       }), this.lengthDoms.length > t.length && (this.lengthDoms.slice(t.length).forEach((i) => i.destroy()), this.lengthDoms.length = t.length);
     } else
       this.lengthDoms.forEach((t) => t.destroy()), this.lengthDoms = [];

package/libs/base/BasePlugin.js

@@ -17,7 +17,7 @@ let x = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.47.3");
+    i(this, "VERSION", "3.47.4");
     i(this, "NAME");
     i(this, "five");
     i(this, "workUtil");

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.47.3",
+    "%c %c@realsee/dnalogel %cv3.47.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",

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

@@ -40,6 +40,7 @@ export declare class Magnifier {
     private hammer?;
     private offsetRange?;
     private isPanning;
+    private imageData;
     constructor(five: Five, options: MagnifierParameter);
     enable(): this;
     disable(): this;

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

@@ -1,15 +1,15 @@
-var p = Object.defineProperty;
-var b = (r, t, e) => t in r ? p(r, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[t] = e;
-var n = (r, t, e) => (b(r, typeof t != "symbol" ? t + "" : t, e), e);
-import C from "hammerjs";
+var P = Object.defineProperty;
+var p = (r, t, e) => t in r ? P(r, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[t] = e;
+var n = (r, t, e) => (p(r, typeof t != "symbol" ? t + "" : t, e), e);
+import b from "hammerjs";
 import * as l from "three";
-import { Subscribe as R } from "../Subscribe.js";
-class Y {
+import { Subscribe as C } from "../Subscribe.js";
+class E {
   constructor(t, e) {
     n(this, "width");
     n(this, "height");
     n(this, "containerDom");
-    n(this, "hooks", new R());
+    n(this, "hooks", new C());
     n(this, "canvas", document.createElement("canvas"));
     n(this, "config");
     n(this, "state", { enabled: !1 });
@@ -21,6 +21,7 @@ class Y {
     n(this, "hammer");
     n(this, "offsetRange");
     n(this, "isPanning", !1);
+    n(this, "imageData", new ImageData(1, 1));
     n(this, "onPanstart", () => {
       this.isPanning = !0, this.canvas.style.boxShadow = "0 2px 30px 0 rgba(0,0,0,0.20)";
     });
@@ -49,7 +50,7 @@ class Y {
     const i = this.canvas.getContext("2d");
     if (!i)
       throw new Error("CANNOT CREATE CONTEXT2D");
-    this.context = i, this.config.dragEnabled && (this.hammer = new C(this.canvas), this.hammer.on("pan", this.onPan), this.hammer.on("panstart", this.onPanstart), this.hammer.on("panend", this.onPanend)), this.initStyle();
+    this.context = i, this.config.dragEnabled && (this.hammer = new b(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)
@@ -100,12 +101,12 @@ class Y {
       return;
     const { width: t, height: e } = this, { clientWidth: i, clientHeight: s } = this.containerDom, [h, o, a] = (() => {
       if (this.renderCenter instanceof l.Vector3) {
-        const c = this.renderCenter.clone().project(this.five.camera);
+        const f = this.renderCenter.clone().project(this.five.camera);
         return [
           //
-          (c.x + 1) / 2 * i,
-          -(c.x - 1) / 2 * i,
-          -(c.y - 1) / 2 * s
+          (f.x + 1) / 2 * i,
+          -(f.x - 1) / 2 * i,
+          -(f.y - 1) / 2 * s
         ];
       } else
         return [this.renderCenter.x, i - this.renderCenter.x, this.renderCenter.y];
@@ -117,14 +118,12 @@ class Y {
       return;
     const { scale: t, context: e, width: i, height: s } = this, h = this.five.renderer.getSize(new l.Vector2()), [o, a] = (() => {
       if (this.renderCenter instanceof l.Vector3) {
-        const y = this.renderCenter.clone().project(this.five.camera);
-        return [(y.x + 1) / 2 * h.x, (y.y + 1) / 2 * h.y];
+        const v = this.renderCenter.clone().project(this.five.camera);
+        return [(v.x + 1) / 2 * h.x, (v.y + 1) / 2 * h.y];
       } else
         return [this.renderCenter.x, h.y - this.renderCenter.y];
-    })(), c = 1, f = i / t, x = s / t, P = c * t, g = this.five.getPixels(o - f / 2, a - f / 2, f, x, P), m = Math.floor(i * c), u = Math.floor(s * c);
-    w(g, m, u);
-    const v = new ImageData(m, u);
-    v.data.set(g), e.putImageData(v, 0, 0), this.canvas.style.visibility = "visible";
+    })(), f = 1, c = i / t, g = s / t, y = f * t, u = this.five.getPixels(o - c / 2, a - c / 2, c, g, y), x = Math.floor(i * f), m = Math.floor(s * f);
+    D(u, x, m), (this.imageData.width !== x || this.imageData.height !== m) && (this.imageData = new ImageData(x, m)), this.imageData.data.set(u), e.putImageData(this.imageData, 0, 0), this.canvas.style.visibility = "visible";
   }
   initStyle() {
     const t = this.canvas;
@@ -136,24 +135,24 @@ class Y {
     const {
       min: { x: i, y: s },
       max: { x: h, y: o }
-    } = e, a = this.offset.x + t.deltaX, c = this.offset.y + t.deltaY, f = Math.min(Math.max(a, i), h), x = Math.min(Math.max(c, s), o);
-    return { translateX: f, translateY: x };
+    } = e, a = this.offset.x + t.deltaX, f = this.offset.y + t.deltaY, c = Math.min(Math.max(a, i), h), g = Math.min(Math.max(f, s), o);
+    return { translateX: c, translateY: g };
   }
 }
 function d(r, t, e) {
   const i = r[t], s = r[e];
   i === void 0 || s === void 0 || (r[t] = s, r[e] = i);
 }
-function w(r, t, e) {
+function D(r, t, e) {
   const i = e / 2;
   for (let s = 1; s <= i; s++) {
     const h = e - (s - 1);
     for (let o = 1; o <= t; o++) {
-      const a = (s - 1) * t + o - 1, c = (h - 1) * t + o - 1;
-      d(r, a * 4 + 0, c * 4 + 0), d(r, a * 4 + 1, c * 4 + 1), d(r, a * 4 + 2, c * 4 + 2), d(r, a * 4 + 3, c * 4 + 3);
+      const a = (s - 1) * t + o - 1, f = (h - 1) * t + o - 1;
+      d(r, a * 4 + 0, f * 4 + 0), d(r, a * 4 + 1, f * 4 + 1), d(r, a * 4 + 2, f * 4 + 2), d(r, a * 4 + 3, f * 4 + 3);
     }
   }
 }
 export {
-  Y as Magnifier
+  E as Magnifier
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.47.3",
+  "version": "3.47.4",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",
@@ -42,7 +42,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.9",
-    "@realsee/five": "6.1.3",
+    "@realsee/five": "6.2.0-alpha.6",
     "@sveltejs/vite-plugin-svelte": "^2.4.2",
     "@tsconfig/svelte": "^4.0.1",
     "@tweenjs/tween.js": "^23.1.1",