@realsee/dnalogel 3.67.9 → 3.67.11-alpha.1

package/libs/base/BasePlugin.js

@@ -22,7 +22,7 @@ let F = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.67.9");
+    i(this, "VERSION", "3.67.11-alpha.1");
     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.67.9",
+    "%c %c@realsee/dnalogel %cv3.67.11-alpha.1",
     [
       "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

@@ -12,6 +12,8 @@ interface MagnifierConfig {
         left: string;
         top: string;
     };
+    /** 是否跳过全景图渲染 */
+    skipPanorama: boolean;
 }
 interface MagnifierEvent extends SubscribeEventMap {
     wantsPanGesture: (event: (typeof Hammer)['Input']) => boolean;

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

@@ -45,7 +45,8 @@ class L {
     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 = {
       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" }
+      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)
@@ -113,21 +114,22 @@ class L {
       a.disableGetPixel === !0 && (v.set(a, a.visible), a.visible = !1);
     });
     try {
-      const a = this.five.getPixels(
-        l - m / 2,
-        o - m / 2,
-        m,
-        d,
-        x
-      );
-      v.forEach((y, b) => {
-        b.visible = y;
+      const a = this.five.getPixels({
+        x: l - m / 2,
+        y: o - m / 2,
+        width: m,
+        height: d,
+        pixelRatio: x,
+        skipPanorama: this.config.skipPanorama
       });
-      const f = Math.floor(i * c), g = Math.floor(h * c), P = f * g * 4;
-      if (!a || a.length !== P) {
+      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) {
         console.warn("Magnifier: Invalid pixel data", {
           pixelsLength: a == null ? void 0 : a.length,
-          expectedLength: P,
+          expectedLength: y,
           imageWidth: f,
           imageHeight: g
         });
@@ -141,9 +143,9 @@ class L {
       }), this.imageData = new ImageData(f, g));
       try {
         this.imageData.data.set(a);
-      } catch (y) {
+      } catch (P) {
         console.error("Magnifier: Failed to set pixel data", {
-          error: y,
+          error: P,
           imageDataLength: this.imageData.data.length,
           pixelsLength: a.length,
           imageWidth: f,

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

@@ -34,6 +34,11 @@ interface Config {
      */
     actionIfNoModelUnderMouse: ActionIfNoIntersection;
     helper: PointSelectorHelperConfig;
+    /**
+     * @description 是否跳过全景图渲染
+     * @default false
+     */
+    skipPanorama: boolean;
 }
 export type PointSelectorConfig = Partial<Config>;
 type EventMap = {

package/libs/shared-utils/three/PointSelector/index.js

@@ -2,28 +2,28 @@ var R = Object.defineProperty, O = Object.defineProperties;
 var X = Object.getOwnPropertyDescriptors;
 var N = Object.getOwnPropertySymbols;
 var Y = Object.prototype.hasOwnProperty, B = Object.prototype.propertyIsEnumerable;
-var E = (l, h, e) => h in l ? R(l, h, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[h] = e, P = (l, h) => {
+var M = (l, h, e) => h in l ? R(l, h, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[h] = e, P = (l, h) => {
   for (var e in h || (h = {}))
-    Y.call(h, e) && E(l, e, h[e]);
+    Y.call(h, e) && M(l, e, h[e]);
   if (N)
     for (var e of N(h))
-      B.call(h, e) && E(l, e, h[e]);
+      B.call(h, e) && M(l, e, h[e]);
   return l;
-}, M = (l, h) => O(l, X(h));
-var i = (l, h, e) => (E(l, typeof h != "symbol" ? h + "" : h, e), e);
+}, T = (l, h) => O(l, X(h));
+var i = (l, h, e) => (M(l, typeof h != "symbol" ? h + "" : h, e), e);
 import { PointSelectorHelper as C } from "./utils/PointSelectorHelper.js";
-import { isTouchDevice as j } from "../../isTouchDevice.js";
+import { isTouchDevice as k } from "../../isTouchDevice.js";
 import * as o from "three";
-import { Subscribe as A } from "../../Subscribe.js";
-import { getIntersectByRaycaster as k, getVirtualIntersectByRaycaster as g } from "../../five/getPosition.js";
-import { getRaycasterByNdcPosition as G } from "../../five/getRaycasterByNdcPosition.js";
+import { Subscribe as j } from "../../Subscribe.js";
+import { getIntersectByRaycaster as A, getVirtualIntersectByRaycaster as G } from "../../five/getPosition.js";
+import { getRaycasterByNdcPosition as W } from "../../five/getRaycasterByNdcPosition.js";
 import { CURSOR_NOT_ALLOW_URL as V } from "./utils/contents.js";
-import { rayOnLine as W } from "../../../Sculpt/utils/three/rayOnLine.js";
-import { THREERaycaster as z } from "../core/Raycaster.js";
+import { rayOnLine as z } from "../../../Sculpt/utils/three/rayOnLine.js";
+import { THREERaycaster as K } from "../core/Raycaster.js";
 const _ = new o.Vector3(), w = () => !1;
-class se extends A {
+class se extends j {
   constructor(e, t) {
-    var u, d, n, f;
+    var u, d, n, f, y;
     super();
     i(this, "_cursorError", !1);
     i(this, "actionIfNoIntersection", "virtualPoint");
@@ -181,10 +181,10 @@ class se extends A {
      */
     i(this, "updateByNdcPosition", (e) => {
       var c, u, d;
-      const t = G(this.five, e);
-      let s = k(this.five, t);
+      const t = W(this.five, e);
+      let s = A(this.five, t);
       if (s) {
-        if (this.plane && this.planeMode === "vertical" && (s = M(P({}, s), {
+        if (this.plane && this.planeMode === "vertical" && (s = T(P({}, s), {
           point: this.plane.projectPoint(s.point, new o.Vector3()),
           face: new o.Face3(0, 0, 0, this.plane.normal.clone()),
           originalPoint: s.point.clone()
@@ -219,7 +219,7 @@ class se extends A {
       if (this.actionIfNoIntersection === "lastPoint")
         return this.updatePointSelectorHelperIntersect(this.lastIntersection), !0;
       if (this.actionIfNoIntersection === "virtualPoint") {
-        const n = g(t, (c = this.lastIntersection) == null ? void 0 : c.distance);
+        const n = G(t, (c = this.lastIntersection) == null ? void 0 : c.distance);
         return n.face = new o.Face3(0, 0, 0, (d = (u = this.lastIntersection) == null ? void 0 : u.face) == null ? void 0 : d.normal), n.isVirtual = !0, this.lastIntersection = n, this.updatePointSelectorHelperIntersect(n), !0;
       } else if (this.actionIfNoIntersection === "disable")
         return this.updatePointSelectorHelperIntersect(null), !1;
@@ -228,7 +228,7 @@ class se extends A {
      * @description: 更新 pointSelectorHelper 的焦点位置
      */
     i(this, "updatePointSelectorHelperIntersect", (e) => {
-      var s, c, u, d, n, f, T, L;
+      var s, c, u, d, n, f, y, L;
       if (!e) {
         this.pointSelectorHelper.hide(), this.pointSelectorHelper.position = e, this.emit("intersectionUpdate", e), this.five.getElement().style.cursor = V;
         return;
@@ -236,7 +236,7 @@ class se extends A {
       this.onEnter(), this.cursorError || (this.five.getElement().style.cursor = "");
       const t = P({}, e);
       if (this.adhereEnabled && this.mouseNdcPosition && this.five.renderer) {
-        const S = {
+        const I = {
           x: this.mouseNdcPosition.x,
           y: 1 - this.mouseNdcPosition.y
         }, H = this.five.renderer.getSize(new o.Vector2());
@@ -251,21 +251,21 @@ class se extends A {
             if (a.distanceTo(e.point) < this.adhereRadius)
               (!this.plane || this.plane.distanceToPoint(a) < 0.01) && (a = (d = (u = this.plane) == null ? void 0 : u.projectPoint(a, new o.Vector3())) != null ? d : a, t.point = a.clone(), t.adhereLine = r.clone(), t.isAdsorbed = !0);
             else {
-              const p = W({
-                raycaster: new z(this.five.camera.position, e.point.clone().sub(this.five.camera.position).normalize()),
+              const p = z({
+                raycaster: new K(this.five.camera.position, e.point.clone().sub(this.five.camera.position).normalize()),
                 line: r,
                 clampToLine: !1
               }), v = p.clone().project(this.five.camera);
               if (v.z <= 1) {
-                const y = {
+                const b = {
                   x: (v.x + 1) / 2,
                   y: (1 - v.y) / 2
-                }, b = {
-                  x: Math.abs(y.x - S.x) * H.width,
-                  y: Math.abs(y.y - S.y) * H.height
+                }, S = {
+                  x: Math.abs(b.x - I.x) * H.width,
+                  y: Math.abs(b.y - I.y) * H.height
                 };
                 let m = p.clone();
-                b.x < 10 && b.y < 10 && (!this.plane || this.plane.distanceToPoint(m) < 0.01) && (m = (f = (n = this.plane) == null ? void 0 : n.projectPoint(m, new o.Vector3())) != null ? f : m, t.point = m.clone(), t.adhereLine = r.clone(), t.isAdsorbed = !0);
+                S.x < 10 && S.y < 10 && (!this.plane || this.plane.distanceToPoint(m) < 0.01) && (m = (f = (n = this.plane) == null ? void 0 : n.projectPoint(m, new o.Vector3())) != null ? f : m, t.point = m.clone(), t.adhereLine = r.clone(), t.isAdsorbed = !0);
               }
             }
           }
@@ -274,30 +274,30 @@ class se extends A {
             if (a.IsAlwaysVisible = r.IsAlwaysVisible, this.plane && this.plane.distanceToPoint(a) > 0.01)
               continue;
             if (a.distanceTo(e.point) < this.adhereRadius) {
-              t.point = (L = (T = this.plane) == null ? void 0 : T.projectPoint(a, new o.Vector3())) != null ? L : a.clone(), !this.plane && r instanceof o.Face3 && (t.face = r), t.isAdsorbed = !0;
+              t.point = (L = (y = this.plane) == null ? void 0 : y.projectPoint(a, new o.Vector3())) != null ? L : a.clone(), !this.plane && r instanceof o.Face3 && (t.face = r), t.isAdsorbed = !0;
               break;
             } else {
               const v = a.clone().project(this.five.camera);
               if (v.z > 1)
                 continue;
-              const y = this.five.renderer.getSize(new o.Vector2()), b = {
+              const b = this.five.renderer.getSize(new o.Vector2()), S = {
                 x: (v.x + 1) / 2,
                 y: (1 - v.y) / 2
               }, m = {
-                x: Math.abs(b.x - S.x) * y.width,
-                y: Math.abs(b.y - S.y) * y.height
+                x: Math.abs(S.x - I.x) * b.width,
+                y: Math.abs(S.y - I.y) * b.height
               };
               if (m.x < 10 && m.y < 10) {
-                let I = !1;
+                let E = !1;
                 if (a.IsAlwaysVisible)
-                  I = !0;
+                  E = !0;
                 else {
                   const D = new o.Raycaster();
                   D.setFromCamera(a.clone(), this.five.camera);
                   const F = this.five.model.intersectRaycaster(D, void 0, !0)[0], x = 0.1, U = this.five.camera.position.distanceTo(a);
-                  F && F.distance < U + x && (I = !0);
+                  F && F.distance < U + x && (E = !0);
                 }
-                if (I) {
+                if (E) {
                   t.point = a.clone(), !this.plane && r instanceof o.Face3 && (t.face = r), t.isAdsorbed = !0;
                   break;
                 }
@@ -330,13 +330,14 @@ class se extends A {
     });
     this.five = e, this.config = P(P({}, this.config), t), this.actionIfNoIntersection = (d = (u = t == null ? void 0 : t.actionIfNoIntersection) != null ? u : t == null ? void 0 : t.actionIfNoModelUnderMouse) != null ? d : "virtualPoint";
     const s = (n = t == null ? void 0 : t.mode) != null ? n : "auto";
-    s === "auto" ? this.mode = j ? "fixed" : "cursor" : this.mode = s;
+    s === "auto" ? this.mode = k ? "fixed" : "cursor" : this.mode = s;
     const c = {
       autoFixPCPosition: this.mode === "cursor",
       initialPosition: this.mode === "fixed" ? { left: "35%", top: "20%" } : void 0
     };
-    this.pointSelectorHelper = new C(this.five, M(P({}, t == null ? void 0 : t.helper), {
-      magnifierParams: P(P({}, c), (f = t == null ? void 0 : t.helper) == null ? void 0 : f.magnifierParams)
+    this.pointSelectorHelper = new C(this.five, T(P({}, t == null ? void 0 : t.helper), {
+      magnifierParams: P(P({}, c), (f = t == null ? void 0 : t.helper) == null ? void 0 : f.magnifierParams),
+      skipPanorama: (y = t == null ? void 0 : t.skipPanorama) != null ? y : !1
     })), this.pointSelectorHelper.hide();
   }
   get position() {

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

@@ -9,6 +9,7 @@ export interface PointSelectorHelperConfig {
     magnifierParams?: ConstructorParameters<typeof Magnifier>[1];
     pointHelper?: PointHelperAbstract | 'default' | 'highlight' | null;
     container?: Element;
+    skipPanorama?: boolean;
 }
 type EventMap = {
     intersectionUpdate: (intersection: PointIntersection) => void;

package/libs/shared-utils/three/PointSelector/utils/PointSelectorHelper.js

@@ -1,12 +1,22 @@
-var d = Object.defineProperty;
-var m = (l, i, e) => i in l ? d(l, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[i] = e;
-var t = (l, i, e) => (m(l, typeof i != "symbol" ? i + "" : i, e), e);
-import * as p from "three";
-import { Magnifier as u } from "../../Magnifier.js";
+var b = Object.defineProperty, g = Object.defineProperties;
+var H = Object.getOwnPropertyDescriptors;
+var d = Object.getOwnPropertySymbols;
+var v = Object.prototype.hasOwnProperty, o = Object.prototype.propertyIsEnumerable;
+var n = (t, i, e) => i in t ? b(t, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : t[i] = e, p = (t, i) => {
+  for (var e in i || (i = {}))
+    v.call(i, e) && n(t, e, i[e]);
+  if (d)
+    for (var e of d(i))
+      o.call(i, e) && n(t, e, i[e]);
+  return t;
+}, u = (t, i) => g(t, H(i));
+var r = (t, i, e) => (n(t, typeof i != "symbol" ? i + "" : i, e), e);
+import * as c from "three";
+import { Magnifier as k } from "../../Magnifier.js";
 import "../index.js";
-import { PointHelper as b } from "./PointHelper.js";
-import { Subscribe as g } from "../../../Subscribe.js";
-import { PointHelper2 as o } from "./PointHelper2.js";
+import { PointHelper as w } from "./PointHelper.js";
+import { Subscribe as E } from "../../../Subscribe.js";
+import { PointHelper2 as P } from "./PointHelper2.js";
 import "../../core/Sphere.js";
 import "../../../../vendor/animejs/lib/anime.es.js";
 import "../../../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
@@ -15,40 +25,40 @@ import "../../CSS3DRenderer/index.js";
 import "../../../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "../../../five/FivePuppet.js";
 import "../../../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
-class T {
+class A {
   constructor(i, e) {
-    t(this, "five");
-    t(this, "hooks", new g());
-    t(this, "position", null);
-    t(this, "magnifier", null);
-    t(this, "pointHelper", null);
-    t(this, "state", { enabled: !1, visible: !0 });
-    t(this, "group", new p.Group());
-    t(this, "show", () => {
+    r(this, "five");
+    r(this, "hooks", new E());
+    r(this, "position", null);
+    r(this, "magnifier", null);
+    r(this, "pointHelper", null);
+    r(this, "state", { enabled: !1, visible: !0 });
+    r(this, "group", new c.Group());
+    r(this, "show", () => {
       var i, e;
       this.state.visible || (this.state.visible = !0, (i = this.pointHelper) == null || i.show(), (e = this.magnifier) == null || e.enable(), this.five.needsRender = !0);
     });
-    t(this, "hide", () => {
+    r(this, "hide", () => {
       var i, e;
       this.state.visible && (this.state.visible = !1, (i = this.pointHelper) == null || i.hide(), (e = this.magnifier) == null || e.disable(), this.five.needsRender = !0);
     });
-    t(this, "updateWithIntersect", (i, e = { emitEvent: !0 }) => {
-      var a;
+    r(this, "updateWithIntersect", (i, e = { emitEvent: !0 }) => {
+      var l;
       if (!i)
         return;
-      this.abortUpdateMagnifier(), this.position = i, e.emitEvent && this.hooks.emit("intersectionUpdate", i), (a = this.pointHelper) == null || a.updateWithIntersect(i);
-      const r = () => {
-        var n;
-        return (n = this.magnifier) == null ? void 0 : n.renderWithPoint(i.point);
+      this.abortUpdateMagnifier(), this.position = i, e.emitEvent && this.hooks.emit("intersectionUpdate", i), (l = this.pointHelper) == null || l.updateWithIntersect(i);
+      const a = () => {
+        var h;
+        return (h = this.magnifier) == null ? void 0 : h.renderWithPoint(i.point);
       };
-      this.abortUpdateMagnifier = () => this.five.off("renderFrame", r), this.five.once("renderFrame", r), this.five.needsRender = !0;
+      this.abortUpdateMagnifier = () => this.five.off("renderFrame", a), this.five.once("renderFrame", a), this.five.needsRender = !0;
     });
-    t(this, "abortUpdateMagnifier", () => {
+    r(this, "abortUpdateMagnifier", () => {
     });
-    var a, n, s, h, f;
-    this.five = i, this.magnifier = (e == null ? void 0 : e.magnifier) !== void 0 ? e.magnifier : new u(i, (a = e == null ? void 0 : e.magnifierParams) != null ? a : { dragEnabled: !0 });
-    let r = null;
-    (e == null ? void 0 : e.pointHelper) === "default" || (e == null ? void 0 : e.pointHelper) === void 0 ? r = new b(i) : (e == null ? void 0 : e.pointHelper) === "highlight" ? r = new o(i) : (e == null ? void 0 : e.pointHelper) === null ? r = null : r = e.pointHelper, this.pointHelper = r, this.group.name = "five-point-selector", this.five.scene.add(this.group), (f = this.magnifier) == null || f.appendTo((h = (s = e.container) != null ? s : (n = i.getElement()) == null ? void 0 : n.parentElement) != null ? h : document.body);
+    var l, h, s, f, m;
+    this.five = i, this.magnifier = (e == null ? void 0 : e.magnifier) !== void 0 ? e.magnifier : new k(i, u(p({ dragEnabled: !0 }, e == null ? void 0 : e.magnifierParams), { skipPanorama: (l = e == null ? void 0 : e.skipPanorama) != null ? l : !1 }));
+    let a = null;
+    (e == null ? void 0 : e.pointHelper) === "default" || (e == null ? void 0 : e.pointHelper) === void 0 ? a = new w(i) : (e == null ? void 0 : e.pointHelper) === "highlight" ? a = new P(i) : (e == null ? void 0 : e.pointHelper) === null ? a = null : a = e.pointHelper, this.pointHelper = a, this.group.name = "five-point-selector", this.five.scene.add(this.group), (m = this.magnifier) == null || m.appendTo((f = (s = e.container) != null ? s : (h = i.getElement()) == null ? void 0 : h.parentElement) != null ? f : document.body);
   }
   enable() {
     var i;
@@ -63,5 +73,5 @@ class T {
   }
 }
 export {
-  T as PointSelectorHelper
+  A as PointSelectorHelper
 };

package/package.json

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