@realsee/dnalogel 3.54.0 → 3.54.2

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

@@ -0,0 +1,307 @@
+var o = Object.defineProperty;
+var c = (n, t, i) => t in n ? o(n, t, { enumerable: !0, configurable: !0, writable: !0, value: i }) : n[t] = i;
+var a = (n, t, i) => (c(n, typeof t != "symbol" ? t + "" : t, i), i);
+import * as r from "three";
+const s = {
+  uniforms: r.UniformsUtils.merge([
+    r.UniformsLib.common,
+    r.UniformsLib.fog,
+    {
+      linewidth: { value: 1 },
+      resolution: { value: new r.Vector2(1, 1) },
+      dashScale: { value: 1 },
+      dashSize: { value: 1 },
+      gapSize: { value: 1 },
+      // todo FIX - maybe change to totalSize
+      opacity: { value: 1 }
+    }
+  ]),
+  vertexShader: `
+		#include <common>
+		#include <color_pars_vertex>
+		#include <fog_pars_vertex>
+		#include <logdepthbuf_pars_vertex>
+		#include <clipping_planes_pars_vertex>
+
+		uniform float linewidth;
+		uniform vec2 resolution;
+
+		attribute vec3 instanceStart;
+		attribute vec3 instanceEnd;
+
+		attribute vec3 instanceColorStart;
+		attribute vec3 instanceColorEnd;
+
+		varying vec2 vUv;
+
+		#ifdef USE_DASH
+
+			uniform float dashScale;
+			attribute float instanceDistanceStart;
+			attribute float instanceDistanceEnd;
+			varying float vLineDistance;
+
+		#endif
+
+		void trimSegment( const in vec4 start, inout vec4 end ) {
+
+			// trim end segment so it terminates between the camera plane and the near plane
+
+			// conservative estimate of the near plane
+			float a = projectionMatrix[ 2 ][ 2 ]; // 3nd entry in 3th column
+			float b = projectionMatrix[ 3 ][ 2 ]; // 3nd entry in 4th column
+			float nearEstimate = - 0.5 * b / a;
+
+			float alpha = ( nearEstimate - start.z ) / ( end.z - start.z );
+
+			end.xyz = mix( start.xyz, end.xyz, alpha );
+
+		}
+
+		void main() {
+
+			#ifdef USE_COLOR
+
+				vColor.xyz = ( position.y < 0.5 ) ? instanceColorStart : instanceColorEnd;
+
+			#endif
+
+			#ifdef USE_DASH
+
+				vLineDistance = ( position.y < 0.5 ) ? dashScale * instanceDistanceStart : dashScale * instanceDistanceEnd;
+
+			#endif
+
+			float aspect = resolution.x / resolution.y;
+
+			vUv = uv;
+
+			// camera space
+			vec4 start = modelViewMatrix * vec4( instanceStart, 1.0 );
+			vec4 end = modelViewMatrix * vec4( instanceEnd, 1.0 );
+
+			// special case for perspective projection, and segments that terminate either in, or behind, the camera plane
+			// clearly the gpu firmware has a way of addressing this issue when projecting into ndc space
+			// but we need to perform ndc-space calculations in the shader, so we must address this issue directly
+			// perhaps there is a more elegant solution -- WestLangley
+
+			bool perspective = ( projectionMatrix[ 2 ][ 3 ] == - 1.0 ); // 4th entry in the 3rd column
+
+			if ( perspective ) {
+
+				if ( start.z < 0.0 && end.z >= 0.0 ) {
+
+					trimSegment( start, end );
+
+				} else if ( end.z < 0.0 && start.z >= 0.0 ) {
+
+					trimSegment( end, start );
+
+				}
+
+			}
+
+			// clip space
+			vec4 clipStart = projectionMatrix * start;
+			vec4 clipEnd = projectionMatrix * end;
+
+			// ndc space
+			vec2 ndcStart = clipStart.xy / clipStart.w;
+			vec2 ndcEnd = clipEnd.xy / clipEnd.w;
+
+			// direction
+			vec2 dir = ndcEnd - ndcStart;
+
+			// account for clip-space aspect ratio
+			dir.x *= aspect;
+			dir = normalize( dir );
+
+			// perpendicular to dir
+			vec2 offset = vec2( dir.y, - dir.x );
+
+			// undo aspect ratio adjustment
+			dir.x /= aspect;
+			offset.x /= aspect;
+
+			// sign flip
+			if ( position.x < 0.0 ) offset *= - 1.0;
+
+			// endcaps
+			if ( position.y < 0.0 ) {
+
+				offset += - dir;
+
+			} else if ( position.y > 1.0 ) {
+
+				offset += dir;
+
+			}
+
+			// adjust for linewidth
+			offset *= linewidth;
+
+			// adjust for clip-space to screen-space conversion // maybe resolution should be based on viewport ...
+			offset /= resolution.y;
+
+			// select end
+			vec4 clip = ( position.y < 0.5 ) ? clipStart : clipEnd;
+
+			// back to clip space
+			offset *= clip.w;
+
+			clip.xy += offset;
+
+			gl_Position = clip;
+
+			vec4 mvPosition = ( position.y < 0.5 ) ? start : end; // this is an approximation
+
+			#include <logdepthbuf_vertex>
+			#include <clipping_planes_vertex>
+			#include <fog_vertex>
+
+		}
+		`,
+  fragmentShader: `
+		uniform vec3 diffuse;
+		uniform float opacity;
+
+		#ifdef USE_DASH
+
+			uniform float dashSize;
+			uniform float gapSize;
+
+		#endif
+
+		varying float vLineDistance;
+
+		#include <common>
+		#include <color_pars_fragment>
+		#include <fog_pars_fragment>
+		#include <logdepthbuf_pars_fragment>
+		#include <clipping_planes_pars_fragment>
+
+		varying vec2 vUv;
+
+		void main() {
+
+			#include <clipping_planes_fragment>
+
+			#ifdef USE_DASH
+
+				if ( vUv.y < - 1.0 || vUv.y > 1.0 ) discard; // discard endcaps
+
+				if ( mod( vLineDistance, dashSize + gapSize ) < dashSize ) discard; // todo - FIX
+
+			#endif
+
+			if ( abs( vUv.y ) > 1.0 ) {
+
+				float a = vUv.x;
+				float b = ( vUv.y > 0.0 ) ? vUv.y - 1.0 : vUv.y + 1.0;
+				float len2 = a * a + b * b;
+
+				if ( len2 > 1.0 ) discard;
+
+			}
+
+			vec4 diffuseColor = vec4( diffuse, opacity );
+
+			#include <logdepthbuf_fragment>
+			#include <color_fragment>
+
+			gl_FragColor = vec4( diffuseColor.rgb, diffuseColor.a );
+
+			#include <tonemapping_fragment>
+			#include <fog_fragment>
+			#include <premultiplied_alpha_fragment>
+
+		}
+		`
+};
+class l extends r.ShaderMaterial {
+  // to be set by renderer
+  constructor(i) {
+    super({
+      uniforms: r.UniformsUtils.clone(s.uniforms),
+      vertexShader: s.vertexShader,
+      fragmentShader: s.fragmentShader,
+      clipping: !0
+      // required for clipping support
+    });
+    a(this, "color");
+    a(this, "dashed");
+    a(this, "dashScale");
+    a(this, "dashSize");
+    a(this, "gapSize");
+    a(this, "resolution");
+    this.type = "LineMaterial", this.dashed = !1, Object.defineProperties(this, {
+      color: {
+        enumerable: !0,
+        get() {
+          return this.uniforms.diffuse.value;
+        },
+        set(e) {
+          this.uniforms.diffuse.value = e;
+        }
+      },
+      linewidth: {
+        enumerable: !0,
+        get() {
+          return this.uniforms.linewidth.value;
+        },
+        set(e) {
+          this.uniforms.linewidth.value = e;
+        }
+      },
+      dashScale: {
+        enumerable: !0,
+        get() {
+          return this.uniforms.dashScale.value;
+        },
+        set(e) {
+          this.uniforms.dashScale.value = e;
+        }
+      },
+      dashSize: {
+        enumerable: !0,
+        get() {
+          return this.uniforms.dashSize.value;
+        },
+        set(e) {
+          this.uniforms.dashSize.value = e;
+        }
+      },
+      gapSize: {
+        enumerable: !0,
+        get() {
+          return this.uniforms.gapSize.value;
+        },
+        set(e) {
+          this.uniforms.gapSize.value = e;
+        }
+      },
+      opacity: {
+        enumerable: !0,
+        get() {
+          return this.uniforms.opacity.value;
+        },
+        set(e) {
+          this.uniforms.opacity.value = e;
+        }
+      },
+      resolution: {
+        enumerable: !0,
+        get() {
+          return this.uniforms.resolution.value;
+        },
+        set(e) {
+          this.uniforms.resolution.value.copy(e);
+        }
+      }
+    }), this.setValues(i);
+  }
+}
+Object.assign(l.prototype, { isLineMaterial: !0 });
+export {
+  l as Five_LineMaterial2
+};

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

