@realsee/dnalogel 3.64.9-alpha.0 → 3.64.9-alpha.2

package/libs/CSS3DRenderPlugin/utils/three/CSS3DSprite.js

@@ -1,14 +1,15 @@
 var i = Object.defineProperty;
-var p = (r, S, t) => S in r ? i(r, S, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[S] = t;
-var e = (r, S, t) => (p(r, typeof S != "symbol" ? S + "" : S, t), t);
-import { CSS3DSprite as o } from "../../../shared-utils/three/CSS3DRenderer/index.js";
+var p = (t, S, e) => S in t ? i(t, S, { enumerable: !0, configurable: !0, writable: !0, value: e }) : t[S] = e;
+var r = (t, S, e) => (p(t, typeof S != "symbol" ? S + "" : S, e), e);
+import { CSS3DSprite as s } from "../../../shared-utils/three/CSS3DRenderer/index.js";
 import "three";
-class D extends o {
+class m extends s {
   constructor() {
     super(...arguments);
-    e(this, "isCSS3DSprite", !0);
+    r(this, "isCSS3DSprite", !0);
+    r(this, "isCSS3DObject", !0);
   }
 }
 export {
-  D as ICSS3DSprite
+  m as ICSS3DSprite
 };

package/libs/MeasurePlugin/Controller.js

@@ -298,7 +298,7 @@ class ct extends H {
       } else
         this.pointSelector.adherePlane = [];
     });
