simulationjsv2 0.7.3 → 0.8.0

package/dist/utils.d.ts

@@ -1,12 +1,15 @@
-import { SplinePoint2d } from './graphics.js';
+/// <reference types="@webgpu/types" />
+import { SimulationElement3d, SplinePoint2d } from './graphics.js';
 import { AnySimulationElement, FloatArray, Mat4, Vector2, Vector3, Vector4 } from './types.js';
 import { SimSceneObjInfo } from './internalUtils.js';
+import { Shader } from './shaders.js';
 export declare class Color {
     r: number;
     g: number;
     b: number;
     a: number;
     constructor(r?: number, g?: number, b?: number, a?: number);
+    static fromVec4(vec: Vector4): Color;
     clone(): Color;
     toBuffer(): readonly [number, number, number, number];
     toVec4(): Vector4;
@@ -17,6 +20,8 @@ export declare class Color {
         a: number;
     };
     diff(color: Color): Color;
+    isTransparent(): boolean;
+    setValues(color: Color): void;
 }
 export declare class Vertex {
     private pos;
@@ -33,7 +38,6 @@ export declare class Vertex {
     setY(y: number): void;
     setZ(z: number): void;
     clone(): Vertex;
-    toBuffer(defaultColor: Color): number[];
 }
 /**
  * @param onFrame - called every frame until the animation is finished
@@ -64,7 +68,6 @@ export declare function vector2(x?: number, y?: number): Vector2;
 export declare function matrix4(): Mat4;
 export declare function vector3FromVector2(vec: Vector2): Vector3;
 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, uv?: Vector2): Vertex;
@@ -81,4 +84,6 @@ 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 declare function createBindGroup(shader: Shader, bindGroupIndex: number, buffers: GPUBuffer[]): GPUBindGroup;
+export declare function writeUniformWorldMatrix(el: SimulationElement3d): void;
 export {};

package/dist/utils.js

@@ -1,6 +1,9 @@
 import { mat4, vec2, vec3, vec4 } from 'wgpu-matrix';
 import { SplinePoint2d } from './graphics.js';
-import { SimSceneObjInfo, bufferGenerator } from './internalUtils.js';
+import { SimSceneObjInfo } from './internalUtils.js';
+import { globalInfo } from './globals.js';
+import { orthogonalMatrix, worldProjectionMatrix } from './simulation.js';
+import { worldProjMatOffset } from './constants.js';
 export class Color {
     r; // 0 - 255
     g; // 0 - 255
@@ -12,6 +15,9 @@ export class Color {
         this.b = b;
         this.a = a;
     }
+    static fromVec4(vec) {
+        return new Color(vec[0], vec[1], vec[2], vec[3]);
+    }
     clone() {
         return new Color(this.r, this.g, this.b, this.a);
     }
@@ -32,6 +38,15 @@ export class Color {
     diff(color) {
         return new Color(this.r - color.r, this.g - color.g, this.b - color.b, this.a - color.a);
     }
+    isTransparent() {
+        return this.a < 1;
+    }
+    setValues(color) {
+        this.r = color.r;
+        this.g = color.g;
+        this.b = color.b;
+        this.a = color.a;
+    }
 }
 export class Vertex {
     pos;
@@ -39,7 +54,7 @@ export class Vertex {
     uv;
     constructor(x = 0, y = 0, z = 0, color, uv = vector2()) {
         this.pos = vector3(x, y, z);
-        this.color = color || null;
+        this.color = color ?? null;
         this.uv = uv;
     }
     getPos() {
@@ -72,9 +87,6 @@ export class Vertex {
     clone() {
         return new Vertex(this.pos[0], this.pos[1], this.pos[2], this.color?.clone(), cloneBuf(this.uv));
     }
-    toBuffer(defaultColor) {
-        return bufferGenerator.generate(this.pos[0], this.pos[1], this.pos[2], this.color || defaultColor, this.uv);
-    }
 }
 /**
  * @param onFrame - called every frame until the animation is finished
@@ -206,9 +218,6 @@ export function vector3FromVector2(vec) {
 export function vector2FromVector3(vec) {
     return vector2(vec[0], vec[1]);
 }
-export function colorFromVector4(vec) {
-    return new Color(vec[0], vec[1], vec[2], vec[3]);
-}
 export function randomInt(range, min = 0) {
     return Math.floor(Math.random() * (range - min)) + min;
 }
@@ -284,3 +293,22 @@ export function interpolateColors(colors, t) {
     res.a += diff.a;
     return res;
 }
+export function createBindGroup(shader, bindGroupIndex, buffers) {
+    const device = globalInfo.errorGetDevice();
+    const layout = shader.getBindGroupLayouts()[bindGroupIndex];
+    return device.createBindGroup({
+        layout: layout,
+        entries: buffers.map((buffer, index) => ({
+            binding: index,
+            resource: {
+                buffer
+            }
+        }))
+    });
+}
+export function writeUniformWorldMatrix(el) {
+    const device = globalInfo.errorGetDevice();
+    const uniformBuffer = el.getUniformBuffer();
+    const projBuf = el.is3d ? worldProjectionMatrix : orthogonalMatrix;
+    device.queue.writeBuffer(uniformBuffer, worldProjMatOffset, projBuf.buffer, projBuf.byteOffset, projBuf.byteLength);
+}

package/package.json

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