@realsee/dnalogel 3.72.0-alpha.1 → 3.72.0-alpha.2

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

@@ -1,37 +1,37 @@
 var F = Object.defineProperty;
-var U = Object.getOwnPropertySymbols;
+var x = Object.getOwnPropertySymbols;
 var H = Object.prototype.hasOwnProperty, N = Object.prototype.propertyIsEnumerable;
-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 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 g = (o, e, t) => new Promise((c, d) => {
-  var f = (a) => {
+var L = (e, a, t) => new Promise((d, y) => {
+  var z = (n) => {
     try {
-      m(t.next(a));
-    } catch (u) {
-      d(u);
+      p(t.next(n));
+    } catch (b) {
+      y(b);
     }
-  }, s = (a) => {
+  }, o = (n) => {
     try {
-      m(t.throw(a));
-    } catch (u) {
-      d(u);
+      p(t.throw(n));
+    } catch (b) {
+      y(b);
     }
-  }, m = (a) => a.done ? c(a.value) : Promise.resolve(a.value).then(f, s);
-  m((t = t.apply(o, e)).next());
+  }, p = (n) => n.done ? d(n.value) : Promise.resolve(n.value).then(z, o);
+  p((t = t.apply(e, a)).next());
 });
-import * as n from "three";
+import * as c from "three";
 import "../../vendor/hammerjs/hammer.js";
 import "../three/PointSelector/index.js";
 import "../tag.js";
-import { vectorToCoordinates as O } from "../vectorToCoordinate.js";
+import { vectorToCoordinates as R } from "../vectorToCoordinate.js";
 import { FiveUtil as Y } from "../Utils/FiveUtil.js";
-import { notNil as k } from "../isNil.js";
+import { notNil as U } from "../isNil.js";
 import "../three/CSS3DRenderer/index.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
@@ -41,46 +41,55 @@ 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;
-    if (!e)
+function rt(e, a, t) {
+  return L(this, null, function* () {
+    var D, P, V;
+    if (!a)
       return;
-    const c = j(e);
-    if (!c)
+    const d = j(a);
+    if (!d)
       return;
-    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);
+    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);
     };
-    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)
+    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)
         break;
-      l += 30;
+      u += 30;
     }
-    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),
+    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),
         800
       );
