@realsee/dnalogel 3.71.2 → 3.72.0-alpha.1

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

@@ -1,34 +1,30 @@
-var b = Object.defineProperty;
-var D = (g, d, e) => d in g ? b(g, d, { enumerable: !0, configurable: !0, writable: !0, value: e }) : g[d] = e;
-var r = (g, d, e) => (D(g, typeof d != "symbol" ? d + "" : d, e), e);
-import { BaseController as M } from "../Base/BaseController.js";
-import { RENDER_ORDER as L } from "../Constants/RenderOrder.js";
-import * as a from "three";
-import { SolidGuideLine as w } from "../utils/solidGuide.js";
-import { getMouseRaycaster as j } from "../utils/getMouseRaycaster.js";
-import { rayOnLine as B } from "../../../Sculpt/utils/three/rayOnLine.js";
-var y, E;
-class S extends M {
+var w = Object.defineProperty;
+var j = (f, d, e) => d in f ? w(f, d, { enumerable: !0, configurable: !0, writable: !0, value: e }) : f[d] = e;
+var a = (f, d, e) => (j(f, typeof d != "symbol" ? d + "" : d, e), e);
+import { BaseController as B } from "../Base/BaseController.js";
+import { RENDER_ORDER as k } from "../Constants/RenderOrder.js";
+import * as n from "three";
+import { SolidGuideLine as O } from "../utils/solidGuide.js";
+import { getMouseRaycaster as I } from "../utils/getMouseRaycaster.js";
+import { rayOnLine as N } from "../../../Sculpt/utils/three/rayOnLine.js";
+var M, L;
+class F extends B {
   constructor(...e) {
     super(...e);
-    r(this, "name", "MoveController");
-    r(this, "startInfo");
+    a(this, "name", "MoveController");
+    a(this, "startInfo");
     /** 拖拽时用于显示方向参考的直线（与 ScaleController 一致：Line + LineBasicMaterial） */
-    r(this, "dragGuideLine");
-    r(this, "solidGuide", new w(
-      this.camera,
-      this.container,
-      (E = (y = this.config) == null ? void 0 : y.solidGuide) != null ? E : {}
-    ));
-    r(this, "_moveByMouse", {
+    a(this, "dragGuideLine");
+    a(this, "solidGuide", new O(this.camera, this.container, (L = (M = this.config) == null ? void 0 : M.solidGuide) != null ? L : {}));
+    a(this, "_moveByMouse", {
       enabled: !1
     });
-    r(this, "mouseInfo");
-    r(this, "mousedownEventListenerDisposer");
+    a(this, "mouseInfo");
+    a(this, "mousedownEventListenerDisposer");
     /**
      * @description: 拖动开始，找出拖的Direction
      */
-    r(this, "dragStart", (e) => {
+    a(this, "dragStart", (e) => {
       if (this.moveByMouseEnable || this.isDragging)
         return;
       const t = e == null ? void 0 : e.intersect;
@@ -37,48 +33,48 @@ class S extends M {
       const o = (t == null ? void 0 : t.object).direction;
       if (!o)
         return this.dragEnd();
-      const s = new a.Vector3(1, 0, 0).applyQuaternion(this.helperObject3D.quaternion), c = new a.Vector3(0, 1, 0).applyQuaternion(this.helperObject3D.quaternion), n = new a.Vector3(0, 0, 1).applyQuaternion(this.helperObject3D.quaternion), u = (() => {
+      const s = new n.Vector3(1, 0, 0).applyQuaternion(this.helperObject3D.quaternion), c = new n.Vector3(0, 1, 0).applyQuaternion(this.helperObject3D.quaternion), r = new n.Vector3(0, 0, 1).applyQuaternion(this.helperObject3D.quaternion), u = (() => {
         switch (o) {
           case "x":
             return s;
           case "y":
             return c;
           case "z":
-            return n;
+            return r;
           case "plane":
             return;
         }
-      })(), i = t.point.clone();
+      })(), h = t.point.clone();
       if (o === "plane") {
-        const l = this.camera.position.clone(), h = i.clone(), m = h.clone().sub(l).normalize(), f = new a.Plane().setFromNormalAndCoplanarPoint(m, h), p = h.clone();
+        const l = this.camera.position.clone(), i = h.clone(), p = i.clone().sub(l).normalize(), m = new n.Plane().setFromNormalAndCoplanarPoint(p, i), g = i.clone();
         this.startInfo = {
           draggingDirection: o,
-          startVectorProject: p,
-          line: new a.Line3(p.clone(), p.clone()),
+          startVectorProject: g,
+          line: new n.Line3(g.clone(), g.clone()),
           // 保存固定的平面，拖拽过程中不变
-          plane: f
+          plane: m
         };
       } else {
-        const l = new a.Line3(
-          i.clone().sub(u.normalize()),
-          i.clone().add(u.normalize())
+        const l = new n.Line3(
+          h.clone().sub(u.normalize()),
+          h.clone().add(u.normalize())
         );
-        this.startInfo = { draggingDirection: o, startVectorProject: i, line: l };
+        this.startInfo = { draggingDirection: o, startVectorProject: h, line: l };
         try {
-          const h = u.clone().normalize(), m = this.helperObject3D.getWorldPosition(new a.Vector3()), f = this.solidGuide.createSolidLine(m, h, { color: 16777215, renderOrder: L.DRAG_GUIDE_LINE });
-          this.scene.add(f), this.dragGuideLine = f;
-        } catch (h) {
+          const i = u.clone().normalize(), p = this.helperObject3D.getWorldPosition(new n.Vector3()), m = this.solidGuide.createSolidLine(p, i, { color: 16777215, renderOrder: k.DRAG_GUIDE_LINE });
+          this.scene.add(m), this.dragGuideLine = m;
+        } catch (i) {
         }
       }
       this.helperObject3D.showDraggingHelper([o]), this.hooks.emit("moveStart"), this.isDragging = !0;
     });
-    r(this, "dragging", (e) => {
+    a(this, "dragging", (e) => {
       if (!this.isDragging || !this.startInfo)
         return;
-      const t = "touches" in e ? e.touches[0].clientX : e.x, o = "touches" in e ? e.touches[0].clientY : e.y, s = j(this.camera, { x: t, y: o }, this.container);
+      const t = "touches" in e ? e.touches[0].clientX : e.x, o = "touches" in e ? e.touches[0].clientY : e.y, s = I(this.camera, { x: t, y: o }, this.container);
       return s ? (this.move(s), !1) : this.dragEnd();
     });
-    r(this, "dragEnd", () => {
+    a(this, "dragEnd", () => {
       if (this.isDragging) {
         if (this.startInfo = void 0, this.isDragging = !1, this.dragGuideLine) {
           this.scene.remove(this.dragGuideLine), this.dragGuideLine.geometry.dispose();
@@ -93,8 +89,8 @@ class S extends M {
     const o = this.show.bind(this), s = this.hide.bind(this), c = () => {
       this.helperObject3D.update(this.camera), this.isDragging && this.updateDragGuideLineScale(), this.render();
     };
-    c(), this.domEvents.addEventListener(this.helperObject3D, "mousedown", this.dragStart), document.addEventListener("mousemove", this.dragging), document.addEventListener("mouseup", this.dragEnd), this.domEvents.addEventListener(this.helperObject3D, "touchstart", this.dragStart), document.addEventListener("touchmove", this.dragging), document.addEventListener("touchend", this.dragEnd), this.hooks.on("rotateStart", s), this.hooks.on("rotateEnd", o), this.hooks.on("scaleStart", s), this.hooks.on("scaleEnd", o), this.hooks.on("moveByMouseEnable", s), this.hooks.on("moveByMouseDisable", o), this.hooks.on("updateOtherHelpers", (n) => {
-      this.helperObject3D.update(n.camera), this.render();
+    c(), this.domEvents.addEventListener(this.helperObject3D, "mousedown", this.dragStart), document.addEventListener("mousemove", this.dragging), document.addEventListener("mouseup", this.dragEnd), this.domEvents.addEventListener(this.helperObject3D, "touchstart", this.dragStart), document.addEventListener("touchmove", this.dragging), document.addEventListener("touchend", this.dragEnd), this.hooks.on("rotateStart", s), this.hooks.on("rotateEnd", o), this.hooks.on("scaleStart", s), this.hooks.on("scaleEnd", o), this.hooks.on("moveByMouseEnable", s), this.hooks.on("moveByMouseDisable", o), this.hooks.on("updateOtherHelpers", (r) => {
+      this.helperObject3D.update(r.camera), this.render();
     }), this.cameraHooks.on("cameraUpdate", c), this.disposers.push(() => {
       this.domEvents.removeEventListener(this.helperObject3D, "mousedown", this.dragStart), document.removeEventListener("mousemove", this.dragging), document.removeEventListener("mouseup", this.dragEnd), this.domEvents.removeEventListener(this.helperObject3D, "touchstart", this.dragStart), document.removeEventListener("touchmove", this.dragging), document.removeEventListener("touchend", this.dragEnd), this.hooks.off("rotateStart", s), this.hooks.off("rotateEnd", o), this.hooks.off("scaleStart", s), this.hooks.off("scaleEnd", o), this.hooks.off("moveByMouseEnable", s), this.hooks.off("moveByMouseDisable", o), this.hooks.off("updateOtherHelpers"), this.cameraHooks.off("cameraUpdate", c);
     }), this.moveByMouseEnable && this.moveByMouse();
@@ -130,14 +126,14 @@ class S extends M {
     this._moveByMouse = { enabled: !1 }, this.preventTapDefaultEvent = !1, this.hooks.emit("moveByMouseDisable"), (e = this.mousedownEventListenerDisposer) == null || e.call(this);
   }
   onIntersectionOnModelUpdate(e) {
-    var c, n, u;
+    var c, r, u;
     if (!this.moveByMouseEnable)
       return;
     const { point: t, face: o } = e;
     if (!this.hooks.emit("wantToMove", t)) {
       if (this.originObject3D.position.copy(t), (this._moveByMouse.useFaceNormal === !0 || typeof this._moveByMouse.useFaceNormal == "object" && this._moveByMouse.useFaceNormal.enable !== !1) && o != null && o.normal) {
-        const i = (() => typeof this._moveByMouse.useFaceNormal == "object" && this._moveByMouse.useFaceNormal.alignmentVector ? this._moveByMouse.useFaceNormal.alignmentVector : { x: 0, y: 1, z: 0 })(), l = new a.Vector3((c = i.x) != null ? c : 0, (n = i.y) != null ? n : 0, (u = i.z) != null ? u : 0), h = (() => typeof this._moveByMouse.useFaceNormal == "object" && this._moveByMouse.useFaceNormal.fixedFaceNormal ? this._moveByMouse.useFaceNormal.fixedFaceNormal(o.normal) : o.normal)();
-        this.originObject3D.quaternion.setFromUnitVectors(l, h), this.internalHooks.emit("setObjectRotate", this.originObject3D.quaternion.clone());
+        const h = (() => typeof this._moveByMouse.useFaceNormal == "object" && this._moveByMouse.useFaceNormal.alignmentVector ? this._moveByMouse.useFaceNormal.alignmentVector : { x: 0, y: 1, z: 0 })(), l = new n.Vector3((c = h.x) != null ? c : 0, (r = h.y) != null ? r : 0, (u = h.z) != null ? u : 0), i = (() => typeof this._moveByMouse.useFaceNormal == "object" && this._moveByMouse.useFaceNormal.fixedFaceNormal ? this._moveByMouse.useFaceNormal.fixedFaceNormal(o.normal) : o.normal)();
+        this.originObject3D.quaternion.setFromUnitVectors(l, i), this.internalHooks.emit("setObjectRotate", this.originObject3D.quaternion.clone());
       }
       this.internalHooks.emit("setObjectPosition", t), this.hooks.emit("move", t);
     }
@@ -161,33 +157,37 @@ class S extends M {
     const { line: e } = this.startInfo, t = e.end.clone().sub(e.start).normalize();
     if (t.lengthSq() < 1e-6)
       return;
-    const o = this.helperObject3D.getWorldPosition(new a.Vector3());
+    const o = this.helperObject3D.getWorldPosition(new n.Vector3());
     this.solidGuide.updateSolidLine(this.dragGuideLine, o, t);
   }
   move(e) {
+    var y;
     if (!this.startInfo)
       return this.dragEnd();
     const { line: t, startVectorProject: o } = this.startInfo, s = this.originObject3D, c = this.startInfo.draggingDirection === "plane";
-    let n;
+    let r;
     if (c) {
-      const m = this.startInfo.plane;
-      if (!m)
+      const v = this.startInfo.plane;
+      if (!v)
         return;
-      const f = new a.Vector3(), p = m.normal.dot(e.ray.direction);
-      if (Math.abs(p) < 1e-6)
+      const E = new n.Vector3(), b = v.normal.dot(e.ray.direction);
+      if (Math.abs(b) < 1e-6)
         return;
-      const v = -(m.normal.dot(e.ray.origin) + m.constant) / p;
-      if (v < 0)
+      const D = -(v.normal.dot(e.ray.origin) + v.constant) / b;
+      if (D < 0)
         return;
-      f.copy(e.ray.origin.clone().add(e.ray.direction.clone().multiplyScalar(v))), n = f;
+      E.copy(e.ray.origin.clone().add(e.ray.direction.clone().multiplyScalar(D))), r = E;
     } else
-      n = B({ raycaster: e, line: t, clampToLine: !1 });
-    const u = n.clone().sub(o), i = new a.Matrix4();
-    i.setPosition(u);
-    const l = s.position.clone().applyMatrix4(i);
-    this.hooks.emit("wantToMove", l) || (s.applyMatrix4(i), o.copy(n), this.internalHooks.emit("applyObjectPosition", { matrix: i }), this.hooks.emit("move", l));
+      r = N({ raycaster: e, line: t, clampToLine: !1 });
+    const u = s.position.clone(), h = r.clone().sub(o), l = new n.Matrix4();
+    l.setPosition(h);
+    const i = s.position.clone().applyMatrix4(l);
+    if (this.hooks.emit("wantToMove", i))
+      return;
+    const m = (y = this.hooks.emitWithResult("moveBefore", i)) != null ? y : i, g = new n.Matrix4();
+    g.setPosition(m.clone().sub(u)), s.position.copy(m), o.copy(r), this.internalHooks.emit("applyObjectPosition", { matrix: g }), this.hooks.emit("move", m);
   }
 }
 export {
-  S as MoveController
+  F as MoveController
 };

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

@@ -1,6 +1,7 @@
 import type * as THREE from 'three';
 export type HelperEventMap = {
     wantToMove: (position: THREE.Vector3) => void;
+    moveBefore: (position: THREE.Vector3) => THREE.Vector3 | null | undefined;
     wantToRotate: (quaternion: THREE.Quaternion) => void;
     wantToScale: (scale: THREE.Vector3) => void;
     move: (position: THREE.Vector3) => void;

package/libs/shared-utils/Subscribe.d.ts

@@ -1,5 +1,5 @@
 export interface EventMap {
-    [name: string]: (...args: any[]) => void | boolean;
+    [name: string]: (...args: any[]) => any;
 }
 /**
  * 监听者模式
@@ -55,6 +55,14 @@ declare class Subscribe<T extends EventMap> {
      * @template K - 预设的监听事件名称
      */
     emit<K extends keyof T>(name: K, ...data: Parameters<T[K]>): boolean;
+    /**
+     * 触发事件并返回监听器的返回值
+     * @param name - 事件类型
+     * @param data - 触发事件的数据
+     * @returns 监听器的返回值数组
+     * @template K - 预设的监听事件名称
+     */
+    emitWithResult<K extends keyof T>(name: K, ...data: Parameters<T[K]>): THREE.Vector3 | undefined;
 }
 export { Subscribe };
 export type { EventMap as SubscribeEventMap };

package/libs/shared-utils/Subscribe.js

@@ -1,12 +1,12 @@
 function v(f) {
   return typeof Symbol == "undefined" ? `$Symbol<${f}>$` : Symbol(f);
 }
-const i = v("$$EVENT$$");
-function r(f) {
-  return f[i] || (f[i] = {}), f[i];
+const r = v("$$EVENT$$");
+function n(f) {
+  return f[r] || (f[r] = {}), f[r];
 }
 function d(f) {
-  f[i] && delete f[i];
+  f[r] && delete f[r];
 }
 class E {
   /**
@@ -14,7 +14,7 @@ class E {
    * @param name - 事件类型
    */
   hasListener(t) {
-    const e = r(this);
+    const e = n(this);
     return !!(e != null && e[t] && e[t].length > 0);
   }
   /**
@@ -27,7 +27,7 @@ class E {
    * @template C - 回调函数函数上下文
    */
   on(t, e, o) {
-    const s = r(this);
+    const s = n(this);
     return s[t] || (s[t] = []), s[t].push([e, o || !1]), () => this.off(t, e);
   }
   /**
@@ -55,7 +55,7 @@ class E {
       d(this);
       return;
     }
-    const o = r(this);
+    const o = n(this);
     if (o[t] || (o[t] = []), e === void 0) {
       o[t].length = 0;
       return;
@@ -74,10 +74,26 @@ class E {
    */
   emit(t, ...e) {
     let o = !1;
-    const l = r(this)[t] || [];
-    for (let u of l.slice()) {
-      const [n, c = !1] = u, h = n(...e);
-      c && this.off(t, n), h === !1 && (o = !0);
+    const l = n(this)[t] || [];
+    for (let c of l.slice()) {
+      const [i, u = !1] = c, h = i(...e);
+      u && this.off(t, i), h === !1 && (o = !0);
+    }
+    return o;
+  }
+  /**
+   * 触发事件并返回监听器的返回值
+   * @param name - 事件类型
+   * @param data - 触发事件的数据
+   * @returns 监听器的返回值数组
+   * @template K - 预设的监听事件名称
+   */
+  emitWithResult(t, ...e) {
+    let o;
+    const l = n(this)[t] || [];
+    for (let c of l.slice()) {
+      const [i, u = !1] = c, h = i(...e);
+      o || (o = h), u && this.off(t, i);
     }
     return o;
   }

package/libs/shared-utils/Utils/WorkUtil.d.ts

@@ -17,7 +17,7 @@ export declare class WorkUtil extends BaseUtil {
      * @description 获取当前的 work
      */
     get work(): import("@realsee/five").Work;
-    get observers(): readonly import("@realsee/five").WorkObserver[];
+    get observers(): import("@realsee/five").WorkObserver[];
     get transform(): THREE.Matrix4;
     constructor(five: Five);
     getResolvedObserver(observerIndex: number): import("@realsee/five").WorkResolvedObserver;

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

@@ -12,7 +12,7 @@ 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.getURL(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 不存在" };
+  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 不存在" };
 }
 export {
   g as checkFiveModelLoaded

package/libs/shared-utils/five/lookObject.d.ts

@@ -5,11 +5,7 @@ import type { Five } from '@realsee/five';
  * @param five five 实例
  * @param object 要观察的物体
  * @param config.scale 值越大离物体越远，建议范围为 1~2 之间，默认值为 1.4
- * @param config.minDistance 最小观察距离，如果计算出的距离小于此值，则使用此值
- * @param config.minLatitude 最小纬度角（弧度），如果计算出的纬度小于此值，则调整相机位置
  */
 export declare function lookObject(five: Five, object: THREE.Object3D, config?: {
     scale?: number;
-    minDistance?: number;
-    minLatitude?: number;
 }): Promise<void>;

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

@@ -1,37 +1,37 @@
 var F = Object.defineProperty;
-var x = Object.getOwnPropertySymbols;
+var U = Object.getOwnPropertySymbols;
 var H = Object.prototype.hasOwnProperty, N = Object.prototype.propertyIsEnumerable;
-var A = (e, a, t) => a in e ? F(e, a, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[a] = t, C = (e, a) => {
-  for (var t in a || (a = {}))
-    H.call(a, t) && A(e, t, a[t]);
-  if (x)
-    for (var t of x(a))
-      N.call(a, t) && A(e, t, a[t]);
-  return e;
+var V = (o, e, t) => e in o ? F(o, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[e] = t, T = (o, e) => {
+  for (var t in e || (e = {}))
+    H.call(e, t) && V(o, t, e[t]);
+  if (U)
+    for (var t of U(e))
+      N.call(e, t) && V(o, t, e[t]);
+  return o;
 };
-var L = (e, a, t) => new Promise((d, y) => {
-  var z = (n) => {
+var g = (o, e, t) => new Promise((c, d) => {
+  var f = (a) => {
     try {
-      p(t.next(n));
-    } catch (b) {
-      y(b);
+      m(t.next(a));
+    } catch (u) {
+      d(u);
     }
-  }, o = (n) => {
+  }, s = (a) => {
     try {
-      p(t.throw(n));
-    } catch (b) {
-      y(b);
+      m(t.throw(a));
+    } catch (u) {
+      d(u);
     }
-  }, p = (n) => n.done ? d(n.value) : Promise.resolve(n.value).then(z, o);
-  p((t = t.apply(e, a)).next());
+  }, m = (a) => a.done ? c(a.value) : Promise.resolve(a.value).then(f, s);
+  m((t = t.apply(o, e)).next());
 });
-import * as c from "three";
+import * as n from "three";
 import "../../vendor/hammerjs/hammer.js";
 import "../three/PointSelector/index.js";
 import "../tag.js";
-import { vectorToCoordinates as R } from "../vectorToCoordinate.js";
+import { vectorToCoordinates as O } from "../vectorToCoordinate.js";
 import { FiveUtil as Y } from "../Utils/FiveUtil.js";
-import { notNil as U } from "../isNil.js";
+import { notNil as k } from "../isNil.js";
 import "../three/CSS3DRenderer/index.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
@@ -41,55 +41,46 @@ 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(e, a, t) {
-  return L(this, null, function* () {
-    var D, P, V;
-    if (!a)
+function rt(o, e, t) {
+  return g(this, null, function* () {
+    var P, x, z;
+    if (!e)
       return;
-    const d = j(a);
-    if (!d)
+    const c = j(e);
+    if (!c)
       return;
-    const y = new Y(e), z = (D = t == null ? void 0 : t.scale) != null ? D : 1.4, o = d.center, p = e.camera.position.clone().sub(o).setY(0).normalize(), n = e.state.mode === "Mapview" ? e.state.fov : 60, v = Math.max(1.5, d.radius * z), k = v * (1 / Math.tan(c.MathUtils.degToRad(n / 2)));
-    let u = 0;
-    const w = [], S = (s) => {
-      const l = c.MathUtils.degToRad(s);
-      return p.clone().applyAxisAngle(new c.Vector3(0, 1, 0), l).clone().multiplyScalar(k).add(new c.Vector3(0, v, 0)).add(o);
+    const d = new Y(o), f = (P = t == null ? void 0 : t.scale) != null ? P : 1.4, s = c.center, m = o.camera.position.clone().sub(s).setY(0).normalize(), a = o.state.mode === "Mapview" ? o.state.fov : 60, C = Math.max(1.5, c.radius * f), A = C * (1 / Math.tan(n.MathUtils.degToRad(a / 2)));
+    let l = 0;
+    const p = [], M = (r) => {
+      const i = n.MathUtils.degToRad(r);
+      return m.clone().applyAxisAngle(new n.Vector3(0, 1, 0), i).clone().multiplyScalar(A).add(new n.Vector3(0, C, 0)).add(s);
     };
-    for (; u !== 360; ) {
-      let s = 0;
-      const l = S(u), m = (M) => {
-        const _ = M.distanceTo(l), B = new c.Raycaster(M, l.clone().sub(M).normalize()), T = y.model.intersectRaycaster(B)[0], f = T == null ? void 0 : T.distance;
-        U(f) ? f > _ && (s += 1) : s += 1;
-      }, E = d.clampPoint(l, new c.Vector3());
-      m(E);
-      const I = new c.Vector3(o.x, l.y, o.z);
-      if (m(I), U(w[s]) && u > w[s] || (w[s] = u), s === 2)
+    for (; l !== 360; ) {
+      let r = 0;
+      const i = M(l), w = (y) => {
+        const _ = y.distanceTo(i), B = new n.Raycaster(y, i.clone().sub(y).normalize()), h = d.model.intersectRaycaster(B, void 0, !0)[0], S = h == null ? void 0 : h.distance;
+        k(S) ? S > _ && (r += 1) : r += 1;
+      }, E = c.clampPoint(i, new n.Vector3());
+      w(E);
+      const I = new n.Vector3(s.x, i.y, s.z);
+      if (w(I), k(p[r]) && l > p[r] || (p[r] = l), r === 2)
         break;
-      u += 30;
+      l += 30;
     }
-    let O = (V = (P = w[2]) != null ? P : w[1]) != null ? V : 0, r = S(O), i = r.distanceTo(o), h = R(o.clone().sub(r).normalize());
-    if (t != null && t.minDistance && i < t.minDistance) {
-      i = t.minDistance;
-      const s = r.clone().sub(o).normalize();
-      r = o.clone().add(s.multiplyScalar(i)), h = R(o.clone().sub(r).normalize());
-    }
-    if (t != null && t.minLatitude && h.latitude < t.minLatitude) {
-      const s = i * Math.cos(t.minLatitude), l = i * Math.sin(t.minLatitude), m = r.clone().sub(o);
-      m.y = 0, m.normalize().multiplyScalar(s), r = o.clone().add(m).add(new c.Vector3(0, l, 0)), i = r.distanceTo(o), h = R(o.clone().sub(r).normalize());
-    }
-    if (e.state.mode === "Mapview")
-      return e.updateCamera(
-        C({
-          offset: o,
-          distance: i
-        }, h),
+    const R = M((z = (x = p[2]) != null ? x : p[1]) != null ? z : 0), v = R.distanceTo(s), b = O(s.clone().sub(R).normalize());
+    if (o.state.mode === "Mapview")
+      return o.updateCamera(
+        T({
+          offset: s,
+          distance: v
+        }, b),
         800
       );
-    e.setState(C({
+    o.setState(T({
       mode: "Mapview",
-      offset: o,
-      distance: i
-    }, h)), yield e.ready();
+      offset: s,
+      distance: v
+    }, b)), yield o.ready();
   });
 }
 export {

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

@@ -1,16 +1,16 @@
 var g = Object.defineProperty;
-var v = Object.getOwnPropertySymbols;
+var b = Object.getOwnPropertySymbols;
 var x = Object.prototype.hasOwnProperty, E = Object.prototype.propertyIsEnumerable;
 var U = (o, t, e) => t in o ? g(o, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[t] = e, y = (o, t) => {
   for (var e in t || (t = {}))
     x.call(t, e) && U(o, e, t[e]);
-  if (v)
-    for (var e of v(t))
+  if (b)
+    for (var e of b(t))
       E.call(t, e) && U(o, e, t[e]);
   return o;
 };
 var P = (o, t, e) => new Promise((r, d) => {
-  var u = (s) => {
+  var f = (s) => {
     try {
       a(e.next(s));
     } catch (l) {
@@ -22,7 +22,7 @@ var P = (o, t, e) => new Promise((r, d) => {
     } catch (l) {
       d(l);
     }
-  }, a = (s) => s.done ? r(s.value) : Promise.resolve(s.value).then(u, i);
+  }, a = (s) => s.done ? r(s.value) : Promise.resolve(s.value).then(f, i);
   a((e = e.apply(o, t)).next());
 });
 import * as c from "three";
@@ -34,18 +34,18 @@ function j(o, t, e) {
     var h, C;
     if (!t)
       return;
-    const r = (h = e == null ? void 0 : e.distance) != null ? h : 3, d = new V(o), u = o.camera.position.clone().sub(t).setY(0).normalize(), i = o.state.mode === "Mapview" ? o.state.fov : 60, a = r, s = a * Math.cos(c.MathUtils.degToRad(i / 2)), l = a * Math.sin(c.MathUtils.degToRad(i / 2));
+    const r = (h = e == null ? void 0 : e.distance) != null ? h : 3, d = new V(o), f = o.camera.position.clone().sub(t).setY(0).normalize(), i = o.state.mode === "Mapview" ? o.state.fov : 60, a = r, s = a * Math.cos(c.MathUtils.degToRad(i / 2)), l = a * Math.sin(c.MathUtils.degToRad(i / 2));
     let m = 0;
     const R = [], M = (n) => {
-      const f = c.MathUtils.degToRad(n);
-      return u.clone().applyAxisAngle(new c.Vector3(0, 1, 0), f).clone().multiplyScalar(s).add(new c.Vector3(0, l, 0)).add(t);
+      const u = c.MathUtils.degToRad(n);
+      return f.clone().applyAxisAngle(new c.Vector3(0, 1, 0), u).clone().multiplyScalar(s).add(new c.Vector3(0, l, 0)).add(t);
     };
     for (; m !== 360; ) {
       let n = 0;
-      const f = M(m);
+      const u = M(m);
       if (((w) => {
-        const A = w.distanceTo(f), I = new c.Raycaster(w, f.clone().sub(w).normalize()), p = d.model.intersectRaycaster(I)[0], b = p == null ? void 0 : p.distance;
-        _(b) ? b > A && (n += 1) : n += 1;
+        const A = w.distanceTo(u), I = new c.Raycaster(w, u.clone().sub(w).normalize()), p = d.model.intersectRaycaster(I, void 0, !0)[0], v = p == null ? void 0 : p.distance;
+        _(v) ? v > A && (n += 1) : n += 1;
       })(t), R[n] = m, n === 1)
         break;
       m += 30;

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.72.0-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/PointSelector/index.js

@@ -294,7 +294,7 @@ class se extends j {
                 else {
                   const D = new o.Raycaster();
                   D.setFromCamera(a.clone(), this.five.camera);
-                  const F = this.five.model.intersectRaycaster(D)[0], x = 0.1, U = this.five.camera.position.distanceTo(a);
+                  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 && (E = !0);
                 }
                 if (E) {

package/libs/shared-utils/three/getIntersect.d.ts

@@ -6,10 +6,9 @@ export declare function getIntersectFromRelativePosition(five: Five, position: {
 }): {
     raycaster: THREE.Raycaster;
     isVirtual: boolean;
-    floorIndex: number;
     floor: number;
     model?: import("@realsee/five").Model;
-    viewLayer?: import("@realsee/five").ViewLayer;
+    viewLayer?: import("@realsee/five").Tile3DModel;
     distance: number;
     distanceToRay?: number;
     point: THREE.Vector3;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.71.2",
+  "version": "3.72.0-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.5.11",
     "@sveltejs/vite-plugin-svelte": "^2.4.2",
     "@tsconfig/svelte": "^4.0.1",
     "@tweenjs/tween.js": "^23.1.1",

package/dist/shared-utils/three/core/PrismAnimationGeometry.d.ts

@@ -1,25 +0,0 @@
-import * as THREE from 'three';
-export declare class PrismAnimationGeometry extends THREE.BufferGeometry {
-    bottomPositions: number[][];
-    topPosition: number[];
-    faceCount: number;
-    private _type;
-    constructor(params?: {
-        bottomPositions?: number[][];
-        topPosition?: number[];
-        type?: 'Concave' | 'Convex';
-    });
-    /**
-     * 设置底面和顶面的位置，创建类似BoxGeometry的多面结构
-     */
-    setPosition(params: {
-        bottomPositions?: number[][];
-        topPosition?: number[];
-        type?: 'Concave' | 'Convex';
-    }): void;
-    private addBottomFace;
-    private addTopFace;
-    private addSideFace;
-    private getBottomFaceVertexCount;
-    private getTopFaceVertexCount;
-}