@@ -0,0 +1,13 @@
+import { THREE_Line2 as Five_THREE_Line2 } from '@realsee/five/line';
+import type { LineMaterial } from './LineMaterial';
+import type { LineGeometry } from './LineGeometry';
+export declare class THREE_Line2 extends Five_THREE_Line2 {
+    material: LineMaterial;
+    constructor(geometry: LineGeometry, material: LineMaterial);
+    toJSON(): {
+        type: string;
+        geometryAttributes: {
+            [name: string]: import("three").BufferAttribute | import("three").InterleavedBufferAttribute;
+        };
+    };
+}

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

@@ -0,0 +1,15 @@
+import { THREE_Line2 as r } from "@realsee/five/line";
+class o extends r {
+  constructor(e, t) {
+    super(e, t);
+  }
+  toJSON() {
+    return {
+      type: "Five_THREE_Line2",
+      geometryAttributes: this.geometry.attributes
+    };
+  }
+}
+export {
+  o as THREE_Line2
+};

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

@@ -0,0 +1,19 @@
+import { LineMaterial as Five_LineMaterial } from '@realsee/five/line';
+import * as THREE from 'three';
+import type { Merge } from 'type-fest';
+import type { Color } from '../../..';
+export declare class LineMaterial extends Five_LineMaterial {
+    get three_color(): Color;
+    set three_color(value: Color);
+    /**
+     * @deprecated Use `setDashed` to set
+     */
+    dashed: boolean;
+    private _three_color;
+    constructor(params?: Merge<ConstructorParameters<typeof Five_LineMaterial>[0], THREE.MeshBasicMaterialParameters>);
+    setDashed(dashed: boolean): void;
+    toJSON(): {
+        type: string;
+        color: number | THREE.Vector3;
+    };
+}

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

