simulationjsv2 0.4.1 → 0.4.3

package/dist/geometry.js

@@ -1,8 +1,8 @@
 import { mat4, vec2, vec3 } from 'wgpu-matrix';
-import { cloneBuf, matrix4, vector2, vector2FromVector3, vector3, vector3FromVector2, vertex } from './utils.js';
+import { cloneBuf, interpolateColors, matrix4, vector2, vector2FromVector3, vector3, vector3FromVector2, vertex } from './utils.js';
 import { CubicBezierCurve2d } from './graphics.js';
 import { BUF_LEN } from './constants.js';
-import { bufferGenerator, interpolateColors, lossyTriangulate, triangulateWireFrameOrder } from './internalUtils.js';
+import { bufferGenerator, lossyTriangulate, triangulateWireFrameOrder } from './internalUtils.js';
 export class Geometry {
     vertices;
     matrix;

package/dist/internalUtils.d.ts

@@ -58,7 +58,6 @@ declare class BufferGenerator {
 export declare const bufferGenerator: BufferGenerator;
 export declare function vector3ToPixelRatio(vec: Vector3): void;
 export declare function vector2ToPixelRatio(vec: Vector2): void;
-export declare function interpolateColors(colors: Color[], t: number): Color;
 export declare function matrixFromRotation(rotation: Vector3): Mat4;
 export declare function rotateMat4(mat: Mat4, rotation: Vector3): void;
 export declare function createPipeline(device: GPUDevice, module: GPUShaderModule, bindGroupLayout: GPUBindGroupLayout, presentationFormat: GPUTextureFormat, entryPoint: string, topology: GPUPrimitiveTopology): GPURenderPipeline;

package/dist/internalUtils.js

@@ -1,6 +1,6 @@
 import { mat4, vec3 } from 'wgpu-matrix';
 import { BUF_LEN, colorOffset, drawingInstancesOffset, uvOffset, vertexSize } from './constants.js';
-import { color, vector2, vector3 } from './utils.js';
+import { vector2, vector3 } from './utils.js';
 import { SimulationElement } from './graphics.js';
 export class VertexCache {
     vertices = [];
@@ -192,31 +192,6 @@ export function vector2ToPixelRatio(vec) {
     vec[0] *= devicePixelRatio;
     vec[1] *= devicePixelRatio;
 }
-export function interpolateColors(colors, t) {
-    t = Math.min(1, Math.max(0, t));
-    if (colors.length === 0)
-        return color();
-    if (colors.length === 1)
-        return colors[0];
-    const colorInterval = 1 / colors.length;
-    let index = Math.floor(t / colorInterval);
-    if (index >= colors.length)
-        index = colors.length - 1;
-    const from = index === colors.length - 1 ? colors[index - 1] : colors[index];
-    const to = index === colors.length - 1 ? colors[index] : colors[index + 1];
-    const diff = to.diff(from);
-    const scale = t / (colorInterval * colors.length);
-    diff.r *= scale;
-    diff.g *= scale;
-    diff.b *= scale;
-    diff.a *= scale;
-    const res = from.clone();
-    res.r += diff.r;
-    res.g += diff.g;
-    res.b += diff.b;
-    res.a += diff.a;
-    return res;
-}
 export function matrixFromRotation(rotation) {
     let rotMatrix = mat4.identity();
     mat4.rotateZ(rotMatrix, rotation[2], rotMatrix);

package/dist/simulation.d.ts

@@ -27,6 +27,8 @@ export declare class Simulation {
     start(): void;
     stop(): void;
     setBackground(color: Color): void;
+    getScene(): SimSceneObjInfo[];
+    getSceneObjects(): SimulationElement<Vector3 | Vector2>[];
     private propagateDevice;
     render(device: GPUDevice, ctx: GPUCanvasContext): void;
     private renderScene;
@@ -42,6 +44,7 @@ export declare class SceneCollection extends SimulationElement3d {
     setWireframe(_: boolean): void;
     getName(): string;
     getScene(): SimSceneObjInfo[];
+    getSceneObjects(): SimulationElement<Vector3 | Vector2>[];
     setSceneObjects(newScene: SimulationElement<any>[]): void;
     setScene(newScene: SimSceneObjInfo[]): void;
     add(el: SimulationElement<any>): void;

package/dist/simulation.js

@@ -1,9 +1,9 @@
 import { vec3 } from 'wgpu-matrix';
 import { SimulationElement3d } from './graphics.js';
 import { BUF_LEN } from './constants.js';
-import { Color, transitionValues, vector2, vector3 } from './utils.js';
+import { Color, toSceneObjInfoMany, transitionValues, vector2, vector3 } from './utils.js';
 import { BlankGeometry } from './geometry.js';
-import { SimSceneObjInfo, addObject, buildDepthTexture, buildMultisampleTexture, buildProjectionMatrix, createPipeline, getOrthoMatrix, getTotalVertices, getTransformationMatrix, logger, removeObject, removeObjectId } from './internalUtils.js';
+import { addObject, buildDepthTexture, buildMultisampleTexture, buildProjectionMatrix, createPipeline, getOrthoMatrix, getTotalVertices, getTransformationMatrix, logger, removeObject, removeObjectId } from './internalUtils.js';
 const shader = `
 struct Uniforms {
   modelViewProjectionMatrix : mat4x4<f32>,
@@ -210,6 +210,12 @@ export class Simulation {
     setBackground(color) {
         this.bgColor = color;
     }
+    getScene() {
+        return this.scene;
+    }
+    getSceneObjects() {
+        return this.scene.map((item) => item.getObj());
+    }
     propagateDevice(device) {
         for (let i = 0; i < this.scene.length; i++) {
             const obj = this.scene[i].getObj();
@@ -495,8 +501,11 @@ export class SceneCollection extends SimulationElement3d {
     getScene() {
         return this.scene;
     }
+    getSceneObjects() {
+        return this.scene.map((item) => item.getObj());
+    }
     setSceneObjects(newScene) {
-        this.scene = newScene.map((item) => new SimSceneObjInfo(item));
+        this.scene = toSceneObjInfoMany(newScene);
     }
     setScene(newScene) {
         this.scene = newScene;

package/dist/utils.d.ts

@@ -1,5 +1,6 @@
-import { SplinePoint2d } from './graphics.js';
+import { SimulationElement, SplinePoint2d } from './graphics.js';
 import { FloatArray, Mat4, Shift, Vector2, Vector3, Vector4 } from './types.js';
+import { SimSceneObjInfo } from './internalUtils.js';
 export declare class Color {
     r: number;
     g: number;
@@ -50,6 +51,12 @@ export declare function linearStep(t: number): number;
 export declare function easeInOutExpo(t: number): number;
 export declare function easeInOutQuart(t: number): number;
 export declare function easeInOutQuad(t: number): number;
+export declare function easeInQuad(x: number): number;
+export declare function easeOutQuad(x: number): number;
+export declare function easeInQuart(x: number): number;
+export declare function easeOutQuart(x: number): number;
+export declare function easeInExpo(x: number): number;
+export declare function easeOutExpo(x: number): number;
 export declare function cloneBuf<T extends FloatArray>(buf: T): T;
 export declare function vector4(x?: number, y?: number, z?: number, w?: number): Vector4;
 export declare function vector3(x?: number, y?: number, z?: number): Vector3;
@@ -71,3 +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 interpolateColors(colors: Color[], t: number): Color;

package/dist/utils.js

@@ -1,6 +1,6 @@
 import { mat4, vec2, vec3, vec4 } from 'wgpu-matrix';
 import { SplinePoint2d } from './graphics.js';
-import { bufferGenerator } from './internalUtils.js';
+import { SimSceneObjInfo, bufferGenerator } from './internalUtils.js';
 export class Color {
     r; // 0 - 255
     g; // 0 - 255
@@ -168,6 +168,24 @@ export function easeInOutQuart(t) {
 export function easeInOutQuad(t) {
     return t < 0.5 ? 2 * t * t : 1 - Math.pow(-2 * t + 2, 2) / 2;
 }
+export function easeInQuad(x) {
+    return x * x;
+}
+export function easeOutQuad(x) {
+    return 1 - (1 - x) * (1 - x);
+}
+export function easeInQuart(x) {
+    return x * x * x * x;
+}
+export function easeOutQuart(x) {
+    return 1 - Math.pow(1 - x, 4);
+}
+export function easeInExpo(x) {
+    return x === 0 ? 0 : Math.pow(2, 10 * x - 10);
+}
+export function easeOutExpo(x) {
+    return x === 1 ? 1 : 1 - Math.pow(2, -10 * x);
+}
 export function cloneBuf(buf) {
     return new Float32Array(buf);
 }
@@ -236,3 +254,34 @@ export function distance2d(vector1, vector2) {
 export function distance3d(vector1, vector2) {
     return vec3.distance(vector1, vector2);
 }
+export function toSceneObjInfo(el, id) {
+    return new SimSceneObjInfo(el, id);
+}
+export function toSceneObjInfoMany(el, id) {
+    return el.map((item, index) => toSceneObjInfo(item, id ? id[index] : undefined));
+}
+export function interpolateColors(colors, t) {
+    t = Math.min(1, Math.max(0, t));
+    if (colors.length === 0)
+        return color();
+    if (colors.length === 1)
+        return colors[0];
+    const colorInterval = 1 / colors.length;
+    let index = Math.floor(t / colorInterval);
+    if (index >= colors.length)
+        index = colors.length - 1;
+    const from = index === colors.length - 1 ? colors[index - 1] : colors[index];
+    const to = index === colors.length - 1 ? colors[index] : colors[index + 1];
+    const diff = to.diff(from);
+    const scale = t / (colorInterval * colors.length);
+    diff.r *= scale;
+    diff.g *= scale;
+    diff.b *= scale;
+    diff.a *= scale;
+    const res = from.clone();
+    res.r += diff.r;
+    res.g += diff.g;
+    res.b += diff.b;
+    res.a += diff.a;
+    return res;
+}

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.1",
+  "version": "0.4.3",
   "exports": {
     ".": {
       "import": "./dist/index.js",