simulationjsv2 0.5.2 → 0.7.1

package/dist/types.d.ts

@@ -23,6 +23,7 @@ export type Mat4 = FloatArray & [
     number,
     number
 ];
+export type Quat = Float32Array & [number, number, number, number];
 export type LerpFunc = (n: number) => number;
 export type VertexColorMap = Record<number, Color>;
 export type ElementRotation<T extends Vector2 | Vector3> = T extends Vector2 ? number : T;
@@ -54,26 +55,26 @@ export type Spline2dGeometryParams = {
     color: Color;
     vertexColors: Color[];
 };
-export type LineGeometryParams<T extends Vector2 | Vector3> = {
-    pos: T;
-    to: T;
+export type LineGeometryParams = {
+    pos: Vector3;
+    to: Vector3;
+    fromColor: Color | null;
+    toColor: Color | null;
     thickness: number;
 };
-export type Line2dGeometryParams = LineGeometryParams<Vector2>;
-export type Line3dGeometryParams = LineGeometryParams<Vector3>;
 export type PolygonGeometryParams = {
     points: Vertex[];
 };
+export type TraceLinesParams = {
+    vertices: Vertex[];
+    maxLength: number | null;
+};
 export type PipelineGroup = {
-    triangleList2d: GPURenderPipeline;
-    triangleStrip2d: GPURenderPipeline;
-    lineStrip2d: GPURenderPipeline;
-    triangleList3d: GPURenderPipeline;
-    triangleStrip3d: GPURenderPipeline;
-    lineStrip3d: GPURenderPipeline;
+    triangleList: GPURenderPipeline;
+    triangleStrip: GPURenderPipeline;
+    lineStrip: GPURenderPipeline;
 };
 export type RenderInfo = {
-    uniformBuffer: GPUBuffer;
     instanceBuffer: GPUBuffer;
     bindGroupLayout: GPUBindGroupLayout;
     vertexBuffer: GPUBuffer | null;
@@ -81,7 +82,6 @@ export type RenderInfo = {
 export type VertexParamGeneratorInfo = {
     bufferSize: number;
     createBuffer: (x: number, y: number, z: number, color: Color) => number[];
-    shouldEvaluate?: () => boolean;
 };
 export type ShaderInfo = {
     pipeline: GPURenderPipeline;

package/dist/utils.d.ts

@@ -21,9 +21,8 @@ export declare class Color {
 export declare class Vertex {
     private pos;
     private color;
-    private is3d;
     private uv;
-    constructor(x?: number, y?: number, z?: number, color?: Color, is3dPoint?: boolean, uv?: Vector2);
+    constructor(x?: number, y?: number, z?: number, color?: Color, uv?: Vector2);
     getPos(): Vector3;
     setPos(pos: Vector3): void;
     getColor(): Color | null;
@@ -33,18 +32,19 @@ export declare class Vertex {
     setX(x: number): void;
     setY(y: number): void;
     setZ(z: number): void;
-    setIs3d(is3d: boolean): void;
     clone(): Vertex;
     toBuffer(defaultColor: Color): number[];
 }
 /**
- * @param callback1 - called every frame until the animation is finished
- * @param callback2 - called after animation is finished (called immediately when t = 0)
+ * @param onFrame - called every frame until the animation is finished
+ * @param adjustment - called after animation is finished (called immediately when t = 0) if t > 0 it will only be called if `transformAdjustments` is enabled in settings
  * @param t - animation time (seconds)
  * @returns {Promise<void>}
  */
-export declare function transitionValues(callback1: (deltaT: number, t: number) => void, callback2: () => void, transitionLength: number, func?: (n: number) => number): Promise<void>;
-export declare function frameLoop<T extends (dt: number, ...args: any[]) => any>(cb: T): (...params: Parameters<T>) => void;
+export declare function transitionValues(onFrame: (deltaT: number, t: number, total: number) => void, adjustment: () => void, transitionLength: number, func?: (n: number) => number): Promise<void>;
+type Shift<T extends any[]> = T extends [] ? [] : T extends [unknown, ...infer R] ? R : never;
+export declare function frameLoop<T extends (dt: number, ...args: any[]) => any>(cb: T): (...params: Shift<Parameters<T>>) => void;
+export declare function clamp(num: number, min: number, max: number): number;
 export declare function lerp(a: number, b: number, t: number): number;
 export declare function smoothStep(t: number): number;
 export declare function linearStep(t: number): number;
@@ -67,7 +67,7 @@ export declare function vector2FromVector3(vec: Vector3): Vector2;
 export declare function colorFromVector4(vec: Vector4): Color;
 export declare function randomInt(range: number, min?: number): number;
 export declare function randomColor(a?: number): Color;
-export declare function vertex(x?: number, y?: number, z?: number, color?: Color, is3dPoint?: boolean, uv?: Vector2): Vertex;
+export declare function vertex(x?: number, y?: number, z?: number, color?: Color, uv?: Vector2): Vertex;
 export declare function color(r?: number, g?: number, b?: number, a?: number): Color;
 export declare function colorf(val: number, a?: number): Color;
 export declare function splinePoint2d(end: Vertex, control1: Vector2, control2: Vector2, detail?: number): SplinePoint2d;
@@ -81,3 +81,4 @@ export declare function distance3d(vector1: Vector3, vector2: Vector3): number;
 export declare function toSceneObjInfo(el: AnySimulationElement, id?: string): SimSceneObjInfo;
 export declare function toSceneObjInfoMany(el: AnySimulationElement[], id?: (string | undefined)[]): SimSceneObjInfo[];
 export declare function interpolateColors(colors: Color[], t: number): Color;
+export {};

package/dist/utils.js

@@ -36,12 +36,10 @@ export class Color {
 export class Vertex {
     pos;
     color;
-    is3d;
     uv;
-    constructor(x = 0, y = 0, z = 0, color, is3dPoint = true, uv = vector2()) {
+    constructor(x = 0, y = 0, z = 0, color, uv = vector2()) {
         this.pos = vector3(x, y, z);
-        this.color = color ? color : null;
-        this.is3d = is3dPoint;
+        this.color = color || null;
         this.uv = uv;
     }
     getPos() {
@@ -71,37 +69,34 @@ export class Vertex {
     setZ(z) {
         this.pos[2] = z;
     }
-    setIs3d(is3d) {
-        this.is3d = is3d;
-    }
     clone() {
-        return new Vertex(this.pos[0], this.pos[1], this.pos[2], this.color?.clone(), this.is3d, cloneBuf(this.uv));
+        return new Vertex(this.pos[0], this.pos[1], this.pos[2], this.color?.clone(), cloneBuf(this.uv));
     }
     toBuffer(defaultColor) {
-        if (this.is3d)
-            return bufferGenerator.generate(this.pos[0], this.pos[1], this.pos[2], this.color || defaultColor, this.uv);
-        else
-            return bufferGenerator.generate(this.pos[0], this.pos[1], 0, this.color || defaultColor, this.uv);
+        return bufferGenerator.generate(this.pos[0], this.pos[1], this.pos[2], this.color || defaultColor, this.uv);
     }
 }
 /**
- * @param callback1 - called every frame until the animation is finished
- * @param callback2 - called after animation is finished (called immediately when t = 0)
+ * @param onFrame - called every frame until the animation is finished
+ * @param adjustment - called after animation is finished (called immediately when t = 0) if t > 0 it will only be called if `transformAdjustments` is enabled in settings
  * @param t - animation time (seconds)
  * @returns {Promise<void>}
  */
-export function transitionValues(callback1, callback2, transitionLength, func) {
+export function transitionValues(onFrame, adjustment, transitionLength, func) {
     return new Promise((resolve) => {
         if (transitionLength == 0) {
-            callback2();
+            adjustment();
             resolve();
         }
         else {
             let prevPercent = 0;
             let prevTime = Date.now();
+            let totalTime = 0;
             const step = (t, f) => {
                 const newT = f(t);
-                callback1(newT - prevPercent, t);
+                const deltaT = newT - prevPercent;
+                onFrame(deltaT, t, totalTime);
+                totalTime += deltaT;
                 prevPercent = newT;
                 const now = Date.now();
                 let diff = now - prevTime;
@@ -113,7 +108,7 @@ export function transitionValues(callback1, callback2, transitionLength, func) {
                     window.requestAnimationFrame(() => step(t + inc, f));
                 }
                 else {
-                    callback2();
+                    adjustment();
                     resolve();
                 }
             };
@@ -143,6 +138,9 @@ export function frameLoop(cb) {
         start(0, ...p);
     };
 }
+export function clamp(num, min, max) {
+    return Math.min(max, Math.max(min, num));
+}
 export function lerp(a, b, t) {
     return a + (b - a) * t;
 }
@@ -217,8 +215,8 @@ export function randomInt(range, min = 0) {
 export function randomColor(a = 1) {
     return new Color(randomInt(255), randomInt(255), randomInt(255), a);
 }
-export function vertex(x, y, z, color, is3dPoint, uv) {
-    return new Vertex(x, y, z, color, is3dPoint, uv);
+export function vertex(x, y, z, color, uv) {
+    return new Vertex(x, y, z, color, uv);
 }
 export function color(r, g, b, a) {
     return new Color(r, g, b, a);

package/package.json

@@ -5,7 +5,7 @@
   "types": "./dist/index.d.ts",
   "author": "Jackson Otto",
   "description": "A simple graphics library using WebGPU",
-  "version": "0.5.2",
+  "version": "0.7.1",
   "exports": {
     ".": {
       "import": "./dist/index.js",