@@ -0,0 +1,33 @@
+var c = Object.defineProperty;
+var s = (o, t, e) => t in o ? c(o, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[t] = e;
+var r = (o, t, e) => (s(o, typeof t != "symbol" ? t + "" : t, e), e);
+import { LineMaterial as n } from "@realsee/five/line";
+import { notNil as d } from "../../isNil.js";
+class u extends n {
+  constructor(e) {
+    var h, l;
+    super(e);
+    r(this, "_three_color");
+    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]);
+    }), this.setDashed((l = e == null ? void 0 : e.dashed) != null ? l : !1);
+  }
+  get three_color() {
+    return this._three_color;
+  }
+  set three_color(e) {
+    this._three_color = e, this.color = e;
+  }
+  setDashed(e) {
+    this.dashed = e, e ? this.defines.USE_DASH = "" : delete this.defines.USE_DASH, this.needsUpdate = !0;
+  }
+  toJSON() {
+    return {
+      type: "FiveLineMaterial",
+      color: this.color
+    };
+  }
+}
+export {
+  u as LineMaterial
+};

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

@@ -0,0 +1,19 @@
+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);
+    /**
+     * @deprecated Use `setDashed` to set
+     */
+    dashed: boolean;
+    private _three_color;
+    constructor(params?: Merge<ConstructorParameters<typeof Five_LineMaterial2>[0], THREE.MeshBasicMaterialParameters>);
+    setDashed(dashed: boolean): void;
+    toJSON(): {
+        type: string;
+        color: number | THREE.Vector3;
+    };
+}

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

