@realsee/dnalogel 3.70.0-alpha.2 → 3.70.0

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

@@ -1,2 +1,2 @@
-export type Direction = 'x' | 'y' | 'z';
+export type Direction = 'x' | 'y' | 'z' | 'plane';
 export type Direction4 = 'nesw' | 'nwse' | 'ns' | 'ew';

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

@@ -14,6 +14,9 @@ export type HelperEventMap = {
     scaleEnd: () => void;
     moveByMouseEnable: () => void;
     moveByMouseDisable: () => void;
+    updateOtherHelpers: (params: {
+        camera: THREE.Camera;
+    }) => void;
 };
 export type InternalHelperEventMap = {
     initialHelperPosition: () => void;

package/libs/shared-utils/Object3DHelper/utils/solidGuide.d.ts

@@ -0,0 +1,27 @@
+import * as THREE from 'three';
+/** 将世界坐标投影为屏幕像素坐标 */
+export declare function projectToScreen(camera: THREE.Camera, container: HTMLElement | null | undefined, point: THREE.Vector3): THREE.Vector2;
+/** 估算某方向上线段的像素与世界长度的比例（世界单位/像素） */
+export declare function computeWorldPerPixel(camera: THREE.Camera, container: HTMLElement | null | undefined, center: THREE.Vector3, direction: THREE.Vector3): number;
+/** 计算直线长度：随相机距离/视口变化自适应，限制在可视范围内 */
+export declare function computeGuideLength(camera: THREE.Camera, center: THREE.Vector3): number;
+export type SolidGuideOptions = {
+    color?: number;
+    renderOrder?: number;
+};
+export declare class SolidGuideLine {
+    private camera;
+    private container;
+    private defaults;
+    constructor(camera: THREE.Camera, container: HTMLElement | null | undefined, defaults?: SolidGuideOptions);
+    /** 创建无限长直线（Line + LineBasicMaterial），穿过整个平面 */
+    createSolidLine(center: THREE.Vector3, direction: THREE.Vector3, options?: SolidGuideOptions): THREE.Line<THREE.BufferGeometry, THREE.LineBasicMaterial>;
+    /** 更新已创建的直线，使其始终穿过整个平面 */
+    updateSolidLine(line: THREE.Line<THREE.BufferGeometry, THREE.LineBasicMaterial>, center: THREE.Vector3, direction: THREE.Vector3, options?: SolidGuideOptions): void;
+    /** 计算"无限"直线的长度，确保穿过整个可视区域 */
+    private computeInfiniteLineLength;
+    /** 释放直线的几何与材质 */
+    dispose(line?: THREE.Line<THREE.BufferGeometry, THREE.LineBasicMaterial>): void;
+    /** 更新默认配置 */
+    updateDefaults(options: SolidGuideOptions): void;
+}

package/libs/shared-utils/Object3DHelper/utils/solidGuide.js

@@ -0,0 +1,72 @@
+var b = Object.defineProperty;
+var y = Object.getOwnPropertySymbols;
+var A = Object.prototype.hasOwnProperty, w = Object.prototype.propertyIsEnumerable;
+var g = (o, t, e) => t in o ? b(o, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[t] = e, m = (o, t) => {
+  for (var e in t || (t = {}))
+    A.call(t, e) && g(o, e, t[e]);
+  if (y)
+    for (var e of y(t))
+      w.call(t, e) && g(o, e, t[e]);
+  return o;
+};
+var p = (o, t, e) => (g(o, typeof t != "symbol" ? t + "" : t, e), e);
+import { RENDER_ORDER as M } from "../Constants/RenderOrder.js";
+import * as u from "three";
+function x(o, t) {
+  let e = 10, r = 10;
+  const i = o.isPerspectiveCamera, l = o.isOrthographicCamera;
+  if (i) {
+    const n = o, f = n.position.distanceTo(t), L = n.fov * Math.PI / 180;
+    r = 2 * Math.tan(L / 2) * f, e = r * n.aspect;
+  } else if (l) {
+    const n = o;
+    e = Math.abs(n.right - n.left), r = Math.abs(n.top - n.bottom);
+  }
+  const c = Math.sqrt(e * e + r * r), s = c * 0.8, a = Math.min(e, r) * 0.25, d = c * 1.2;
+  return Math.max(a, Math.min(s, d));
+}
+class v {
+  constructor(t, e, r) {
+    p(this, "camera");
+    p(this, "container");
+    p(this, "defaults");
+    this.camera = t, this.container = e, this.defaults = m({}, r || {});
+  }
+  /** 创建无限长直线（Line + LineBasicMaterial），穿过整个平面 */
+  createSolidLine(t, e, r) {
+    const i = m(m({ color: 16777215, renderOrder: M.DRAG_GUIDE_LINE }, this.defaults), r || {}), l = e.clone().normalize(), c = this.computeInfiniteLineLength(t), s = t.clone().add(l.clone().multiplyScalar(-c)), a = t.clone().add(l.clone().multiplyScalar(c)), d = new Float32Array([s.x, s.y, s.z, a.x, a.y, a.z]), h = new u.BufferGeometry();
+    h.setAttribute("position", new u.BufferAttribute(d, 3));
+    const n = new u.LineBasicMaterial({
+      color: i.color,
+      depthTest: !1,
+      depthWrite: !1,
+      transparent: !0,
+      opacity: 0.65
+    }), f = new u.Line(h, n);
+    return f.renderOrder = i.renderOrder, f;
+  }
+  /** 更新已创建的直线，使其始终穿过整个平面 */
+  updateSolidLine(t, e, r, i) {
+    const l = r.clone().normalize(), c = this.computeInfiniteLineLength(e), s = e.clone().add(l.clone().multiplyScalar(-c)), a = e.clone().add(l.clone().multiplyScalar(c)), d = new Float32Array([s.x, s.y, s.z, a.x, a.y, a.z]), h = t.geometry, n = h.getAttribute("position");
+    n && n.itemSize === 3 && n.array.length === d.length ? (n.array.set(d), n.needsUpdate = !0) : h.setAttribute("position", new u.BufferAttribute(d, 3)), (i == null ? void 0 : i.color) !== void 0 && t.material.color.setHex(i.color);
+  }
+  /** 计算"无限"直线的长度，确保穿过整个可视区域 */
+  computeInfiniteLineLength(t) {
+    return x(this.camera, t) * 10;
+  }
+  /** 释放直线的几何与材质 */
+  dispose(t) {
+    if (!t)
+      return;
+    t.geometry.dispose();
+    const e = t.material;
+    Array.isArray(e) ? e.forEach((r) => r.dispose()) : e.dispose();
+  }
+  /** 更新默认配置 */
+  updateDefaults(t) {
+    this.defaults = m(m({}, this.defaults), t);
+  }
+}
+export {
+  v as SolidGuideLine
+};

package/libs/shared-utils/five/index.js

@@ -4,13 +4,13 @@ import "../three/PointSelector/index.js";
 import "../tag.js";
 import "../three/CSS3DRenderer/index.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "./FivePuppet.js";
 import "@realsee/five/line";
 import "../three/core/Five_LineMaterial2.js";
 import "../three/core/Sphere.js";
 import "../three/blink.js";
-import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 function g(e) {
   return e.model ? e.work ? e.model.loaded ? e.model.name !== e.work.model.file ? { result: !1, msg: "five.model.name 与 five.work.model.file 不一致" } : { result: !0, msg: "" } : { result: !1, msg: "five.model 未加载完成" } : { result: !1, msg: "five 数据未加载" } : { result: !1, msg: "five.model 不存在" };
 }

package/libs/shared-utils/five/initialCSS3DRender.js

@@ -1,2 +1,3 @@
 import "../three/CSS3DRenderer/index.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";

package/libs/shared-utils/five/lookObject.js

@@ -34,13 +34,13 @@ import { FiveUtil as Y } from "../Utils/FiveUtil.js";
 import { notNil as k } from "../isNil.js";
 import "../three/CSS3DRenderer/index.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "./FivePuppet.js";
 import "@realsee/five/line";
 import "../three/core/Five_LineMaterial2.js";
 import { worldBoundingSphere as j } from "../three/boundingBox.js";
 import "../three/blink.js";
-import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 function rt(o, e, t) {
   return g(this, null, function* () {
     var P, x, z;

package/libs/shared-utils/index.js

@@ -6,8 +6,8 @@ import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "./five/FivePuppet.js";
 import "./three/CSS3DRenderer/index.js";
 import "../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
+import "../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "@realsee/five/line";
 import "./three/core/Five_LineMaterial2.js";
 import "./three/core/Sphere.js";
 import "./three/blink.js";
-import "../CSS3DRenderPlugin/utils/three/CSS3DRender.js";

package/libs/shared-utils/logger.js

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

@@ -30,12 +30,12 @@ import "./three/PointSelector/index.js";
 import "./three/CSS3DRenderer/index.js";
 import { waitFiveModelLoaded as F } from "./five/fiveModelLoad.js";
 import "../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
+import "../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "@realsee/five/line";
 import "./three/core/Five_LineMaterial2.js";
 import "./three/core/Sphere.js";
 import "./three/blink.js";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
-import "../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "./five/FivePuppet.js";
 const M = new E();
 class R {

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

@@ -8,6 +8,7 @@ import "../../vendor/hammerjs/hammer.js";
 import "./PointSelector/index.js";
 import "./CSS3DRenderer/index.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "@realsee/five/line";
 import "./core/Five_LineMaterial2.js";
 import "./core/Sphere.js";
@@ -16,7 +17,7 @@ import { rangePieceImg as h } from "../../PanoMeasurePlugin/Modules/rangePiece/h
 import { CSS3DRenderPlugin as b } from "../../CSS3DRenderPlugin/index.js";
 import { BetterTween as u } from "../animationFrame/BetterTween.js";
 import "../five/FivePuppet.js";
-class V {
+class H {
   constructor(t) {
     n(this, "five");
     n(this, "contentElement", document.createElement("div"));
@@ -65,5 +66,5 @@ class V {
   }
 }
 export {
-  V as PointDomHelper
+  H as PointDomHelper
 };

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

@@ -23,8 +23,8 @@ import "../../../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../../tag.js";
 import "../../CSS3DRenderer/index.js";
 import "../../../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import "../../../five/FivePuppet.js";
 import "../../../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
+import "../../../five/FivePuppet.js";
 class A {
   constructor(i, e) {
     r(this, "five");

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

@@ -4,10 +4,10 @@ import "./PointSelector/index.js";
 import "../tag.js";
 import "./CSS3DRenderer/index.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "@realsee/five/line";
 import "./core/Five_LineMaterial2.js";
 import "./core/Sphere.js";
 import "./blink.js";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
-import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../five/FivePuppet.js";

package/libs/shared-utils/threex/domevents/index.js

@@ -1,6 +1,6 @@
-import * as d from "three";
+import * as b from "three";
 function n(t, e) {
-  this._camera = t || null, this._domElement = e || document, this._raycaster = new d.Raycaster(), this._selected = null, this._boundObjs = {};
+  this._camera = t || null, this._domElement = e || document, this._raycaster = new b.Raycaster(), this._selected = null, this._boundObjs = {};
   var o = this;
   this._$onClick = function() {
     o._onClick.apply(o, arguments);
@@ -89,38 +89,70 @@ n.prototype.unbind = function(t, e, o, i) {
       break;
     }
   }
-  var h = this._boundObjs[e].indexOf(t);
-  this._boundObjs[e].splice(h, 1);
+  var _ = this._boundObjs[e].indexOf(t);
+  this._boundObjs[e].splice(_, 1);
 };
 n.prototype.removeEventListener = n.prototype.unbind;
 n.prototype._bound = function(t, e) {
   var o = this._objectCtxGet(e);
   return o ? !!o[t + "Handlers"] : !1;
 };
+n.prototype._isObjectVisible = function(t) {
+  for (var e = t; e; ) {
+    if (e.visible === !1)
+      return !1;
+    e = e.parent;
+  }
+  return !0;
+};
+n.prototype._filterVisibleObjects = function(t) {
+  var e = this;
+  return t.filter(function(o) {
+    return e._isObjectVisible(o);
+  });
+};
 n.prototype._onMove = function(t, e, o, i) {
   var s = this._boundObjs[t];
   if (!(s === void 0 || s.length === 0)) {
-    var r = new d.Vector2();
-    r.set(e, o), this._raycaster.setFromCamera(r, this._camera);
-    var a = this._raycaster.intersectObjects(s), u = this._selected;
-    if (a.length > 0) {
-      var h, c, l, p = a[0], _ = p.object;
-      this._selected = _, l = this._bound("mousemove", _), u != _ && (h = this._bound("mouseover", _), c = u && this._bound("mouseout", u));
-    } else
-      c = u && this._bound("mouseout", u), this._selected = null;
-    l && this._notify("mousemove", _, i, p), h && this._notify("mouseover", _, i, p), c && this._notify("mouseout", u, i, p);
+    var r = this._filterVisibleObjects(s);
+    if (r.length !== 0) {
+      var a = new b.Vector2();
+      a.set(e, o), this._raycaster.setFromCamera(a, this._camera);
+      var u = this._raycaster.intersectObjects(r), _ = this;
+      u = u.filter(function(f) {
+        return _._isObjectVisible(f.object);
+      }), u.sort(function(f, m) {
+        var y = f.object.renderOrder || 0, E = m.object.renderOrder || 0;
+        return y !== E ? E - y : f.distance - m.distance;
+      });
+      var h = this._selected;
+      if (u.length > 0) {
+        var v, d, p, c = u[0], l = c.object;
+        this._selected = l, p = this._bound("mousemove", l), h != l && (v = this._bound("mouseover", l), d = h && this._bound("mouseout", h));
+      } else
+        d = h && this._bound("mouseout", h), this._selected = null;
+      p && this._notify("mousemove", l, i, c), v && this._notify("mouseover", l, i, c), d && this._notify("mouseout", h, i, c);
+    }
   }
 };
 n.prototype._onEvent = function(t, e, o, i) {
   var s = this._boundObjs[t];
   if (!(s === void 0 || s.length === 0)) {
-    var r = new d.Vector2();
-    r.set(e, o), this._raycaster.setFromCamera(r, this._camera);
-    var a = this._raycaster.intersectObjects(s, !0);
-    if (a.length !== 0) {
-      for (var u = a[0], h = u.object, c = this._objectCtxGet(h), l = h.parent; typeof c == "undefined" && l; )
-        c = this._objectCtxGet(l), l = l.parent;
-      c && this._notify(t, h, i, u);
+    var r = this._filterVisibleObjects(s);
+    if (r.length !== 0) {
+      var a = new b.Vector2();
+      a.set(e, o), this._raycaster.setFromCamera(a, this._camera);
+      var u = this._raycaster.intersectObjects(r, !0), _ = this;
+      if (u = u.filter(function(c) {
+        return _._isObjectVisible(c.object);
+      }), u.sort(function(c, l) {
+        var f = c.object.renderOrder || 0, m = l.object.renderOrder || 0;
+        return f !== m ? m - f : c.distance - l.distance;
+      }), u.length !== 0) {
+        for (var h = u[0], v = h.object, d = this._objectCtxGet(v), p = v.parent; typeof d == "undefined" && p; )
+          d = this._objectCtxGet(p), p = p.parent;
+        d && this._notify(t, v, i, h);
+      }
     }
   }
 };
@@ -131,16 +163,16 @@ n.prototype._notify = function(t, e, o, i) {
     return;
   }
   for (var r = s[t + "Handlers"], a = 0; a < r.length; a++) {
-    var u = r[a], h = !0;
+    var u = r[a], _ = !0;
     u.callback({
       type: t,
       target: e,
       origDomEvent: o,
       intersect: i,
       stopPropagation: function() {
-        h = !1;
+        _ = !1;
       }
-    }), h && u.useCapture === !1 && e.parent && this._notify(t, e.parent, o, i);
+    }), _ && u.useCapture === !1 && e.parent && this._notify(t, e.parent, o, i);
   }
 };
 n.prototype._onMouseDown = function(t) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.70.0-alpha.2",
+  "version": "3.70.0",
   "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.5.0-alpha.15",
+    "@realsee/five": "6.5.2",
     "@sveltejs/vite-plugin-svelte": "^2.4.2",
     "@tsconfig/svelte": "^4.0.1",
     "@tweenjs/tween.js": "^23.1.1",