-    o.setState(T({
+    e.setState(C({
       mode: "Mapview",
-      offset: s,
-      distance: v
-    }, b)), yield o.ready();
+      offset: o,
+      distance: i
+    }, h)), yield e.ready();
   });
 }
 export {

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

@@ -1,16 +1,16 @@
 var g = Object.defineProperty;
-var b = Object.getOwnPropertySymbols;
+var v = 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 (b)
-    for (var e of b(t))
+  if (v)
+    for (var e of v(t))
       E.call(t, e) && U(o, e, t[e]);
   return o;
 };
 var P = (o, t, e) => new Promise((r, d) => {
-  var f = (s) => {
+  var u = (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(f, i);
+  }, a = (s) => s.done ? r(s.value) : Promise.resolve(s.value).then(u, 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), 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));
+    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));
     let m = 0;
     const R = [], M = (n) => {
-      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);
+      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);
     };
     for (; m !== 360; ) {
       let n = 0;
-      const u = M(m);
+      const f = M(m);
       if (((w) => {
-        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;
+        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;
       })(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.72.0-alpha.1",
+    "%c %c@realsee/dnalogel %cv3.72.0-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/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, void 0, !0)[0], x = 0.1, U = this.five.camera.position.distanceTo(a);
+                  const F = this.five.model.intersectRaycaster(D)[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/core/PrismAnimationGeometry.d.ts

@@ -0,0 +1,25 @@
+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;
+}

package/libs/shared-utils/three/core/PrismAnimationGeometry.js

@@ -0,0 +1,146 @@
+var B = Object.defineProperty;
+var M = (d, l, t) => l in d ? B(d, l, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[l] = t;
+var P = (d, l, t) => (M(d, typeof l != "symbol" ? l + "" : l, t), t);
+import * as C from "three";
+import { concavePolygonVertexIndex as I, convexPolygonVertexIndex as V } from "./polygonVertex.js";
+class G extends C.BufferGeometry {
+  constructor(t) {
+    super();
+    P(this, "bottomPositions", []);
+    P(this, "topPosition", []);
+    P(this, "faceCount", 0);
+    P(this, "_type", "Concave");
+    t && this.setPosition(t);
+  }
+  /**
+   * 设置底面和顶面的位置，创建类似BoxGeometry的多面结构
+   */
+  setPosition(t) {
+    var x, f, g;
+    const i = (x = t.bottomPositions) != null ? x : this.bottomPositions, a = (f = t.topPosition) != null ? f : this.topPosition;
+    if (this._type = (g = t.type) != null ? g : this._type, this.bottomPositions = i, this.topPosition = a, !i || i.length < 3 || !a || a.length !== 3) {
+      console.error("PrismAnimationGeometry: Invalid parameters", i, a, t);
+      return;
+    }
+    const n = [...i];
+    n[0][0] === n.at(-1)[0] && n[0][1] === n.at(-1)[1] && n[0][2] === n.at(-1)[2] && (n.length -= 1);
+    const p = [a[0] - i[0][0], a[1] - i[0][1], a[2] - i[0][2]], m = n.map((s) => [s[0] + p[0], s[1] + p[1], s[2] + p[2]]);
+    this.faceCount = 2 + n.length;
+    const h = [], e = [], r = [], c = [];
+    let u = 0;
+    this.addBottomFace(n, h, e, r, u, c, 0), u += this.getBottomFaceVertexCount(n), this.addTopFace(m, h, e, r, u, c, 1), u += this.getTopFaceVertexCount(m);
+    for (let s = 0; s < n.length; s++) {
+      const o = (s + 1) % n.length;
+      this.addSideFace(
+        n[s],
+        n[o],
+        m[s],
+        m[o],
+        h,
+        e,
+        r,
+        u,
+        c,
+        2 + s
+      ), u += 4;
+    }
+    this.setAttribute("position", new C.Float32BufferAttribute(h, 3)), this.setAttribute("uv", new C.Float32BufferAttribute(e, 2)), this.setIndex(r), this.clearGroups(), c.forEach((s) => {
+      this.addGroup(s.start, s.count, s.materialIndex);
+    }), this.computeBoundingSphere(), console.log("PrismAnimationGeometry UV debug:", {
+      totalUVs: e.length / 2,
+      totalPositions: h.length / 3,
+      faceCount: this.faceCount,
+      uvSample: e.slice(0, 20)
+    });
+  }
+  addBottomFace(t, i, a, n, p, m, h) {
+    const e = Math.min(...t.map((o) => o[0])), r = Math.max(...t.map((o) => o[0])), c = Math.min(...t.map((o) => o[2])), u = Math.max(...t.map((o) => o[2])), x = r - e || 1, f = u - c || 1;
+    for (const o of t) {
+      i.push(o[0], o[1], o[2]);
+      const y = (o[0] - e) / x, F = (o[2] - c) / f;
+      a.push(y, F);
+    }
+    const g = n.length, s = this._type === "Concave" ? I(t) : V(t);
+    for (const o of s)
+      n.push(o + p);
+    m.push({
+      start: g,
+      count: n.length - g,
+      materialIndex: h
+    });
+  }
+  addTopFace(t, i, a, n, p, m, h) {
+    const e = Math.min(...t.map((o) => o[0])), r = Math.max(...t.map((o) => o[0])), c = Math.min(...t.map((o) => o[2])), u = Math.max(...t.map((o) => o[2])), x = r - e || 1, f = u - c || 1;
+    for (const o of t) {
+      i.push(o[0], o[1], o[2]);
+      const y = (o[0] - e) / x, F = (o[2] - c) / f;
+      a.push(y, F);
+    }
+    const g = n.length, s = this._type === "Concave" ? I(t) : V(t);
+    for (let o = s.length - 1; o >= 0; o--)
+      n.push(s[o] + p);
+    m.push({
+      start: g,
+      count: n.length - g,
+      materialIndex: h
+    });
+  }
+  addSideFace(t, i, a, n, p, m, h, e, r, c) {
+    p.push(
+      t[0],
+      t[1],
+      t[2],
+      // 0
+      i[0],
+      i[1],
+      i[2],
+      // 1
+      n[0],
+      n[1],
+      n[2],
+      // 2
+      a[0],
+      a[1],
+      a[2]
+      // 3
+    ), m.push(
+      0,
+      0,
+      // bottom1 (左下)
+      1,
+      0,
+      // bottom2 (右下)  
+      1,
+      1,
+      // top2 (右上)
+      0,
+      1
+      // top1 (左上)
+    );
+    const u = h.length;
+    h.push(
+      e + 0,
+      e + 1,
+      e + 2,
+      // 第一个三角形
+      e + 0,
+      e + 2,
+      e + 3
+      // 第二个三角形
+    ), r.push({
+      start: u,
+      count: 6,
+      // 两个三角形，6个索引
+      materialIndex: c
+    });
+  }
+  getBottomFaceVertexCount(t) {
+    return t.length;
+  }
+  getTopFaceVertexCount(t) {
+    return t.length;
+  }
+}
+export {
+  G as PrismAnimationGeometry
+};

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

@@ -6,9 +6,10 @@ 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").Tile3DModel;
+    viewLayer?: import("@realsee/five").ViewLayer;
     distance: number;
     distanceToRay?: number;
     point: THREE.Vector3;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.72.0-alpha.1",
+  "version": "3.72.0-alpha.2",
   "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.11",
+    "@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",