@@ -0,0 +1,33 @@
+var c = Object.defineProperty;
+var s = (o, t, e) => t in o ? c(o, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[t] = e;
+var r = (o, t, e) => (s(o, typeof t != "symbol" ? t + "" : t, e), e);
+import { notNil as d } from "../../isNil.js";
+import { Five_LineMaterial2 as n } from "./Five_LineMaterial2.js";
+class u extends n {
+  constructor(e) {
+    var h, l;
+    super(e);
+    r(this, "_three_color");
+    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]);
+    }), this.setDashed((l = e == null ? void 0 : e.dashed) != null ? l : !1);
+  }
+  get three_color() {
+    return this._three_color;
+  }
+  set three_color(e) {
+    this._three_color = e, this.color = e;
+  }
+  setDashed(e) {
+    this.dashed = e, e ? this.defines.USE_DASH = "" : delete this.defines.USE_DASH, this.needsUpdate = !0;
+  }
+  toJSON() {
+    return {
+      type: "FiveLineMaterial",
+      color: this.color
+    };
+  }
+}
+export {
+  u as LineMaterial2
+};

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

@@ -2,13 +2,21 @@ import * as THREE from 'three';
 export declare class PrismGeometry extends THREE.BufferGeometry {
     bottomPositions: number[][];
     topPosition: number[];
+    private _type;
+    constructor(params?: {
+        bottomPositions?: number[][];
+        topPosition?: number[];
+        type?: 'Concave' | 'Convex';
+    });
     /**
      * @description 设置底面和顶面的位置
      * @param params.bottomPositions 底面多边形的有序顶点，顺时针或逆时针均可
      * @param params.topPosition 底面多边形的第一个点对应的顶面的顶点
+     * @param params.type 棱柱的类型，凹多边形（Concave）或凸多边形（Convex），默认为凹多边形。如果可以确定是凸多边形，建议设置为凸多边形，性能更好
      */
     setPosition(params: {
         bottomPositions?: number[][];
         topPosition?: number[];
+        type?: 'Concave' | 'Convex';
     }): void;
 }

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

