@realsee/dnalogel 3.71.2 → 3.71.3-alpha.1

package/libs/shared-utils/Object3DHelper/Helper/CSS3DScaleHelper.js

@@ -1,28 +1,30 @@
 var D = Object.defineProperty;
-var b = (c, n, e) => n in c ? D(c, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[n] = e;
-var i = (c, n, e) => (b(c, typeof n != "symbol" ? n + "" : n, e), e);
-import { CSS3DRender as f } from "../../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
-import * as l from "three";
+var b = (o, a, e) => a in o ? D(o, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[a] = e;
+var i = (o, a, e) => (b(o, typeof a != "symbol" ? a + "" : a, e), e);
+import { CSS3DRender as S } from "../../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
+import * as r from "three";
 import { RectangleScaleHelperAbstract as u } from "../Base/BaseHelper.js";
 import "../utils/getOrthographicCameraDirection.js";
-import { rectangleScaleDom as m } from "./HTML/rectangleScaleDom.js";
-import { cameraHooks as y } from "../utils/cameraHooks.js";
+import { rectangleScaleDom as y } from "./HTML/rectangleScaleDom.js";
+import { cameraHooks as f } from "../utils/cameraHooks.js";
 import "../../three/core/Sphere.js";
-class w extends u {
+class H extends u {
+  // 记录初始缩放值
   // eslint-disable-next-line max-params
-  constructor(e, t, s, o) {
+  constructor(e, t, s, n) {
     super(e);
     i(this, "name", "CSS3DScaleHelper");
     i(this, "points", []);
     i(this, "cornerPositions", []);
     i(this, "css3DInstance");
     i(this, "plane");
-    i(this, "css3DRenderer", new f());
+    i(this, "css3DRenderer", new S());
     i(this, "camera");
     i(this, "scene");
     i(this, "container");
     i(this, "enabled", !1);
-    this.camera = s, this.scene = o, this.container = t, this.initRectangleScaleHelper();
+    i(this, "initialScale");
+    this.camera = s, this.scene = n, this.container = t, this.initRectangleScaleHelper();
   }
   get helperObject() {
     var e;
@@ -41,7 +43,9 @@ class w extends u {
   }
   applyHelperScaleMatrix4(e, t) {
     var s;
-    (s = this.plane) == null || s.scale.applyMatrix4(e), this.helperObject.applyScaleMatrix4(e);
+    (s = this.plane) == null || s.scale.applyMatrix4(e), this.helperObject.applyScaleMatrix4(e), setTimeout(() => {
+      this.updateSphereCorrection();
+    }, 0);
   }
   updatePoints() {
     const e = this.calculatePointPosition(this.cornerPositions);
@@ -54,19 +58,19 @@ class w extends u {
     (t = this.css3DInstance) != null && t.css3DObject && this.helperObject.position.copy(this.originObject3D.position), this.plane && this.plane.position.copy(this.originObject3D.position), this.updatePoints(), this.css3DInstance && this.css3DInstance.show(), this.plane && (this.plane.visible = !0);
   }
   applyHelperQuaternion(e, t) {
-    var o;
-    const s = (o = this.css3DInstance) == null ? void 0 : o.css3DObject;
+    var n;
+    const s = (n = this.css3DInstance) == null ? void 0 : n.css3DObject;
     if (s) {
-      const a = new l.Vector3().subVectors(s.position, t).applyQuaternion(e).add(t);
-      s.position.copy(a), s.applyQuaternion(e);
+      const c = new r.Vector3().subVectors(s.position, t).applyQuaternion(e).add(t);
+      s.position.copy(c), s.applyQuaternion(e);
     }
     if (this.plane) {
-      const a = new l.Vector3().subVectors(this.plane.position, t).applyQuaternion(e).add(t);
-      this.plane.position.copy(a), this.plane.applyQuaternion(e);
+      const c = new r.Vector3().subVectors(this.plane.position, t).applyQuaternion(e).add(t);
+      this.plane.position.copy(c), this.plane.applyQuaternion(e);
     }
-    this.cornerPositions.forEach((a) => {
-      const p = new l.Vector3().subVectors(a, t).applyQuaternion(e).add(t);
-      a.copy(p);
+    this.cornerPositions.forEach((c) => {
+      const l = new r.Vector3().subVectors(c, t).applyQuaternion(e).add(t);
+      c.copy(l);
     });
   }
   enable() {
@@ -93,10 +97,20 @@ class w extends u {
    * 触发相机更新事件
    */
   onScaleEnd() {
-    y(this.camera).emit("cameraUpdate");
+    f(this.camera).emit("cameraUpdate");
+  }
+  updateSphereCorrection() {
+    if (!this.css3DInstance)
+      return;
+    this.initialScale || (this.initialScale = {
+      x: this.originObject3D.scale.x,
+      y: this.originObject3D.scale.y
+    });
+    const e = this.originObject3D.scale, t = e.x / this.initialScale.x, s = e.y / this.initialScale.y, n = this.css3DInstance.css3DObject.container;
+    n.style.setProperty("--parent-scaleX", t.toString()), n.style.setProperty("--parent-scaleY", s.toString());
   }
   initRectangleScaleHelper() {
-    var p, r;
+    var l, p;
     const e = this.getCornerPositions();
     if (!e)
       return;
@@ -105,12 +119,12 @@ class w extends u {
     if (!t)
       return;
     this.css3DInstance = t, t.appendToElement(this.container);
-    const s = t.css3DObject.container, { container: o, spheres: a } = m();
-    this.points = a.map((h, d) => ({
+    const s = t.css3DObject.container, { container: n, spheres: c } = y();
+    this.points = c.map((h, d) => ({
       direction: h.direction,
       point: h.element,
       position: this.calculatePointPosition(e)[d]
-    })), s.insertBefore(o, (p = s.children[0]) != null ? p : null), this.helperObject.position.copy(this.originObject3D.position), (r = this.plane) == null || r.position.copy(this.originObject3D.position);
+    })), s.insertBefore(n, (l = s.children[0]) != null ? l : null), this.helperObject.position.copy(this.originObject3D.position), (p = this.plane) == null || p.position.copy(this.originObject3D.position);
   }
   getCornerPositions() {
     const { originObject3D: e } = this;
@@ -132,5 +146,5 @@ class w extends u {
   }
 }
 export {
-  w as CSS3DScaleHelper
+  H as CSS3DScaleHelper
 };

package/libs/shared-utils/Object3DHelper/Helper/HTML/rectangleScaleDom.js

@@ -1,16 +1,16 @@
 var f = Object.defineProperty;
 var u = Object.getOwnPropertySymbols;
 var x = Object.prototype.hasOwnProperty, z = Object.prototype.propertyIsEnumerable;
-var w = (t, e, r) => e in t ? f(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, b = (t, e) => {
+var b = (t, e, r) => e in t ? f(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, w = (t, e) => {
   for (var r in e || (e = {}))
-    x.call(e, r) && w(t, r, e[r]);
+    x.call(e, r) && b(t, r, e[r]);
   if (u)
     for (var r of u(e))
-      z.call(e, r) && w(t, r, e[r]);
+      z.call(e, r) && b(t, r, e[r]);
   return t;
 };
 import { createElement as s } from "./utils/createElement.js";
-function v() {
+function D() {
   const t = s({
     width: "100%",
     height: "100%",
@@ -38,25 +38,26 @@ function v() {
     border: "1px solid rgba(255,255,255,0.4)"
   });
   t.appendChild(e), e.appendChild(r);
-  const n = "-4px", i = { direction: "nesw", element: o({ cursor: "nesw-resize", left: n, bottom: n }) }, p = { direction: "ns", element: o({ cursor: "ns-resize", bottom: n }) }, c = { direction: "nwse", element: o({ cursor: "nwse-resize", right: n, bottom: n }) }, h = { direction: "ew", element: o({ cursor: "ew-resize", right: n }) }, a = { direction: "nesw", element: o({ cursor: "nesw-resize", right: n, top: n }) }, d = { direction: "ns", element: o({ cursor: "ns-resize", top: n }) }, l = { direction: "nwse", element: o({ cursor: "nwse-resize", left: n, top: n }) }, g = { direction: "ew", element: o({ cursor: "ew-resize", left: n }) };
-  return new Array(p, h, d, g, i, c, a, l).forEach((m) => e.appendChild(m.element)), { container: t, spheres: [
+  const n = "-4px", i = { direction: "nesw", element: o({ cursor: "nesw-resize", left: n, bottom: n }) }, p = { direction: "ns", element: o({ cursor: "ns-resize", bottom: n }) }, c = { direction: "nwse", element: o({ cursor: "nwse-resize", right: n, bottom: n }) }, h = { direction: "ew", element: o({ cursor: "ew-resize", right: n }) }, d = { direction: "nesw", element: o({ cursor: "nesw-resize", right: n, top: n }) }, a = { direction: "ns", element: o({ cursor: "ns-resize", top: n }) }, l = { direction: "nwse", element: o({ cursor: "nwse-resize", left: n, top: n }) }, g = { direction: "ew", element: o({ cursor: "ew-resize", left: n }) };
+  return new Array(p, h, a, g, i, c, d, l).forEach((m) => e.appendChild(m.element)), { container: t, spheres: [
     i,
     p,
     c,
     h,
-    a,
     d,
+    a,
     l,
     g
   ] };
 }
 function o(t) {
-  const e = s(b({
-    background: "#FFFFFF",
+  const e = s(w({
+    background: "#FFFF00",
     width: "9px",
     height: "9px",
     position: "absolute",
-    pointerEvents: "none"
+    pointerEvents: "none",
+    borderRadius: "50%"
   }, t)), r = s({
     width: "15px",
     height: "15px",
@@ -76,5 +77,5 @@ function o(t) {
   return n.draggable = !0, r.appendChild(n), e.appendChild(r), e;
 }
 export {
-  v as rectangleScaleDom
+  D as rectangleScaleDom
 };

package/libs/shared-utils/logger.js

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

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.71.2",
+  "version": "3.71.3-alpha.1",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.9",
-    "@realsee/five": "6.6.0-alpha.13",
+    "@realsee/five": "6.6.0-alpha.21",
     "@sveltejs/vite-plugin-svelte": "^2.4.2",
     "@tsconfig/svelte": "^4.0.1",
     "@tweenjs/tween.js": "^23.1.1",