@realsee/dnalogel 2.7.1 → 2.7.2

package/libs/shared-utils/Object3DHelper/Controller/RotateController.js

@@ -1,12 +1,12 @@
 var O = Object.defineProperty;
-var T = (f, p, o) => p in f ? O(f, p, { enumerable: !0, configurable: !0, writable: !0, value: o }) : f[p] = o;
-var m = (f, p, o) => (T(f, typeof p != "symbol" ? p + "" : p, o), o);
-import { BaseController as R } from "../Base/BaseController.js";
-import * as i from "three";
-import { getMouseRaycaster as A } from "../utils/getMouseRaycaster.js";
-class Q extends R {
-  constructor(...o) {
-    super(...o);
+var T = (f, g, e) => g in f ? O(f, g, { enumerable: !0, configurable: !0, writable: !0, value: e }) : f[g] = e;
+var m = (f, g, e) => (T(f, typeof g != "symbol" ? g + "" : g, e), e);
+import { BaseController as A } from "../Base/BaseController.js";
+import * as s from "three";
+import { getMouseRaycaster as H } from "../utils/getMouseRaycaster.js";
+class C extends A {
+  constructor(...e) {
+    super(...e);
     m(this, "name", "RotateController");
     m(this, "startInfo");
     m(this, "lastRotation");
@@ -15,9 +15,9 @@ class Q extends R {
     m(this, "removeListener");
     const t = this.helperObject3D;
     this.hoverListener([t.xyCircle, t.xzCircle, t.yzCircle]);
-    const e = this.dragStart.bind(this), r = this.dragging.bind(this), s = this.dragEnd.bind(this), n = this.show.bind(this), c = this.hide.bind(this);
-    this.domEvents.addEventListener(this.helperObject3D, "mousedown", e), document.addEventListener("mousemove", r), document.addEventListener("mouseup", s), this.hooks.on("moveStart", c), this.hooks.on("moveEnd", n), this.hooks.on("moveByMouseEnable", c), this.hooks.on("moveByMouseDisable", n), this.removeListener = () => {
-      this.domEvents.removeEventListener(this.helperObject3D, "mousedown", e), document.removeEventListener("mousemove", r), document.removeEventListener("mouseup", s), this.hooks.off("moveStart", c), this.hooks.off("moveEnd", n), this.hooks.off("moveByMouseEnable", c), this.hooks.off("moveByMouseDisable", n);
+    const n = this.dragStart.bind(this), r = this.dragging.bind(this), i = this.dragEnd.bind(this), o = this.show.bind(this), c = this.hide.bind(this);
+    this.domEvents.addEventListener(this.helperObject3D, "mousedown", n), document.addEventListener("mousemove", r), document.addEventListener("mouseup", i), this.hooks.on("moveStart", c), this.hooks.on("moveEnd", o), this.hooks.on("moveByMouseEnable", c), this.hooks.on("moveByMouseDisable", o), this.removeListener = () => {
+      this.domEvents.removeEventListener(this.helperObject3D, "mousedown", n), document.removeEventListener("mousemove", r), document.removeEventListener("mouseup", i), this.hooks.off("moveStart", c), this.hooks.off("moveEnd", o), this.hooks.off("moveByMouseEnable", c), this.hooks.off("moveByMouseDisable", o);
     };
   }
   get rotateCenter() {
@@ -26,73 +26,72 @@ class Q extends R {
   initialHelperQuaternion() {
     this.helperObject3D.updateAngleHelperQuaternion(), this.helperObject3D.applyHelperQuaternion(this.originObject3D.quaternion);
   }
-  setRotateAngle(o) {
-    const { x: t = 0, y: e = 0, z: r = 0 } = o, s = new i.Euler(Math.PI * t / 180, Math.PI * e / 180, Math.PI * r / 180), n = new i.Quaternion().setFromEuler(s);
-    if (this.hooks.emit("wantToRotate", n))
+  setRotateAngle(e) {
+    const { x: t = 0, y: n = 0, z: r = 0 } = e, i = new s.Euler(Math.PI * t / 180, Math.PI * n / 180, Math.PI * r / 180), o = new s.Quaternion().setFromEuler(i);
+    if (this.hooks.emit("wantToRotate", o))
       return;
-    const { originObject3D: a, rotateCenter: g } = this;
-    if (g) {
-      const l = new i.Vector3().subVectors(a.position, g).applyQuaternion(n).add(g);
-      a.position.copy(l);
+    const { originObject3D: a, rotateCenter: p } = this;
+    if (p) {
+      const h = new s.Vector3().subVectors(a.position, p).applyQuaternion(o).add(p);
+      a.position.copy(h);
     }
-    a.quaternion.copy(n), this.helperObject3DQuaternion.copy(n), this.hooks.emit("setObjectRotate", n, g), this.hooks.emit("rotate", n), this.render();
+    a.quaternion.copy(o), this.helperObject3DQuaternion.copy(o), this.hooks.emit("setObjectRotate", o, p), this.hooks.emit("rotate", o), this.render();
   }
   dispose() {
     this.removeListener(), super.dispose();
   }
-  onApplyOriginObjectScale(o) {
+  onApplyOriginObjectScale(e) {
   }
-  dragStart(o) {
+  dragStart(e) {
     if (this.isDragging)
       return;
-    const t = o == null ? void 0 : o.intersect;
+    const t = e == null ? void 0 : e.intersect;
     if (!t)
       return this.dragEnd();
-    const e = (t == null ? void 0 : t.object).direction;
-    if (!e)
+    const n = (t == null ? void 0 : t.object).direction;
+    if (!n)
       return this.dragEnd();
     this.helperObject3D.updateAngleHelperQuaternion();
-    const r = t.point, s = this.getAngleHelper(e);
+    const r = t.point, i = this.getAngleHelper(n);
     this.setTipsAngle(0);
-    const n = r.clone();
-    n.y += 0.2, this.setTipsPosition(n);
-    const c = new i.Vector3(1, 0, 0).applyQuaternion(this.helperObject3DQuaternion), a = new i.Vector3(0, 1, 0).applyQuaternion(this.helperObject3DQuaternion), g = new i.Vector3(0, 0, 1).applyQuaternion(this.helperObject3DQuaternion), l = (() => {
-      switch (e) {
+    const o = r.clone();
+    o.y += 0.2, this.setTipsPosition(o);
+    const c = new s.Vector3(1, 0, 0).applyQuaternion(this.helperObject3DQuaternion), a = new s.Vector3(0, 1, 0).applyQuaternion(this.helperObject3DQuaternion), p = new s.Vector3(0, 0, 1).applyQuaternion(this.helperObject3DQuaternion), h = (() => {
+      switch (n) {
         case "x":
           return c;
         case "y":
           return a;
         case "z":
-          return g;
+          return p;
       }
-    })(), b = new i.Plane().setFromNormalAndCoplanarPoint(l, r), u = new i.Vector3();
+    })(), b = new s.Plane().setFromNormalAndCoplanarPoint(h, r), u = new s.Vector3();
     b.projectPoint(r.clone(), u);
-    const h = u.clone().sub(this.rotateCenter), D = h.clone(), E = h.angleTo(s.baseAxes);
-    this.setAngleHelperStart(e, E), this.setAngleHelperLength(e, 0), this.rotations.push({ vector: h.clone(), direction: !0 }), this.startInfo = { direction: e, startVector: h, staticStartVector: D, plane: b, angleHelper: s }, this.helperObject3D.showDraggingHelper([e]), this.hooks.emit("rotateStart"), this.isDragging = !0, console.log(`%c RotateController dragStart ${e}`, "color: #e5af2e");
+    const l = u.clone().sub(this.rotateCenter), D = l.clone(), w = l.angleTo(i.baseAxes);
+    this.setAngleHelperStart(n, w), this.setAngleHelperLength(n, 0), this.rotations.push({ vector: l.clone(), direction: !0 }), this.startInfo = { direction: n, startVector: l, staticStartVector: D, plane: b, angleHelper: i }, this.helperObject3D.showDraggingHelper([n]), this.hooks.emit("rotateStart"), this.isDragging = !0;
   }
-  dragging(o) {
-    var e;
+  dragging(e) {
     if (!this.isDragging)
       return;
-    const t = A(this.camera, o, this.container);
-    return t ? (console.log(`%c RotateController dragging ${(e = this.startInfo) == null ? void 0 : e.direction}`, "color: #49de1b"), this.rotate(t), !1) : this.dragEnd();
+    const t = H(this.camera, e, this.container);
+    return t ? (this.rotate(t), !1) : this.dragEnd();
   }
-  rotate(o) {
+  rotate(e) {
     if (!this.startInfo)
       return this.dragEnd();
-    const { startVector: t, plane: e, angleHelper: r, staticStartVector: s, direction: n } = this.startInfo, c = o.ray.intersectPlane(e, new i.Vector3());
+    const { startVector: t, plane: n, angleHelper: r, staticStartVector: i, direction: o } = this.startInfo, c = e.ray.intersectPlane(n, new s.Vector3());
     if (!c)
       return;
-    const a = this.rotateCenter, g = new i.Vector3();
-    e.projectPoint(c.clone(), g);
-    const l = g.clone().sub(a);
-    if (t.angleTo(l) === 0 || (this.lastRotation === void 0 && (this.lastRotation = { angle: 0 }), this.rotations.length === 0))
+    const a = this.rotateCenter, p = new s.Vector3();
+    n.projectPoint(c.clone(), p);
+    const h = p.clone().sub(a);
+    if (t.angleTo(h) === 0 || (this.lastRotation === void 0 && (this.lastRotation = { angle: 0 }), this.rotations.length === 0))
       return;
     const b = (() => {
       if (this.rotations.length === 1)
-        return l.angleTo(r.baseAxes) > s.angleTo(r.baseAxes);
+        return h.angleTo(r.baseAxes) > i.angleTo(r.baseAxes);
       {
-        const d = this.rotations[this.rotations.length - 1], w = this.rotations[this.rotations.length - 2], y = l.angleTo(w.vector), v = l.angleTo(d.vector), j = d.vector.angleTo(w.vector);
+        const d = this.rotations[this.rotations.length - 1], E = this.rotations[this.rotations.length - 2], y = h.angleTo(E.vector), v = h.angleTo(d.vector), j = d.vector.angleTo(E.vector);
         if (j === 0 || v === 0 || y === 0)
           return;
         if (y > v && y > j)
@@ -103,20 +102,20 @@ class Q extends R {
     })();
     if (b === void 0)
       return console.warn("rotationDirection is undefined");
-    const u = new i.Quaternion().setFromUnitVectors(t.clone().normalize(), l.clone().normalize()), { originObject3D: h } = this, D = h.quaternion.clone().premultiply(u);
+    const u = new s.Quaternion().setFromUnitVectors(t.clone().normalize(), h.clone().normalize()), { originObject3D: l } = this, D = l.quaternion.clone().premultiply(u);
     if (!this.hooks.emit("wantToRotate", D)) {
-      if (this.rotations.push({ vector: l, direction: b }), this.rotations = this.rotations.slice(-2), this.lastRotation.angle = this.lastRotation.angle + l.angleTo(t) * (b ? 1 : -1), this.setAngleHelperLength(n, this.lastRotation.angle), this.setTipsAngle(this.lastRotation.angle / Math.PI * 180), a) {
-        const d = new i.Vector3().subVectors(h.position, a).applyQuaternion(u).add(a);
-        h.position.copy(d);
+      if (this.rotations.push({ vector: h, direction: b }), this.rotations = this.rotations.slice(-2), this.lastRotation.angle = this.lastRotation.angle + h.angleTo(t) * (b ? 1 : -1), this.setAngleHelperLength(o, this.lastRotation.angle), this.setTipsAngle(this.lastRotation.angle / Math.PI * 180), a) {
+        const d = new s.Vector3().subVectors(l.position, a).applyQuaternion(u).add(a);
+        l.position.copy(d);
       }
-      h.applyQuaternion(u), this.helperObject3DQuaternion.premultiply(u), this.hooks.emit("applyObjectRotate", { quaternion: u, origin: a }), this.hooks.emit("rotate", h.quaternion), this.startInfo.startVector = l;
+      l.applyQuaternion(u), this.helperObject3DQuaternion.premultiply(u), this.hooks.emit("applyObjectRotate", { quaternion: u, origin: a }), this.hooks.emit("rotate", l.quaternion), this.startInfo.startVector = h;
     }
   }
   dragEnd() {
-    !this.isDragging || (console.log("%c RotateController dragEnd", "color: #e94e4e"), this.startInfo = void 0, this.isDragging = !1, this.lastRotation = void 0, this.rotations = [], this.helperObject3D.show(), this.hooks.emit("rotateEnd"));
+    !this.isDragging || (this.startInfo = void 0, this.isDragging = !1, this.lastRotation = void 0, this.rotations = [], this.helperObject3D.show(), this.hooks.emit("rotateEnd"));
   }
-  getAngleHelper(o) {
-    switch (o) {
+  getAngleHelper(e) {
+    switch (e) {
       case "x":
         return this.helperObject3D.xAngleHelper;
       case "y":
@@ -125,38 +124,38 @@ class Q extends R {
         return this.helperObject3D.zAngleHelper;
     }
   }
-  setAngleHelperStart(o, t) {
-    const e = this.getAngleHelper(o);
-    if (e instanceof i.Mesh && e.geometry instanceof i.CircleGeometry) {
-      const { radius: r, segments: s, thetaLength: n } = e.geometry.parameters;
-      e.geometry = new i.CircleGeometry(r, s, t, n);
+  setAngleHelperStart(e, t) {
+    const n = this.getAngleHelper(e);
+    if (n instanceof s.Mesh && n.geometry instanceof s.CircleGeometry) {
+      const { radius: r, segments: i, thetaLength: o } = n.geometry.parameters;
+      n.geometry = new s.CircleGeometry(r, i, t, o);
     } else
       console.warn("only support THREE.CircleGeometry");
   }
-  setAngleHelperLength(o, t) {
-    const r = t >= 0 ? Math.max(t, 1e-3) : Math.min(t, -1e-3), s = this.getAngleHelper(o);
-    if (s instanceof i.Mesh && s.geometry instanceof i.CircleGeometry) {
-      const { radius: n, thetaStart: c } = s.geometry.parameters, a = Math.ceil(Math.abs(r) * (40 / (2 * Math.PI)));
-      s.geometry = new i.CircleGeometry(n, a, c, r);
+  setAngleHelperLength(e, t) {
+    const r = t >= 0 ? Math.max(t, 1e-3) : Math.min(t, -1e-3), i = this.getAngleHelper(e);
+    if (i instanceof s.Mesh && i.geometry instanceof s.CircleGeometry) {
+      const { radius: o, thetaStart: c } = i.geometry.parameters, a = Math.ceil(Math.abs(r) * (40 / (2 * Math.PI)));
+      i.geometry = new s.CircleGeometry(o, a, c, r);
     } else
       console.warn("only support THREE.CircleGeometry");
   }
-  setTipsAngle(o) {
-    var e;
-    const t = (e = this.helperObject3D.angleTips) == null ? void 0 : e.element;
-    !t || (t.innerText = `${o.toFixed(0)}\xB0`);
+  setTipsAngle(e) {
+    var n;
+    const t = (n = this.helperObject3D.angleTips) == null ? void 0 : n.element;
+    !t || (t.innerText = `${e.toFixed(0)}\xB0`);
   }
-  setTipsPosition(o) {
+  setTipsPosition(e) {
     const t = this.helperObject3D.angleTips;
     if (!t)
       return;
-    const e = o.project(this.camera), { x: r, y: s, z: n } = e;
-    if (n > 1)
+    const n = e.project(this.camera), { x: r, y: i, z: o } = n;
+    if (o > 1)
       return;
-    const c = (r + 1) / 2 * 100 + "%", a = (-s + 1) / 2 * 100 + "%";
+    const c = (r + 1) / 2 * 100 + "%", a = (-i + 1) / 2 * 100 + "%";
     t.setLeftTop(c, a);
   }
 }
 export {
-  Q as RotateController
+  C as RotateController
 };

package/libs/shared-utils/Object3DHelper/Helper/CSS3DScaleHelper.d.ts

@@ -16,8 +16,6 @@ export declare class CSS3DScaleHelper<T extends CSS3DObjectPlus = CSS3DObjectPlu
     private container;
     private enabled;
     constructor(originObject3D: T, container: HTMLElement, camera: THREE.Camera, scene: THREE.Scene);
-    updatePosition(): void;
-    updateQuaternion(): void;
     applyMatrix4(matrix: THREE.Matrix4): void;
     showDraggingHelper(): void;
     applyHelperScaleMatrix4(matrix: THREE.Matrix4, origin?: Vector3): void;

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

@@ -1,23 +1,23 @@
-var d = Object.defineProperty;
-var u = (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) => (u(c, typeof n != "symbol" ? n + "" : n, e), e);
-import { CSS3DRender as D } from "../../../CSS3DRenderPlugin/CSS3DRender.js";
+var u = Object.defineProperty;
+var D = (c, n, e) => n in c ? u(c, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[n] = e;
+var i = (c, n, e) => (D(c, typeof n != "symbol" ? n + "" : n, e), e);
+import { CSS3DRender as b } from "../../../CSS3DRenderPlugin/CSS3DRender.js";
 import * as p from "three";
-import { RectangleScaleHelperAbstract as b } from "../Base/BaseHelper.js";
-import { rectangleScaleDom as f } from "./HTML/rectangleScaleDom.js";
-class O extends b {
-  constructor(e, t, s, o) {
+import { RectangleScaleHelperAbstract as f } from "../Base/BaseHelper.js";
+import { rectangleScaleDom as y } from "./HTML/rectangleScaleDom.js";
+class I extends f {
+  constructor(e, t, s, l) {
     super(e);
     i(this, "points", []);
     i(this, "cornerPositions", []);
     i(this, "css3DInstance");
     i(this, "plane");
-    i(this, "css3DRenderer", new D());
+    i(this, "css3DRenderer", new b());
     i(this, "camera");
     i(this, "scene");
     i(this, "container");
     i(this, "enabled", !1);
-    this.camera = s, this.scene = o, this.container = t, this.initRectangleScaleHelper();
+    this.camera = s, this.scene = l, this.container = t, this.initRectangleScaleHelper();
   }
   get helperObject() {
     var e;
@@ -25,14 +25,6 @@ class O extends b {
       throw new Error("css3DInstance is not initialized");
     return this.css3DInstance.css3DObject;
   }
-  updatePosition() {
-    var e;
-    this.helperObject.position.copy(this.originObject3D.position), (e = this.plane) == null || e.position.copy(this.originObject3D.position);
-  }
-  updateQuaternion() {
-    var e;
-    (e = this.plane) == null || e.quaternion.copy(this.originObject3D.quaternion);
-  }
   applyMatrix4(e) {
     var t;
     super.applyMatrix4(e), this.helperObject.applyMatrix4(e), (t = this.plane) == null || t.applyMatrix4(e), this.cornerPositions.forEach((s) => s.applyMatrix4(e));
@@ -50,8 +42,8 @@ class O extends b {
     });
   }
   applyHelperQuaternion(e, t) {
-    var o;
-    const s = (o = this.css3DInstance) == null ? void 0 : o.css3DObject;
+    var l;
+    const s = (l = this.css3DInstance) == null ? void 0 : l.css3DObject;
     if (s) {
       const a = new p.Vector3().subVectors(s.position, t).applyQuaternion(e).add(t);
       s.position.copy(a), s.applyQuaternion(e);
@@ -61,8 +53,8 @@ class O extends b {
       this.plane.position.copy(a), this.plane.applyQuaternion(e);
     }
     this.cornerPositions.forEach((a) => {
-      const l = new p.Vector3().subVectors(a, t).applyQuaternion(e).add(t);
-      a.copy(l);
+      const o = new p.Vector3().subVectors(a, t).applyQuaternion(e).add(t);
+      a.copy(o);
     });
   }
   enable() {
@@ -85,7 +77,7 @@ class O extends b {
     this.disable(), this.css3DRenderer.dispose();
   }
   initRectangleScaleHelper() {
-    var l;
+    var o, r;
     const e = this.getCornerPositions();
     if (!e)
       return;
@@ -94,12 +86,12 @@ class O extends b {
     if (!t)
       return;
     this.css3DInstance = t, t.appendToElement(this.container);
-    const s = t.css3DObject.container, { container: o, squares: a } = f();
-    this.points = a.map((r, h) => ({
-      direction: r.direction,
-      point: r.element,
-      position: this.calculatePointPosition(e)[h]
-    })), s.insertBefore(o, (l = s.children[0]) != null ? l : null), this.updatePosition();
+    const s = t.css3DObject.container, { container: l, squares: a } = y();
+    this.points = a.map((h, d) => ({
+      direction: h.direction,
+      point: h.element,
+      position: this.calculatePointPosition(e)[d]
+    })), s.insertBefore(l, (o = s.children[0]) != null ? o : null), this.helperObject.position.copy(this.originObject3D.position), (r = this.plane) == null || r.position.copy(this.originObject3D.position);
   }
   getCornerPositions() {
     const { originObject3D: e } = this;
@@ -121,5 +113,5 @@ class O extends b {
   }
 }
 export {
-  O as CSS3DScaleHelper
+  I as CSS3DScaleHelper
 };

package/libs/shared-utils/Object3DHelper/typings/Hooks.d.ts

@@ -16,14 +16,14 @@ export declare type HelperEventMap = {
     setObjectRotate: (quaternion: THREE.Quaternion, origin: THREE.Vector3) => void;
     setObjectScale: (scale: THREE.Vector3) => void;
     applyObjectPosition: (position: {
-        matrix4: THREE.Matrix4;
+        matrix: THREE.Matrix4;
     }) => void;
     applyObjectRotate: (rotate: {
         quaternion: THREE.Quaternion;
         origin: THREE.Vector3;
     }) => void;
     applyObjectScale: (scale: {
-        matrix4: THREE.Matrix4;
+        matrix: THREE.Matrix4;
         origin?: THREE.Vector3;
     }) => void;
     moveByMouseEnable: () => void;

package/package.json

@@ -7,7 +7,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "2.7.1",
+  "version": "2.7.2",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",