@@ -1,42 +1,44 @@
-var a = Object.defineProperty;
-var b = (l, s, e) => s in l ? a(l, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[s] = e;
-var p = (l, s, e) => (b(l, typeof s != "symbol" ? s + "" : s, e), e);
-import * as u from "three";
-class x extends u.BufferGeometry {
-  constructor() {
-    super(...arguments);
+var x = Object.defineProperty;
+var y = (r, s, e) => s in r ? x(r, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[s] = e;
+var p = (r, s, e) => (y(r, typeof s != "symbol" ? s + "" : s, e), e);
+import * as c from "three";
+import { concavePolygonVertexIndex as a, convexPolygonVertexIndex as d } from "./polygonVertex.js";
+class v extends c.BufferGeometry {
+  constructor(e) {
+    super();
     p(this, "bottomPositions", []);
     p(this, "topPosition", []);
+    p(this, "_type", "Concave");
+    e && this.setPosition(e);
   }
   /**
    * @description 设置底面和顶面的位置
    * @param params.bottomPositions 底面多边形的有序顶点，顺时针或逆时针均可
    * @param params.topPosition 底面多边形的第一个点对应的顶面的顶点
+   * @param params.type 棱柱的类型，凹多边形（Concave）或凸多边形（Convex），默认为凹多边形。如果可以确定是凸多边形，建议设置为凸多边形，性能更好
    */
   setPosition(e) {
-    var g, m;
-    const i = (g = e.bottomPositions) != null ? g : this.bottomPositions, r = (m = e.topPosition) != null ? m : this.topPosition;
-    if (this.bottomPositions = i, this.topPosition = r, !i || i.length < 3) {
-      console.error("PrismGeometry: Invalid parameters", i, r, e), this.bottomPositions = [], this.setAttribute("position", new u.BufferAttribute(new Float32Array([]), 3));
+    var u, g, m;
+    const n = (u = e.bottomPositions) != null ? u : this.bottomPositions, h = (g = e.topPosition) != null ? g : this.topPosition;
+    if (this._type = (m = e.type) != null ? m : this._type, this.bottomPositions = n, this.topPosition = h, !n || n.length < 3) {
+      console.error("PrismGeometry: Invalid parameters", n, h, e), this.bottomPositions = [], this.setAttribute("position", new c.BufferAttribute(new Float32Array([]), 3));
       return;
     }
-    const n = [], t = [];
-    t.push(...i), t[0][0] === t.at(-1)[0] && t[0][1] === t.at(-1)[1] && t[0][2] === t.at(-1)[2] && (t.length -= 1);
-    for (let h = 0; h < t.length - 2; h++)
-      n.push(0, h + 1, h + 2);
-    if (r && r.length === 3) {
-      const h = [r[0] - i[0][0], r[1] - i[0][1], r[2] - i[0][2]], f = t.map((o) => [o[0] + h[0], o[1] + h[1], o[2] + h[2]]);
+    const i = [], t = [];
+    t.push(...n), t[0][0] === t.at(-1)[0] && t[0][1] === t.at(-1)[1] && t[0][2] === t.at(-1)[2] && (t.length -= 1);
+    const P = this._type === "Concave" ? a(t) : d(t);
+    if (i.push(...P), h && h.length === 3) {
+      const l = [h[0] - n[0][0], h[1] - n[0][1], h[2] - n[0][2]], f = t.map((o) => [o[0] + l[0], o[1] + l[1], o[2] + l[2]]);
       t.push(...f);
-      const P = n.map((o) => o + t.length / 2);
-      n.push(...P);
+      const b = i.map((o) => o + t.length / 2);
+      i.push(...b);
       for (let o = 0; o < t.length / 2 - 1; o++)
-        n.push(o, o + 1, o + t.length / 2), n.push(o + 1, o + t.length / 2 + 1, o + t.length / 2);
-      n.push(0, t.length / 2, t.length / 2 - 1), n.push(t.length / 2, t.length - 1, t.length / 2 - 1);
+        i.push(o, o + 1, o + t.length / 2), i.push(o + 1, o + t.length / 2 + 1, o + t.length / 2);
+      i.push(0, t.length / 2, t.length / 2 - 1), i.push(t.length / 2, t.length - 1, t.length / 2 - 1);
     }
-    const c = t.flat();
-    this.setAttribute("position", new u.Float32BufferAttribute(c, 3)), this.setIndex(n), this.computeBoundingSphere();
+    this.setAttribute("position", new c.Float32BufferAttribute(t.flat(), 3)), this.setIndex(i), this.computeBoundingSphere();
   }
 }
 export {
-  x as PrismGeometry
+  v as PrismGeometry
 };

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

@@ -0,0 +1,8 @@
+/**
+ * @description 凸多边形的顶点
+ */
+export declare function convexPolygonVertexIndex(_vectors: number[][]): number[];
+/**
+ * @description 凹多边形的顶点
+ */
+export declare function concavePolygonVertexIndex(vectors: number[][]): number[];

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

@@ -0,0 +1,16 @@
+import * as r from "three";
+import { earcut3D as c } from "../earcut3D.js";
+function x(o) {
+  const e = [...o], t = [];
+  for (let n = 0; n < e.length - 2; n++)
+    t.push(0, n + 1, n + 2);
+  return t;
+}
+function s(o) {
+  const e = o.map((n) => new r.Vector3(n[0], n[1], n[2]));
+  return c(e);
+}
+export {
+  s as concavePolygonVertexIndex,
+  x as convexPolygonVertexIndex
+};

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

@@ -4,6 +4,7 @@ import "./PointSelector/index.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
 import "../tag.js";
 import "@realsee/five/line";
+import "./core/Five_LineMaterial2.js";
 import "./core/Sphere.js";
 import "animejs";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.54.0",
+  "version": "3.54.2",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",