simulationjsv2 0.4.8 → 0.4.9

package/dist/geometry.d.ts

@@ -1,10 +1,10 @@
-import { CircleGeometryParams, CubeGeometryParams, Line2dGeometryParams, Line3dGeometryParams, Mat4, PolygonGeometryParams, Spline2dGeometryParams, SquareGeometryParams, Vector2, Vector3, VertexColorMap } from './types.js';
+import { CircleGeometryParams, CubeGeometryParams, EmptyParams, Line2dGeometryParams, Line3dGeometryParams, Mat4, PolygonGeometryParams, Spline2dGeometryParams, SquareGeometryParams, Vector2, Vector3, VertexColorMap } from './types.js';
 import { Color, Vertex } from './utils.js';
 import { CubicBezierCurve2d, SplinePoint2d } from './graphics.js';
-export declare abstract class Geometry {
+export declare abstract class Geometry<T extends EmptyParams> {
     protected abstract wireframeOrder: number[];
     protected abstract triangleOrder: number[];
-    protected abstract params: Record<string, any>;
+    protected abstract params: T;
     protected vertices: Vector3[];
     protected matrix: Mat4;
     protected geometryType: 'list' | 'strip';
@@ -18,7 +18,7 @@ export declare abstract class Geometry {
     getWireframeBuffer(color: Color): number[];
     getTriangleBuffer(color: Color): number[];
 }
-export declare class PlaneGeometry extends Geometry {
+export declare class PlaneGeometry extends Geometry<EmptyParams> {
     protected params: {};
     protected wireframeOrder: number[];
     protected triangleOrder: number[];
@@ -28,7 +28,7 @@ export declare class PlaneGeometry extends Geometry {
     updateVertices(vertices: Vertex[]): void;
     getTriangleBuffer(color: Color): number[];
 }
-export declare class CubeGeometry extends Geometry {
+export declare class CubeGeometry extends Geometry<CubeGeometryParams> {
     protected params: CubeGeometryParams;
     protected wireframeOrder: number[];
     protected triangleOrder: number[];
@@ -39,7 +39,7 @@ export declare class CubeGeometry extends Geometry {
     recompute(): void;
     updateSize(width: number, height: number, depth: number): void;
 }
-export declare class SquareGeometry extends Geometry {
+export declare class SquareGeometry extends Geometry<SquareGeometryParams> {
     protected wireframeOrder: number[];
     protected triangleOrder: number[];
     protected params: SquareGeometryParams;
@@ -50,14 +50,14 @@ export declare class SquareGeometry extends Geometry {
     recompute(): void;
     getTriangleBuffer(color: Color): number[];
 }
-export declare class BlankGeometry extends Geometry {
+export declare class BlankGeometry extends Geometry<EmptyParams> {
     protected wireframeOrder: never[];
     protected triangleOrder: never[];
     protected params: {};
     constructor();
     recompute(): void;
 }
-export declare class CircleGeometry extends Geometry {
+export declare class CircleGeometry extends Geometry<CircleGeometryParams> {
     protected wireframeOrder: number[];
     protected triangleOrder: number[];
     protected params: CircleGeometryParams;
@@ -67,7 +67,7 @@ export declare class CircleGeometry extends Geometry {
     private updateTriangleOrder;
     recompute(): void;
 }
-export declare class Spline2dGeometry extends Geometry {
+export declare class Spline2dGeometry extends Geometry<Spline2dGeometryParams> {
     protected wireframeOrder: number[];
     protected triangleOrder: number[];
     protected params: Spline2dGeometryParams;
@@ -86,21 +86,21 @@ export declare class Spline2dGeometry extends Geometry {
     getWireframeBuffer(color: Color): number[];
     getTriangleBuffer(_: Color): number[];
 }
-export declare class Line2dGeometry extends Geometry {
+export declare class Line2dGeometry extends Geometry<Line2dGeometryParams> {
     protected wireframeOrder: number[];
     protected triangleOrder: number[];
     protected params: Line2dGeometryParams;
     constructor(pos: Vector2, to: Vector2, thickness: number);
     recompute(): void;
 }
-export declare class Line3dGeometry extends Geometry {
+export declare class Line3dGeometry extends Geometry<Line3dGeometryParams> {
     protected wireframeOrder: number[];
     protected triangleOrder: number[];
     protected params: Line3dGeometryParams;
     constructor(pos: Vector3, to: Vector3, thickness: number);
     recompute(): void;
 }
-export declare class PolygonGeometry extends Geometry {
+export declare class PolygonGeometry extends Geometry<PolygonGeometryParams> {
     protected wireframeOrder: number[];
     protected triangleOrder: number[];
     protected params: PolygonGeometryParams;

package/dist/geometry.js

@@ -358,6 +358,7 @@ export class Spline2dGeometry extends Geometry {
         })
             .flat();
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     getTriangleBuffer(_) {
         return this.triangleOrder
             .map((vertexIndex) => {

package/dist/graphics.d.ts

@@ -1,12 +1,12 @@
 /// <reference types="@webgpu/types" />
 import { Camera } from './simulation.js';
-import type { Vector2, Vector3, LerpFunc, VertexColorMap, ElementRotation, Mat4 } from './types.js';
+import type { Vector2, Vector3, LerpFunc, VertexColorMap, ElementRotation, Mat4, AnySimulationElement } from './types.js';
 import { Vertex, Color } from './utils.js';
 import { BlankGeometry, CircleGeometry, CubeGeometry, Geometry, Line2dGeometry, Line3dGeometry, PlaneGeometry, PolygonGeometry, Spline2dGeometry, SquareGeometry } from './geometry.js';
 import { VertexCache } from './internalUtils.js';
 export declare abstract class SimulationElement<T extends Vector2 | Vector3 = Vector3> {
     protected abstract pos: T;
-    protected abstract geometry: Geometry;
+    protected abstract geometry: Geometry<any>;
     protected color: Color;
     protected wireframe: boolean;
     protected vertexCache: VertexCache;
@@ -177,7 +177,7 @@ export declare class Spline2d extends SimulationElement2d {
     interpolate(t: number): Vector2;
     protected updateMatrix(camera: Camera): void;
 }
-export declare class Instance<T extends SimulationElement2d | SimulationElement3d> extends SimulationElement3d {
+export declare class Instance<T extends AnySimulationElement> extends SimulationElement3d {
     protected geometry: BlankGeometry;
     private obj;
     private instanceMatrix;

package/dist/graphics.js

@@ -650,9 +650,9 @@ export class BezierCurve2d {
     interpolateSlope(t) {
         t = Math.max(0, Math.min(1, t));
         let vectors = this.points;
-        let slopeVector = vector2(1);
+        const slopeVector = vector2(1);
         while (vectors.length > 2) {
-            let newVectors = [];
+            const newVectors = [];
             for (let i = 1; i < vectors.length - 1; i++) {
                 const from = vector2();
                 const to = vector2();
@@ -670,7 +670,7 @@ export class BezierCurve2d {
             vectors = newVectors;
         }
         vec2.sub(vectors[1], vectors[0], slopeVector);
-        let resVector = vector2();
+        const resVector = vector2();
         vec2.scale(slopeVector, t, resVector);
         vec2.add(resVector, vectors[0], resVector);
         return [resVector, slopeVector];
@@ -987,6 +987,7 @@ export class Instance extends SimulationElement3d {
     getGeometryType() {
         return this.obj.getGeometryType();
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     updateMatrix(_) { }
     getBuffer(camera) {
         if (this.needsRemap)

package/dist/internalUtils.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="@webgpu/types" />
-import { Mat4, Vector2, Vector3 } from './types.js';
+import { AnySimulationElement, Mat4, Vector2, Vector3 } from './types.js';
 import { Color } from './utils.js';
-import { SimulationElement } from './graphics.js';
 export declare class VertexCache {
     private vertices;
     private hasUpdated;
@@ -17,15 +16,15 @@ export declare const getTransformationMatrix: (pos: Vector3, rotation: Vector3,
 export declare const getOrthoMatrix: (screenSize: [number, number]) => Float32Array;
 export declare const buildDepthTexture: (device: GPUDevice, width: number, height: number) => GPUTexture;
 export declare const buildMultisampleTexture: (device: GPUDevice, ctx: GPUCanvasContext, width: number, height: number) => GPUTexture;
-export declare const addObject: (scene: SimSceneObjInfo[], el: SimulationElement<any>, device: GPUDevice | null, id?: string) => void;
-export declare const removeObject: (scene: SimSceneObjInfo[], el: SimulationElement<any>) => void;
+export declare const addObject: (scene: SimSceneObjInfo[], el: AnySimulationElement, device: GPUDevice | null, id?: string) => void;
+export declare const removeObject: (scene: SimSceneObjInfo[], el: AnySimulationElement) => void;
 export declare const removeObjectId: (scene: SimSceneObjInfo[], id: string) => void;
 export declare class SimSceneObjInfo {
     private obj;
     private id;
     private lifetime;
     private currentLife;
-    constructor(obj: SimulationElement<any>, id?: string);
+    constructor(obj: AnySimulationElement, id?: string);
     /**
      * @param lifetime - ms
      */
@@ -36,7 +35,7 @@ export declare class SimSceneObjInfo {
      * @param amount - ms
      */
     traverseLife(amount: number): void;
-    getObj(): SimulationElement<Vector3 | Vector2>;
+    getObj(): AnySimulationElement;
     getId(): string | null;
 }
 declare class Logger {

package/dist/internalUtils.js

@@ -197,7 +197,7 @@ export function vector2ToPixelRatio(vec) {
     vec[1] *= devicePixelRatio;
 }
 export function matrixFromRotation(rotation) {
-    let rotMatrix = mat4.identity();
+    const rotMatrix = mat4.identity();
     mat4.rotateZ(rotMatrix, rotation[2], rotMatrix);
     mat4.rotateY(rotMatrix, rotation[1], rotMatrix);
     mat4.rotateX(rotMatrix, rotation[0], rotMatrix);

package/dist/simulation.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="@webgpu/types" />
-import { SimulationElement, SimulationElement3d } from './graphics.js';
-import type { Vector2, Vector3, LerpFunc } from './types.js';
+import { SimulationElement3d } from './graphics.js';
+import type { Vector2, Vector3, LerpFunc, AnySimulationElement } from './types.js';
 import { Color } from './utils.js';
 import { BlankGeometry } from './geometry.js';
 import { SimSceneObjInfo } from './internalUtils.js';
@@ -17,20 +17,20 @@ export declare class Simulation {
     private pipelines;
     private renderInfo;
     constructor(idOrCanvasRef: string | HTMLCanvasElement, camera?: Camera | null, showFrameRate?: boolean);
-    add(el: SimulationElement<any>, id?: string): void;
-    remove(el: SimulationElement<any>): void;
+    add(el: AnySimulationElement, id?: string): void;
+    remove(el: AnySimulationElement): void;
     removeId(id: string): void;
     /**
      * @param lifetime - ms
      */
-    setLifetime(el: SimulationElement<any>, lifetime: number): void;
+    setLifetime(el: AnySimulationElement, lifetime: number): void;
     setCanvasSize(width: number, height: number): void;
     start(): void;
     private propagateDevice;
     stop(): void;
     setBackground(color: Color): void;
     getScene(): SimSceneObjInfo[];
-    getSceneObjects(): SimulationElement<Vector3 | Vector2>[];
+    getSceneObjects(): AnySimulationElement[];
     private render;
     private renderScene;
     fitElement(): void;
@@ -47,16 +47,16 @@ export declare class SceneCollection extends SimulationElement3d {
     setDevice(device: GPUDevice): void;
     private propagateDevice;
     getVertexCount(): number;
-    getSceneObjects(): SimulationElement<Vector3 | Vector2>[];
-    setSceneObjects(newScene: SimulationElement<any>[]): void;
+    getSceneObjects(): AnySimulationElement[];
+    setSceneObjects(newScene: AnySimulationElement[]): void;
     setScene(newScene: SimSceneObjInfo[]): void;
-    add(el: SimulationElement<any>, id?: string): void;
-    remove(el: SimulationElement<any>): void;
+    add(el: AnySimulationElement, id?: string): void;
+    remove(el: AnySimulationElement): void;
     removeId(id: string): void;
     /**
      * @param lifetime - ms
      */
-    setLifetime(el: SimulationElement<any>, lifetime: number): void;
+    setLifetime(el: AnySimulationElement, lifetime: number): void;
     empty(): void;
     getSceneBuffer(camera: Camera): number[];
     getWireframe(camera: Camera): number[];

package/dist/simulation.js

@@ -299,6 +299,7 @@ export class Simulation {
             ]
         });
         const colorAttachment = {
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
             view: undefined, // Assigned later
             clearValue: this.bgColor.toObject(),
@@ -361,8 +362,10 @@ export class Simulation {
                 depthTexture = buildDepthTexture(device, screenSize[0], screenSize[1]);
                 renderPassDescriptor.depthStencilAttachment.view = depthTexture.createView();
             }
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
             renderPassDescriptor.colorAttachments[0].view = multisampleTexture.createView();
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
             renderPassDescriptor.colorAttachments[0].resolveTarget = ctx.getCurrentTexture().createView();
             if (this.camera.hasUpdated()) {
@@ -395,7 +398,7 @@ export class Simulation {
         if (this.pipelines === null)
             return 0;
         let currentOffset = startOffset;
-        let toRemove = [];
+        const toRemove = [];
         for (let i = 0; i < scene.length; i++) {
             const lifetime = scene[i].getLifetime();
             if (lifetime !== null) {
@@ -501,6 +504,7 @@ export class SceneCollection extends SimulationElement3d {
         this.scene = [];
         this.geometry = new BlankGeometry();
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     setWireframe(_) { }
     getName() {
         return this.name;

package/dist/types.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="@webgpu/types" />
-import { CubicBezierCurve2d, SplinePoint2d } from './graphics.js';
+import { CubicBezierCurve2d, SimulationElement2d, SimulationElement3d, SplinePoint2d } from './graphics.js';
 import { Color, Vertex } from './utils.js';
-export type Shift<T extends any[]> = ((...args: T) => any) extends (arg1: any, ...rest: infer R) => any ? R : never;
 export type FloatArray = Float32Array | Float64Array;
 export type Vector4 = FloatArray & [number, number, number, number];
 export type Vector3 = FloatArray & [number, number, number];
@@ -27,6 +26,8 @@ export type Mat4 = FloatArray & [
 export type LerpFunc = (n: number) => number;
 export type VertexColorMap = Record<number, Color>;
 export type ElementRotation<T extends Vector2 | Vector3> = T extends Vector2 ? number : T;
+export type AnySimulationElement = SimulationElement2d | SimulationElement3d;
+export type EmptyParams = object;
 export type CubeGeometryParams = {
     width: number;
     height: number;

package/dist/utils.d.ts

@@ -1,5 +1,5 @@
-import { SimulationElement, SplinePoint2d } from './graphics.js';
-import { FloatArray, Mat4, Shift, Vector2, Vector3, Vector4 } from './types.js';
+import { SplinePoint2d } from './graphics.js';
+import { AnySimulationElement, FloatArray, Mat4, Vector2, Vector3, Vector4 } from './types.js';
 import { SimSceneObjInfo } from './internalUtils.js';
 export declare class Color {
     r: number;
@@ -44,7 +44,7 @@ export declare class Vertex {
  * @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 (...args: any[]) => any>(cb: T): (...params: Shift<Parameters<T>>) => void;
+export declare function frameLoop<T extends (dt: number, ...args: any[]) => any>(cb: T): (...params: Parameters<T>) => void;
 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;
@@ -78,6 +78,6 @@ export declare function continuousSplinePoint2d(end: Vertex, control: Vector2, d
 export declare function waitFor(t: number): Promise<unknown>;
 export declare function distance2d(vector1: Vector2, vector2: Vector2): number;
 export declare function distance3d(vector1: Vector3, vector2: Vector3): number;
-export declare function toSceneObjInfo(el: SimulationElement<any>, id?: string): SimSceneObjInfo;
-export declare function toSceneObjInfoMany(el: SimulationElement<any>[], id?: (string | undefined)[]): SimSceneObjInfo[];
+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;

package/dist/utils.js

@@ -121,6 +121,7 @@ export function transitionValues(callback1, callback2, transitionLength, func) {
         }
     });
 }
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function frameLoop(cb) {
     let prevFrame = 0;
     let prevTime = 0;

package/eslint.config.js

@@ -0,0 +1,6 @@
+// @ts-check
+
+import eslint from '@eslint/js';
+import tseslint from 'typescript-eslint';
+
+export default tseslint.config(eslint.configs.recommended, ...tseslint.configs.recommended);

package/package.json

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