-    this.five = e, this.config = t != null ? t : { unit: "ft" }, this.group = new I(), this.group.name = "MeasureGroup", this.five.scene.add(this.group);
+    this.five = e, this.config = t != null ? t : { unit: "m" }, this.group = new I(), this.group.name = "MeasureGroup", this.five.scene.add(this.group);
   }
   get pointSelector() {
     return this._pointSelector ? this._pointSelector : (this._pointSelector = new C(this.five, { mode: "cursor", helper: { pointHelper: "highlight" } }), this._pointSelector);

package/libs/Sculpt/Meshes/Line.js

@@ -2,17 +2,17 @@ var M = Object.defineProperty, w = Object.defineProperties;
 var D = Object.getOwnPropertyDescriptors;
 var E = Object.getOwnPropertySymbols;
 var b = Object.prototype.hasOwnProperty, v = Object.prototype.propertyIsEnumerable;
-var p = (r, l, e) => l in r ? M(r, l, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[l] = e, f = (r, l) => {
+var u = (r, l, e) => l in r ? M(r, l, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[l] = e, f = (r, l) => {
   for (var e in l || (l = {}))
-    b.call(l, e) && p(r, e, l[e]);
+    b.call(l, e) && u(r, e, l[e]);
   if (E)
     for (var e of E(l))
-      v.call(l, e) && p(r, e, l[e]);
+      v.call(l, e) && u(r, e, l[e]);
   return r;
 }, S = (r, l) => w(r, D(l));
-var o = (r, l, e) => (p(r, typeof l != "symbol" ? l + "" : l, e), e);
+var o = (r, l, e) => (u(r, typeof l != "symbol" ? l + "" : l, e), e);
 import * as y from "three";
-import { DEFAULT_LINE_COLOR as I, DEFAULT_LINE_WIDTH as C, DEFAULT_HIGHLIGHT_OPACITY as O } from "../typings/style.js";
+import { DEFAULT_LINE_COLOR as I, DEFAULT_LINE_WIDTH as O, DEFAULT_HIGHLIGHT_OPACITY as C } from "../typings/style.js";
 import { anyPositionToVector3 as R } from "../../shared-utils/positionToVector3.js";
 import { IObject3D as B } from "../../shared-utils/three/IObject3D.js";
 import { LightTag as W } from "../../shared-utils/tag.js";
@@ -28,7 +28,7 @@ import { LineMaterial as P } from "../../shared-utils/three/core/LineMaterial.js
 import { THREE_Line2 as T } from "../../shared-utils/three/core/Line2.js";
 import { LineMaterial2 as j } from "../../shared-utils/three/core/LineMaterial2.js";
 import { transformUnit as A } from "../utils/unit.js";
-import { RenderDom as u } from "../utils/renderDom.js";
+import { RenderDom as p } from "../utils/renderDom.js";
 import "../../shared-utils/three/core/Sphere.js";
 import "../../vendor/animejs/lib/anime.es.js";
 import { notNil as d } from "../../shared-utils/isNil.js";
@@ -63,11 +63,13 @@ class ae extends B {
     o(this, "_onHidden", () => {
       this.doms.forEach((e) => e.container.style.display = "none");
     });
-    this.paramsStyle = f({ dashed: !1 }, e), this.geometry = new H();
+    this.paramsStyle = f({ dashed: !1, lineOpacity: 1 }, e), this.geometry = new H();
     const s = {
       color: new y.Color((h = e == null ? void 0 : e.lineColor) != null ? h : I),
-      linewidth: (m = e == null ? void 0 : e.lineWidth) != null ? m : C,
-      dashScale: 40,
+      linewidth: (m = e == null ? void 0 : e.lineWidth) != null ? m : O,
+      dashScale: 1,
+      dashSize: 0.02,
+      gapSize: 0.02,
       opacity: (c = e == null ? void 0 : e.lineOpacity) != null ? c : 1,
       depthWrite: !1,
       transparent: !0
@@ -77,10 +79,10 @@ class ae extends B {
       n && this.setResolution(n.width, n.height);
     }
     e && this.setStyle(e), e != null && e.points && this.setPoints(e.points), this.addEventListener("removed", () => {
-      u.cacheObject.delete(this), u.checkDom(this);
+      p.cacheObject.delete(this), p.checkDom(this);
     }), this.addEventListener("added", () => {
-      u.cacheObject.add(this);
-    }), u.checkDomEveryFrame();
+      p.cacheObject.add(this);
+    }), p.checkDomEveryFrame();
   }
   get style() {
     return {
@@ -174,7 +176,7 @@ class ae extends B {
       this.colorBeforeHighlight = (s = this.colorBeforeHighlight) != null ? s : this.line1.material.three_color, this.line1.material.three_color = t, this.line2.material.three_color = t;
     } else {
       this.opacityBeforeHighlight = (i = this.opacityBeforeHighlight) != null ? i : this.line1.material.opacity;
-      const t = this.opacityBeforeHighlight * O;
+      const t = this.opacityBeforeHighlight * C;
       this.line1.material.opacity = t, this.line2.material.opacity = t;
     }
     this.needsRender = !0;
@@ -205,7 +207,7 @@ class ae extends B {
       const c = (n) => {
         var g;
         this.doms[h].__text !== n && (this.doms[h].__text = n, n instanceof HTMLElement ? (this.doms[h].container.innerHTML = "", this.doms[h].container.appendChild(n)) : n ? this.doms[h].container.innerHTML = V(n, {
-          style: `color: #${d((g = this.style) == null ? void 0 : g.lineColor) ? new y.Color(this.style.lineColor).getHexString() : "ffffff"}`
+          style: `color: #${d((g = this.style) == null ? void 0 : g.lineColor) ? new y.Color(this.style.lineColor).getHexString() : "ffffff"}; ${this.paramsStyle.cssStyle}`
         }) : this.doms[h].container.innerHTML = "");
       };
       if (this.paramsStyle.tip)

package/libs/Sculpt/typings/style.d.ts

@@ -84,5 +84,9 @@ export type DisplayInfoConfig = {
      * @description 提示信息
      */
     tip: string | HTMLElement;
+    /**
+     * @description 提示信息样式
+     */
+    cssStyle?: string;
 };
 export type LineStyle = LineColorStyle & LineOpacityStyle & LineWidthStyle;

package/libs/Sculpt/utils/renderDom.d.ts

@@ -1,4 +1,4 @@
-import * as THREE from 'three';
+import type * as THREE from 'three';
 export type RenderDomObjectType = THREE.Object3D & {
     _onAdded: () => void;
     _onRemoved: () => void;

package/libs/base/BasePlugin.js

@@ -21,7 +21,7 @@ let E = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.64.9-alpha.0");
+    i(this, "VERSION", "3.64.9-alpha.2");
     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.64.9-alpha.0",
+    "%c %c@realsee/dnalogel %cv3.64.9-alpha.2",
     [
       "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/tag.js

@@ -5,16 +5,16 @@ var u = (p, e, t) => new Promise((o, n) => {
   var a = (i) => {
     try {
       s(t.next(i));
-    } catch (l) {
-      n(l);
+    } catch (h) {
+      n(h);
     }
-  }, h = (i) => {
+  }, l = (i) => {
     try {
       s(t.throw(i));
-    } catch (l) {
-      n(l);
+    } catch (h) {
+      n(h);
     }
-  }, s = (i) => i.done ? o(i.value) : Promise.resolve(i.value).then(a, h);
+  }, s = (i) => i.done ? o(i.value) : Promise.resolve(i.value).then(a, l);
   s((t = t.apply(p, e)).next());
 });
 import { anyPositionToVector3 as f } from "./positionToVector3.js";
@@ -110,7 +110,7 @@ class M {
       this.visibles[3] === !0 || this.visibles.every((t) => t !== !1) ? (this.container.style.opacity = "1", this.container.style.pointerEvents = "auto") : (this.container.style.opacity = "0", this.container.style.pointerEvents = "none");
     });
     r(this, "updateIntersectCheckVisible", () => {
-      var i, l;
+      var i, h;
       if (!this.position)
         return;
       if (!this.intersectCheck) {
@@ -121,11 +121,11 @@ class M {
       this.fiveUtil.workUtil.fromType === "poincare" && (t = 0.05);
       const o = this.transformedPosition.clone().sub(this.five.camera.position).normalize();
       v.set(this.five.camera.position, o);
-      const n = (i = U(this.five).intersectRaycaster(v)) != null ? i : [], a = (l = v.intersectObjects(this.extraObjectsForIntersectCheck, !0)) != null ? l : [], s = [...n, ...a].sort((c, d) => c.distance - d.distance)[0];
+      const n = (i = U(this.five).intersectRaycaster(v)) != null ? i : [], a = (h = v.intersectObjects(this.extraObjectsForIntersectCheck, !0)) != null ? h : [], s = [...n, ...a].sort((c, d) => c.distance - d.distance)[0];
       s ? e = (s == null ? void 0 : s.distance) + t > this.transformedPosition.distanceTo(this.five.camera.position) : e = !0, this.visibles[1] = e;
     });
-    var n, a, h;
-    this.five = e, this.fiveUtil = (n = e.__fiveUtil__) != null ? n : e.__fiveUtil__ = new w(e), this.originPosition = t ? f(t).clone() : void 0, this.transformedPosition = (a = this.originPosition) == null ? void 0 : a.clone(), this.positionsForRotate = (h = o == null ? void 0 : o.positionsForRotate) == null ? void 0 : h.map((s) => f(s).clone()), this.config = o != null ? o : {}, this.container = (() => {
+    var n, a, l;
+    this.five = e, this.fiveUtil = (n = e.__fiveUtil__) != null ? n : e.__fiveUtil__ = new w(e), this.originPosition = t ? f(t).clone() : void 0, this.transformedPosition = (a = this.originPosition) == null ? void 0 : a.clone(), this.positionsForRotate = (l = o == null ? void 0 : o.positionsForRotate) == null ? void 0 : l.map((s) => f(s).clone()), this.config = o != null ? o : {}, this.container = (() => {
       const s = document.createElement("div");
       return s.classList.add("light-tag"), s.style.width = "0", s.style.height = "0", s.style.position = "absolute", s.style.transition = "opacity 0.2s linear", s;
     })(), this.addResizeListener(), this.show(), this.enable(), setTimeout(() => {
@@ -155,14 +155,14 @@ class M {
    */
   enable() {
     return u(this, null, function* () {
-      var o, n, a, h;
+      var o, n, a, l;
       if (this.enabled || (this.enabled = !0, yield F(this.five), !this.enabled))
         return;
       if (this.wrapper = (n = this.config.wrapper) != null ? n : (o = this.five.getElement()) == null ? void 0 : o.parentElement, !this.wrapper) {
         console.error("lighttag: wrapper is required");
         return;
       }
-      const e = `light-tag-wrapper-${(h = (a = this.config) == null ? void 0 : a.namespace) != null ? h : "default"}`;
+      const e = `light-tag-wrapper-${(l = (a = this.config) == null ? void 0 : a.namespace) != null ? l : "default"}`;
       if (!this.tagWrapper) {
         let s = Array.from(this.wrapper.children).find((i) => i.id === e);
         if (!s) {
@@ -222,15 +222,15 @@ class M {
     const o = (() => {
       if (!this.simulate3D)
         return 1;
-      const h = 2 * Math.tan(0.5 * this.five.camera.fov / 180 * Math.PI), s = this.transformedPosition.distanceTo(this.five.camera.position);
-      return Math.max(Math.min(1 - h * s / 40, 1), 0.5);
+      const s = 3 * Math.tan(0.5 * this.five.camera.fov / 180 * Math.PI), i = this.transformedPosition.distanceTo(this.five.camera.position);
+      return Math.max(Math.min(1 - s * i / 40, 1), 0.5);
     })(), n = (() => {
       if (this.positionsForRotate === void 0 || this.positionsForRotate.length !== 2)
         return 0;
-      const [h, s] = this.positionsForRotate, i = m(this.five.camera, h, e), l = m(this.five.camera, s, e);
-      if (!i || !l)
+      const [l, s] = this.positionsForRotate, i = m(this.five.camera, l, e), h = m(this.five.camera, s, e);
+      if (!i || !h)
         return 0;
-      const c = i.leftPx > l.leftPx ? l : i, d = i.leftPx > l.leftPx ? i : l, y = d.leftPx - c.leftPx, b = d.topPx - c.topPx;
+      const c = i.leftPx > h.leftPx ? h : i, d = i.leftPx > h.leftPx ? i : h, y = d.leftPx - c.leftPx, b = d.topPx - c.topPx;
       return Math.atan2(b, y) * (180 / Math.PI);
     })();
     this.container.style.left = t.leftPx + "px", this.container.style.top = t.topPx + "px", this.container.style.transformOrigin = "center", this.container.style.transform = `scale(${o})`, n && (this.container.style.transform += ` rotate(${n}deg)`);

package/package.json

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