@realsee/dnalogel 3.64.23-alpha.3 → 3.64.23-ke-webgpu.1

package/libs/shared-utils/three/core/LineGeometry.d.ts

@@ -1,13 +1,16 @@
 import type { WireframeGeometry } from 'three';
-import { LineGeometry as Five_LineGeometry } from '@realsee/five/line';
+import { LineGeometry as Three_LineGeometry } from 'three/examples/jsm/lines/LineGeometry.js';
 import * as THREE from 'three';
-export declare class LineGeometry extends Five_LineGeometry {
-    constructor(...args: ConstructorParameters<typeof Five_LineGeometry>);
+export declare class LineGeometry extends Three_LineGeometry {
+    constructor(...args: ConstructorParameters<typeof Three_LineGeometry>);
+    /**
+     * 空线也必须提供实例属性。Line2NodeMaterial 即使 instanceCount 为 0，
+     * 仍会要求绑定 instanceStart/End 和虚线使用的距离属性对应的 vertex buffer。
+     */
+    private setEmptyAttributes;
+    private setLineDistanceAttributes;
+    setPositions(array: Float32Array | Array<number>): this;
     fromEdgesGeometry(geometry: WireframeGeometry): this;
-    toJSON(): {
-        type: string;
-        attributes: {
-            [name: string]: THREE.BufferAttribute | THREE.InterleavedBufferAttribute;
-        };
-    };
+    /** 同 FiveLine：ke 既有的调试用重写，不满足 r183 的 `BufferGeometryJSON` 契约，无调用方，仅做类型让行 */
+    toJSON(): THREE.BufferGeometryJSON;
 }

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

@@ -1,19 +1,42 @@
-import { LineGeometry as i } from "@realsee/five/line";
-import * as t from "three";
-class a extends i {
-  constructor(...e) {
-    super(...e), this.setAttribute("instanceStart", new t.BufferAttribute(new Float32Array(), 3)), this.setAttribute("instanceEnd", new t.BufferAttribute(new Float32Array(), 3));
+import { LineGeometry as f } from "three/examples/jsm/lines/LineGeometry.js";
+import * as n from "three";
+class A extends f {
+  constructor(...t) {
+    super(...t), this.instanceCount = 0, this.setEmptyAttributes();
   }
-  fromEdgesGeometry(e) {
-    if (e.attributes.position.array.length < 6)
-      return this.setAttribute("position", new t.BufferAttribute(new Float32Array(), 3)), this.setAttribute("instanceStart", new t.BufferAttribute(new Float32Array(), 3)), this.setAttribute("instanceEnd", new t.BufferAttribute(new Float32Array(), 3)), this;
-    if (e instanceof t.EdgesGeometry) {
-      const r = new t.InstancedInterleavedBuffer(e.attributes.position.array, 6, 1);
-      this.setPositions(e.attributes.position.array), this.setAttribute("instanceStart", new t.InterleavedBufferAttribute(r, 3, 0)), this.setAttribute("instanceEnd", new t.InterleavedBufferAttribute(r, 3, 3));
-    } else
-      super.fromEdgesGeometry(e);
-    return this;
+  /**
+   * 空线也必须提供实例属性。Line2NodeMaterial 即使 instanceCount 为 0，
+   * 仍会要求绑定 instanceStart/End 和虚线使用的距离属性对应的 vertex buffer。
+   */
+  setEmptyAttributes() {
+    const t = new n.InstancedInterleavedBuffer(new Float32Array(), 6, 1);
+    this.setAttribute("instanceStart", new n.InterleavedBufferAttribute(t, 3, 0)), this.setAttribute("instanceEnd", new n.InterleavedBufferAttribute(t, 3, 3));
+    const s = new n.InstancedInterleavedBuffer(new Float32Array(), 2, 1);
+    this.setAttribute("instanceDistanceStart", new n.InterleavedBufferAttribute(s, 1, 0)), this.setAttribute("instanceDistanceEnd", new n.InterleavedBufferAttribute(s, 1, 1));
   }
+  setLineDistanceAttributes() {
+    const t = this.getAttribute("instanceStart"), s = this.getAttribute("instanceEnd");
+    if (!t || !s)
+      return;
+    const i = new Float32Array(t.count * 2);
+    for (let e = 0; e < t.count; e++) {
+      const a = e === 0 ? 0 : i[e * 2 - 1], u = t.getX(e) - s.getX(e), c = t.getY(e) - s.getY(e), o = t.getZ(e) - s.getZ(e);
+      i[e * 2] = a, i[e * 2 + 1] = a + Math.sqrt(u * u + c * c + o * o);
+    }
+    const r = new n.InstancedInterleavedBuffer(i, 2, 1);
+    this.setAttribute("instanceDistanceStart", new n.InterleavedBufferAttribute(r, 1, 0)), this.setAttribute("instanceDistanceEnd", new n.InterleavedBufferAttribute(r, 1, 1));
+  }
+  setPositions(t) {
+    return super.setPositions(t), this.setLineDistanceAttributes(), this;
+  }
+  fromEdgesGeometry(t) {
+    const s = t.attributes.position.array;
+    if (s.length < 6)
+      return this.instanceCount = 0, this.setEmptyAttributes(), this;
+    const i = new n.InstancedInterleavedBuffer(s, 6, 1);
+    return this.setAttribute("instanceStart", new n.InterleavedBufferAttribute(i, 3, 0)), this.setAttribute("instanceEnd", new n.InterleavedBufferAttribute(i, 3, 3)), this.instanceCount = i.count, this.setLineDistanceAttributes(), this.computeBoundingBox(), this.computeBoundingSphere(), this;
+  }
+  /** 同 FiveLine：ke 既有的调试用重写，不满足 r183 的 `BufferGeometryJSON` 契约，无调用方，仅做类型让行 */
   toJSON() {
     return {
       type: "FiveLineGeometry",
@@ -22,5 +45,5 @@ class a extends i {
   }
 }
 export {
-  a as LineGeometry
+  A as LineGeometry
 };

package/libs/shared-utils/three/core/LineMaterial.d.ts

@@ -1,15 +1,14 @@
-import { LineMaterial as Five_LineMaterial } from '@realsee/five/line';
+import { Line2NodeMaterial } from 'three/webgpu';
 import * as THREE from 'three';
 import type { Merge } from 'type-fest';
 import type { Color } from '../../..';
-export declare class LineMaterial extends Five_LineMaterial {
+type Line2NodeMaterialParameters = ConstructorParameters<typeof Line2NodeMaterial>[0];
+export declare class LineMaterial extends Line2NodeMaterial {
     get three_color(): Color;
     set three_color(value: Color);
     private _three_color;
-    private _dashed;
-    constructor(params?: Merge<ConstructorParameters<typeof Five_LineMaterial>[0], THREE.MeshBasicMaterialParameters>);
-    toJSON(): {
-        type: string;
-        color: number | THREE.Vector3;
-    };
+    constructor(params?: Merge<Line2NodeMaterialParameters, THREE.MeshBasicMaterialParameters>);
+    /** 同 FiveLine：ke 既有的调试用重写，不满足 r183 的 `MaterialJSON` 契约，无调用方，仅做类型让行 */
+    toJSON(): THREE.MaterialJSON;
 }
+export {};

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

@@ -1,33 +1,25 @@
-var s = Object.defineProperty;
-var l = (o, t, e) => t in o ? s(o, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[t] = e;
-var r = (o, t, e) => (l(o, typeof t != "symbol" ? t + "" : t, e), e);
-import { LineMaterial as c } from "@realsee/five/line";
-import { notNil as d } from "../../isNil.js";
-class S extends c {
-  constructor(e) {
-    var h;
-    super(e);
+var l = Object.defineProperty;
+var h = (t, e, o) => e in t ? l(t, e, { enumerable: !0, configurable: !0, writable: !0, value: o }) : t[e] = o;
+var r = (t, e, o) => (h(t, typeof e != "symbol" ? e + "" : e, o), o);
+import { Line2NodeMaterial as n } from "three/webgpu";
+import { notNil as _ } from "../../isNil.js";
+const d = ["color", "dashed", "scale", "dashSize", "gapSize"];
+class E extends n {
+  constructor(o) {
+    var c;
+    super(o);
     r(this, "_three_color");
-    r(this, "_dashed");
-    d(e == null ? void 0 : e.color) && (this.three_color = (h = e == null ? void 0 : e.color) != null ? h : 16777215), Object.keys(e).forEach((i) => {
-      ["color", "dashed", "dashScale", "dashSize", "gapSize", "resolution"].includes(i) || i in this && (this[i] = e[i]);
-    }), Object.defineProperties(this, {
-      dashed: {
-        get() {
-          return this._dashed;
-        },
-        set(i) {
-          this._dashed = i, i ? this.defines.USE_DASH = "" : delete this.defines.USE_DASH, this.needsUpdate = !0;
-        }
-      }
+    _(o == null ? void 0 : o.color) && (this.three_color = (c = o == null ? void 0 : o.color) != null ? c : 16777215), Object.keys(o != null ? o : {}).forEach((i) => {
+      d.includes(i) || i in this && (this[i] = o[i]);
     });
   }
   get three_color() {
     return this._three_color;
   }
-  set three_color(e) {
-    this._three_color = e, this.color = e;
+  set three_color(o) {
+    this._three_color = o, this.color = o;
   }
+  /** 同 FiveLine：ke 既有的调试用重写，不满足 r183 的 `MaterialJSON` 契约，无调用方，仅做类型让行 */
   toJSON() {
     return {
       type: "FiveLineMaterial",
@@ -36,5 +28,5 @@ class S extends c {
   }
 }
 export {
-  S as LineMaterial
+  E as LineMaterial
 };

package/libs/shared-utils/three/core/LineMaterial2.d.ts

@@ -1,15 +1,18 @@
-import * as THREE from 'three';
-import type { Merge } from 'type-fest';
-import type { Color } from '../../..';
-import { Five_LineMaterial2 } from './Five_LineMaterial2';
-export declare class LineMaterial2 extends Five_LineMaterial2 {
-    get three_color(): Color;
-    set three_color(value: Color);
-    private _three_color;
-    private _dashed;
-    constructor(params?: Merge<ConstructorParameters<typeof Five_LineMaterial2>[0], THREE.MeshBasicMaterialParameters>);
-    toJSON(): {
-        type: string;
-        color: number | THREE.Vector3;
-    };
+import { LineMaterial } from './LineMaterial';
+/**
+ * 虚线粗线材质。
+ *
+ * 原先继承自 `Five_LineMaterial2` —— 那是 three 官方粗线材质
+ * （`examples/jsm/lines/LineMaterial`）的 vendored GLSL 拷贝（331 行），
+ * 与 `@realsee/five/line` 导出的 `LineMaterial` 其实是同一份实现，
+ * 连虚线的 `mod(vLineDistance, dashSize + gapSize) < dashSize` → `discard`
+ * 和端帽 discard 逻辑都逐行相同。
+ *
+ * WebGPU 下两者都换成官方 `Line2NodeMaterial`（原生支持 `dashed`）之后，
+ * 本类与 `LineMaterial` 已完全等价，因此直接继承它，并删除那份 vendored 拷贝。
+ *
+ * 保留独立类名只是为了不改动 `Sculpt/Meshes/Line.ts` 里
+ * 「line1 用实线材质、line2 用虚线材质」的既有写法。
+ */
+export declare class LineMaterial2 extends LineMaterial {
 }

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

@@ -1,40 +1,6 @@
-var s = Object.defineProperty;
-var c = (o, t, e) => t in o ? s(o, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[t] = e;
-var r = (o, t, e) => (c(o, typeof t != "symbol" ? t + "" : t, e), e);
-import { notNil as d } from "../../isNil.js";
-import { Five_LineMaterial2 as l } from "./Five_LineMaterial2.js";
-class S extends l {
-  constructor(e) {
-    var h;
-    super(e);
-    r(this, "_three_color");
-    r(this, "_dashed");
-    d(e == null ? void 0 : e.color) && (this.three_color = (h = e == null ? void 0 : e.color) != null ? h : 16777215), Object.keys(e).forEach((i) => {
-      ["color", "dashed", "dashScale", "dashSize", "gapSize", "resolution"].includes(i) || i in this && (this[i] = e[i]);
-    }), Object.defineProperties(this, {
-      dashed: {
-        get() {
-          return this._dashed;
-        },
-        set(i) {
-          this._dashed = i, i ? this.defines.USE_DASH = "" : delete this.defines.USE_DASH, this.needsUpdate = !0;
-        }
-      }
-    });
-  }
-  get three_color() {
-    return this._three_color;
-  }
-  set three_color(e) {
-    this._three_color = e, this.color = e;
-  }
-  toJSON() {
-    return {
-      type: "FiveLineMaterial",
-      color: this.color
-    };
-  }
+import { LineMaterial as e } from "./LineMaterial.js";
+class r extends e {
 }
 export {
-  S as LineMaterial2
+  r as LineMaterial2
 };

package/libs/shared-utils/three/core/LineSegments.d.ts

@@ -1,7 +1,7 @@
 /** @file three.js 中声明有问题，这里重载一下声明 */
-import type { Geometry, BufferGeometry, Material } from 'three';
+import type { BufferGeometry, Material } from 'three';
 import { LineSegments as OriginLineSegments } from 'three';
-declare class LineSegments<TGeometry extends Geometry | BufferGeometry = Geometry | BufferGeometry, TMaterial extends Material | Material[] = Material | Material[]> extends OriginLineSegments<TGeometry, TMaterial> {
+declare class LineSegments<TGeometry extends BufferGeometry = BufferGeometry, TMaterial extends Material | Material[] = Material | Material[]> extends OriginLineSegments<TGeometry, TMaterial> {
     geometry: TGeometry;
     material: TMaterial;
     constructor(geometry: TGeometry, material: TMaterial);

package/libs/shared-utils/three/core/Object3D.d.ts

@@ -2,7 +2,7 @@ import * as THREE from 'three';
 export declare class Object3D<ChildeItem extends THREE.Object3D = THREE.Object3D> extends THREE.Object3D {
     children: ChildeItem[];
     /** 获取 raycaster 与当前物体的交点 */
-    getRaycastIntersects(raycaster: THREE.Raycaster): THREE.Intersection[];
+    getRaycastIntersects(raycaster: THREE.Raycaster): THREE.Intersection<THREE.Object3D<THREE.Object3DEventMap>>[];
     /** 获取 raycaster 与当前物体的第一个交点 */
-    getRaycastIntersection(raycaster: THREE.Raycaster): THREE.Intersection;
+    getRaycastIntersection(raycaster: THREE.Raycaster): THREE.Intersection<THREE.Object3D<THREE.Object3DEventMap>>;
 }

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

@@ -7,7 +7,3 @@ export * from './core/Object3D';
 export * from './core/LineSegments';
 export * from './boundingBox';
 export * from './blink';
-export * from './getIntersect';
-export * from './getRaycaster';
-export * from './PointDomHelper';
-export * from './LegacyPointHelper';

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

@@ -1,13 +1,13 @@
 import "../../vendor/hammerjs/hammer.js";
 import "three";
 import "./PointSelector/index.js";
+import "three/webgpu";
+import "three/tsl";
 import "../tag.js";
-import "./CSS3DRenderer/index.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import "@realsee/five/line";
-import "./core/Five_LineMaterial2.js";
+import "three/examples/jsm/lines/LineGeometry.js";
+import "three/examples/jsm/lines/webgpu/Line2.js";
 import "./core/Sphere.js";
 import "../../vendor/animejs/lib/anime.es.js";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
-import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../five/FivePuppet.js";

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

@@ -1,6 +1,6 @@
 import * as THREE from 'three';
-export declare function loadTexture(uri: string): Promise<THREE.Texture>;
+export declare function loadTexture(uri: string): Promise<THREE.Texture<HTMLImageElement>>;
 export declare function loadPicture(uri: string): Promise<{
-    texture: THREE.Texture;
+    texture: THREE.Texture<HTMLImageElement>;
     transparent: boolean;
 }>;

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

@@ -1,37 +1,37 @@
-var i = (n, e, t) => new Promise((d, c) => {
-  var l = (r) => {
+var c = (t, e, n) => new Promise((l, i) => {
+  var d = (r) => {
     try {
-      o(t.next(r));
+      o(n.next(r));
     } catch (s) {
-      c(s);
+      i(s);
     }
-  }, h = (r) => {
+  }, p = (r) => {
     try {
-      o(t.throw(r));
+      o(n.throw(r));
     } catch (s) {
-      c(s);
+      i(s);
     }
-  }, o = (r) => r.done ? d(r.value) : Promise.resolve(r.value).then(l, h);
-  o((t = t.apply(n, e)).next());
+  }, o = (r) => r.done ? l(r.value) : Promise.resolve(r.value).then(d, p);
+  o((n = n.apply(t, e)).next());
 });
 import * as a from "three";
-const m = new a.TextureLoader();
-function p(n) {
-  return i(this, null, function* () {
-    return new Promise((e, t) => {
-      m.load(n, e, void 0, t);
-    }).then((e) => (e.encoding = a.sRGBEncoding, e.minFilter = a.NearestFilter, e.magFilter = a.NearestFilter, e));
+const h = new a.TextureLoader();
+function m(t) {
+  return c(this, null, function* () {
+    return new Promise((e, n) => {
+      h.load(t, e, void 0, n);
+    }).then((e) => (e.colorSpace = a.SRGBColorSpace, e.minFilter = a.NearestFilter, e.magFilter = a.NearestFilter, e));
   });
 }
-function u(n) {
-  return i(this, null, function* () {
-    return p(n).then((e) => {
-      const t = n.startsWith("data:") ? n.includes("png") : new URL(n, location.href).pathname.toLowerCase().endsWith(".png");
-      return { texture: e, transparent: t };
+function f(t) {
+  return c(this, null, function* () {
+    return m(t).then((e) => {
+      const n = t.startsWith("data:") ? t.includes("png") : new URL(t, location.href).pathname.toLowerCase().endsWith(".png");
+      return { texture: e, transparent: n };
     });
   });
 }
 export {
-  u as loadPicture,
-  p as loadTexture
+  f as loadPicture,
+  m as loadTexture
 };

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

@@ -3,7 +3,23 @@ import type { Overwrite } from '../../typings/utils.type';
 export default function loadVideoTexture(src: string, videoElement?: HTMLVideoElement): Promise<Overwrite<THREE.VideoTexture, {
     image: HTMLVideoElement;
 }>>;
-export declare function getVideoTexture(src: string, videoElement?: HTMLVideoElement): Overwrite<THREE.VideoTexture, {
+export type MetadataVideoTexture = Overwrite<THREE.VideoTexture, {
     image: HTMLVideoElement;
     metadataLoaded: boolean;
 }>;
+/**
+ * r183 把 `Texture` 的事件映射内联收紧为 `EventDispatcher<{ dispose: {} }>`，自定义事件名无法直接传。
+ * 这里只放宽事件方法的入参，不改动类型本体，以保持与 `THREE.Texture` 的结构兼容
+ * （material.map 等位置仍需要它是一个合法 Texture）。
+ */
+export declare const VIDEO_LOADED = "videoLoaded";
+type CustomEventTarget = {
+    dispatchEvent: (event: {
+        type: string;
+    }) => void;
+    addEventListener: (type: string, listener: (event: unknown) => void) => void;
+};
+/** 把 texture 视作可收发自定义事件的目标 */
+export declare function asCustomEventTarget(texture: THREE.Texture): CustomEventTarget;
+export declare function getVideoTexture(src: string, videoElement?: HTMLVideoElement): MetadataVideoTexture;
+export {};

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

@@ -1,34 +1,40 @@
 import * as a from "three";
 import { isWX as d } from "../device.js";
-function s(i, r) {
-  let n = !d;
-  const e = r != null ? r : document.createElement("video");
+const c = "videoLoaded";
+function l(r) {
+  return r;
+}
+function m(r, o) {
+  let u = !d;
+  const e = o != null ? o : document.createElement("video");
   e.preload = "metadata", e.crossOrigin = "anonymous", e.muted = !0, e.loop = !0, e.playsInline = !0, e.autoplay = !0;
   const t = new a.VideoTexture(e);
-  t.minFilter = a.LinearFilter, t.magFilter = a.LinearFilter, t.encoding = a.sRGBEncoding, t.metadataLoaded = !1, e.src = i;
-  const o = () => {
-    t.metadataLoaded || (t.dispatchEvent({ type: "videoLoaded" }), t.metadataLoaded = !0);
+  t.minFilter = a.LinearFilter, t.magFilter = a.LinearFilter, t.colorSpace = a.SRGBColorSpace, t.metadataLoaded = !1, e.src = r;
+  const n = () => {
+    t.metadataLoaded || (t.dispatchEvent({ type: c }), t.metadataLoaded = !0);
   };
   if (d || (e.onloadedmetadata = () => {
-    o();
+    n();
   }), d) {
-    const u = () => {
-      if (!n) {
+    const i = () => {
+      if (!u) {
         if (!e.paused) {
-          o();
+          n();
           return;
         }
         e.muted = !0, e.play().then(() => {
-          n = !0, e.pause(), e.currentTime = 0, o();
+          u = !0, e.pause(), e.currentTime = 0, n();
         }).catch(() => {
           console.warn("video auto play error");
         });
       }
     };
-    document.addEventListener("click", u, { once: !0 }), document.addEventListener("touchend", u, { once: !0 });
+    document.addEventListener("click", i, { once: !0 }), document.addEventListener("touchend", i, { once: !0 });
   }
   return t;
 }
 export {
-  s as getVideoTexture
+  c as VIDEO_LOADED,
+  l as asCustomEventTarget,
+  m as getVideoTexture
 };

package/libs/vendor/@tweenjs/tween/dist/tween.esm.js.js

@@ -4,13 +4,13 @@ var y = Object.freeze({
       return t;
     },
     In: function(t) {
-      return this.None(t);
+      return t;
     },
     Out: function(t) {
-      return this.None(t);
+      return t;
     },
     InOut: function(t) {
-      return this.None(t);
+      return t;
     }
   }),
   Quadratic: Object.freeze({
@@ -389,7 +389,7 @@ var y = Object.freeze({
       typeof r == "string" ? this._valuesStartRepeat[e] = this._valuesStartRepeat[e] + parseFloat(r) : this._valuesStartRepeat[e] = this._valuesEnd[e], this._valuesEnd[e] = i;
     }, t;
   }()
-), T = "23.1.1", E = w.nextId, o = O, R = o.getAll.bind(o), k = o.removeAll.bind(o), A = o.add.bind(o), j = o.remove.bind(o), F = o.update.bind(o), U = {
+), T = "23.1.3", E = w.nextId, o = O, R = o.getAll.bind(o), k = o.removeAll.bind(o), A = o.add.bind(o), j = o.remove.bind(o), F = o.update.bind(o), U = {
   Easing: y,
   Group: P,
   Interpolation: d,