simulationjsv2 0.2.4 → 0.2.6

package/dist/simulation.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="dist" />
-import { SimulationElement } from './graphics.js';
+import { SimulationElement, SimulationElement3d } from './graphics.js';
 import type { Vector2, Vector3, LerpFunc } from './types.js';
 import { Color } from './utils.js';
+import { BlankGeometry } from './geometry.js';
 export declare class Simulation {
     canvasRef: HTMLCanvasElement | null;
     private bgColor;
@@ -10,6 +11,7 @@ export declare class Simulation {
     private running;
     private frameRateView;
     private camera;
+    private pipelines;
     constructor(idOrCanvasRef: string | HTMLCanvasElement, camera?: Camera | null, showFrameRate?: boolean);
     add(el: SimulationElement<any>): void;
     setCanvasSize(width: number, height: number): void;
@@ -17,17 +19,24 @@ export declare class Simulation {
     stop(): void;
     setBackground(color: Color): void;
     render(device: GPUDevice, ctx: GPUCanvasContext): void;
+    private renderScene;
     fitElement(): void;
     private assertHasCanvas;
 }
-export declare class SceneCollection extends SimulationElement {
+export declare class SceneCollection extends SimulationElement3d {
+    protected geometry: BlankGeometry;
     private name;
     private scene;
     constructor(name: string);
+    setWireframe(_: boolean): void;
     getName(): string;
+    getScene(): SimulationElement<Vector3>[];
     add(el: SimulationElement<any>): void;
     empty(): void;
-    getBuffer(camera: Camera, force: boolean): number[];
+    getSceneBuffer(camera: Camera): number[];
+    getWireframe(camera: Camera): number[];
+    getTriangles(camera: Camera): number[];
+    protected updateMatrix(camera: Camera): void;
 }
 export declare class Camera {
     private pos;

package/dist/simulation.js

@@ -1,10 +1,8 @@
 import { vec3 } from 'wgpu-matrix';
-import { SimulationElement, SimulationElement3d } from './graphics.js';
+import { SimulationElement3d } from './graphics.js';
 import { BUF_LEN } from './constants.js';
-import { Color, applyElementToScene, buildDepthTexture, buildMultisampleTexture, buildProjectionMatrix, getOrthoMatrix, getTransformationMatrix, logger, transitionValues, vector2, vector3 } from './utils.js';
-const vertexSize = 40; // 4 * 10
-const colorOffset = 16; // 4 * 4
-const uvOffset = 32; // 4 * 8
+import { Color, applyElementToScene, buildDepthTexture, buildMultisampleTexture, buildProjectionMatrix, createPipeline, getOrthoMatrix, getTransformationMatrix, logger, transitionValues, vector2, vector3 } from './utils.js';
+import { BlankGeometry } from './geometry.js';
 const shader = `
 struct Uniforms {
   modelViewProjectionMatrix : mat4x4<f32>,
@@ -108,6 +106,7 @@ export class Simulation {
     running = true;
     frameRateView;
     camera;
+    pipelines;
     constructor(idOrCanvasRef, camera = null, showFrameRate = false) {
         if (typeof idOrCanvasRef === 'string') {
             const ref = document.getElementById(idOrCanvasRef);
@@ -136,11 +135,12 @@ export class Simulation {
                 this.setCanvasSize(width, height);
             }
         });
+        this.pipelines = null;
         this.frameRateView = new FrameRateView(showFrameRate);
         this.frameRateView.updateFrameRate(1);
     }
     add(el) {
-        applyElementToScene(this.scene, this.camera, el);
+        applyElementToScene(this.scene, el);
     }
     setCanvasSize(width, height) {
         this.assertHasCanvas();
@@ -187,169 +187,21 @@ export class Simulation {
             format: presentationFormat,
             alphaMode: 'premultiplied'
         });
-        const pipeline2d = device.createRenderPipeline({
-            layout: 'auto',
-            vertex: {
-                module: shaderModule,
-                entryPoint: 'vertex_main_2d',
-                buffers: [
-                    {
-                        arrayStride: vertexSize,
-                        attributes: [
-                            {
-                                // position
-                                shaderLocation: 0,
-                                offset: 0,
-                                format: 'float32x4'
-                            },
-                            {
-                                // color
-                                shaderLocation: 1,
-                                offset: colorOffset,
-                                format: 'float32x4'
-                            },
-                            {
-                                // size
-                                shaderLocation: 2,
-                                offset: uvOffset,
-                                format: 'float32x2'
-                            }
-                        ]
-                    }
-                ]
-            },
-            fragment: {
-                module: shaderModule,
-                entryPoint: 'fragment_main',
-                targets: [
-                    {
-                        format: presentationFormat
-                    }
-                ]
-            },
-            primitive: {
-                topology: 'triangle-list'
-            },
-            multisample: {
-                count: 4
-            },
-            depthStencil: {
-                depthWriteEnabled: true,
-                depthCompare: 'less',
-                format: 'depth24plus'
-            }
-        });
-        const pipeline3d = device.createRenderPipeline({
-            layout: 'auto',
-            vertex: {
-                module: shaderModule,
-                entryPoint: 'vertex_main_3d',
-                buffers: [
-                    {
-                        arrayStride: vertexSize,
-                        attributes: [
-                            {
-                                // position
-                                shaderLocation: 0,
-                                offset: 0,
-                                format: 'float32x4'
-                            },
-                            {
-                                // color
-                                shaderLocation: 1,
-                                offset: colorOffset,
-                                format: 'float32x4'
-                            },
-                            {
-                                // size
-                                shaderLocation: 2,
-                                offset: uvOffset,
-                                format: 'float32x2'
-                            }
-                        ]
-                    }
-                ]
-            },
-            fragment: {
-                module: shaderModule,
-                entryPoint: 'fragment_main',
-                targets: [
-                    {
-                        format: presentationFormat
-                    }
-                ]
-            },
-            primitive: {
-                topology: 'triangle-list'
-            },
-            multisample: {
-                count: 4
-            },
-            depthStencil: {
-                depthWriteEnabled: true,
-                depthCompare: 'less',
-                format: 'depth24plus'
-            }
-        });
-        const wireframePipeline = device.createRenderPipeline({
-            layout: 'auto',
-            vertex: {
-                module: shaderModule,
-                entryPoint: 'vertex_main_3d',
-                buffers: [
-                    {
-                        arrayStride: vertexSize,
-                        attributes: [
-                            {
-                                // position
-                                shaderLocation: 0,
-                                offset: 0,
-                                format: 'float32x4'
-                            },
-                            {
-                                // color
-                                shaderLocation: 1,
-                                offset: colorOffset,
-                                format: 'float32x4'
-                            },
-                            {
-                                // size
-                                shaderLocation: 2,
-                                offset: uvOffset,
-                                format: 'float32x2'
-                            }
-                        ]
-                    }
-                ]
-            },
-            fragment: {
-                module: shaderModule,
-                entryPoint: 'fragment_main',
-                targets: [
-                    {
-                        format: presentationFormat
-                    }
-                ]
-            },
-            primitive: {
-                topology: 'line-strip'
-            },
-            multisample: {
-                count: 4
-            },
-            depthStencil: {
-                depthWriteEnabled: true,
-                depthCompare: 'less',
-                format: 'depth24plus'
-            }
-        });
+        this.pipelines = {
+            triangleList2d: createPipeline(device, shaderModule, presentationFormat, 'vertex_main_2d', 'triangle-list'),
+            triangleStrip2d: createPipeline(device, shaderModule, presentationFormat, 'vertex_main_2d', 'triangle-strip'),
+            lineStrip2d: createPipeline(device, shaderModule, presentationFormat, 'vertex_main_2d', 'line-strip'),
+            triangleList3d: createPipeline(device, shaderModule, presentationFormat, 'vertex_main_3d', 'triangle-list'),
+            triangleStrip3d: createPipeline(device, shaderModule, presentationFormat, 'vertex_main_3d', 'triangle-strip'),
+            lineStrip3d: createPipeline(device, shaderModule, presentationFormat, 'vertex_main_3d', 'line-strip')
+        };
         const uniformBufferSize = 4 * 16 + 4 * 16 + 4 * 2 + 8; // 4x4 matrix + 4x4 matrix + vec2<f32> + 8 bc 144 is cool
         const uniformBuffer = device.createBuffer({
             size: uniformBufferSize,
             usage: GPUBufferUsage.UNIFORM | GPUBufferUsage.COPY_DST
         });
         const uniformBindGroup = device.createBindGroup({
-            layout: pipeline3d.getBindGroupLayout(0),
+            layout: this.pipelines.triangleList3d.getBindGroupLayout(0),
             entries: [
                 {
                     binding: 0,
@@ -433,37 +285,63 @@ export class Simulation {
             screenSize.buffer, screenSize.byteOffset, screenSize.byteLength);
             const commandEncoder = device.createCommandEncoder();
             const passEncoder = commandEncoder.beginRenderPass(renderPassDescriptor);
-            passEncoder.setPipeline(pipeline3d);
+            passEncoder.setPipeline(this.pipelines.triangleList3d);
             passEncoder.setBindGroup(0, uniformBindGroup);
-            for (let i = 0; i < this.scene.length; i++) {
-                const buffer = this.scene[i].getBuffer(this.camera, this.camera.hasUpdated());
-                const vertexF32Array = new Float32Array(buffer);
-                const vertexBuffer = device.createBuffer({
-                    size: vertexF32Array.byteLength,
-                    usage: GPUBufferUsage.VERTEX,
-                    mappedAtCreation: true
-                });
-                new Float32Array(vertexBuffer.getMappedRange()).set(vertexF32Array);
-                vertexBuffer.unmap();
-                const vertexCount = vertexF32Array.length / BUF_LEN;
-                if (this.scene[i] instanceof SimulationElement3d) {
-                    if (this.scene[i].isWireframe()) {
-                        passEncoder.setPipeline(wireframePipeline);
+            this.renderScene(device, passEncoder, this.scene);
+            this.camera.updateConsumed();
+            passEncoder.end();
+            device.queue.submit([commandEncoder.finish()]);
+        };
+        requestAnimationFrame(frame);
+    }
+    renderScene(device, passEncoder, scene) {
+        if (this.pipelines === null)
+            return;
+        for (let i = 0; i < scene.length; i++) {
+            if (scene[i] instanceof SceneCollection) {
+                this.renderScene(device, passEncoder, scene[i].getScene());
+                continue;
+            }
+            const buffer = scene[i].getBuffer(this.camera);
+            const vertexF32Array = new Float32Array(buffer);
+            const vertexBuffer = device.createBuffer({
+                size: vertexF32Array.byteLength,
+                usage: GPUBufferUsage.VERTEX,
+                mappedAtCreation: true
+            });
+            new Float32Array(vertexBuffer.getMappedRange()).set(vertexF32Array);
+            vertexBuffer.unmap();
+            const vertexCount = vertexF32Array.length / BUF_LEN;
+            if (scene[i].isWireframe()) {
+                if (scene[i].is3d) {
+                    passEncoder.setPipeline(this.pipelines.lineStrip3d);
+                }
+                else {
+                    passEncoder.setPipeline(this.pipelines.lineStrip2d);
+                }
+            }
+            else {
+                const type = scene[i].getGeometryType();
+                if (type === 'strip') {
+                    if (scene[i].is3d) {
+                        passEncoder.setPipeline(this.pipelines.triangleStrip3d);
                     }
                     else {
-                        passEncoder.setPipeline(pipeline3d);
+                        passEncoder.setPipeline(this.pipelines.triangleStrip2d);
                     }
                 }
-                else {
-                    passEncoder.setPipeline(pipeline2d);
+                else if (type === 'list') {
+                    if (scene[i].is3d) {
+                        passEncoder.setPipeline(this.pipelines.triangleList3d);
+                    }
+                    else {
+                        passEncoder.setPipeline(this.pipelines.triangleList2d);
+                    }
                 }
-                passEncoder.setVertexBuffer(0, vertexBuffer);
-                passEncoder.draw(vertexCount);
             }
-            passEncoder.end();
-            device.queue.submit([commandEncoder.finish()]);
-        };
-        requestAnimationFrame(frame);
+            passEncoder.setVertexBuffer(0, vertexBuffer);
+            passEncoder.draw(vertexCount);
+        }
     }
     fitElement() {
         this.assertHasCanvas();
@@ -481,27 +359,42 @@ export class Simulation {
         }
     }
 }
-export class SceneCollection extends SimulationElement {
+export class SceneCollection extends SimulationElement3d {
+    geometry;
     name;
     scene;
     constructor(name) {
         super(vector3());
+        this.wireframe = false;
         this.name = name;
         this.scene = [];
+        this.geometry = new BlankGeometry();
     }
+    setWireframe(_) { }
     getName() {
         return this.name;
     }
+    getScene() {
+        return this.scene;
+    }
     add(el) {
-        applyElementToScene(this.scene, this.camera, el);
+        applyElementToScene(this.scene, el);
     }
     empty() {
         this.scene = [];
     }
-    getBuffer(camera, force) {
-        const res = [];
-        this.scene.forEach((item) => res.push(...item.getBuffer(camera, force)));
-        return res;
+    getSceneBuffer(camera) {
+        return this.scene.map((item) => item.getBuffer(camera)).flat();
+    }
+    getWireframe(camera) {
+        return this.getSceneBuffer(camera);
+    }
+    getTriangles(camera) {
+        console.log('here');
+        return this.getSceneBuffer(camera);
+    }
+    updateMatrix(camera) {
+        this.defaultUpdateMatrix(camera);
     }
 }
 export class Camera {

package/dist/types.d.ts

@@ -1,6 +1,70 @@
-import { Color } from './utils.js';
+/// <reference types="dist" />
+import { CubicBezierCurve2d, SplinePoint2d } from './graphics.js';
+import { Color, Vertex } from './utils.js';
 export type Vector4 = Float32Array & [number, number, number, number];
 export type Vector3 = Float32Array & [number, number, number];
 export type Vector2 = Float32Array & [number, number];
+export type Mat4 = Float32Array & [
+    number,
+    number,
+    number,
+    number,
+    number,
+    number,
+    number,
+    number,
+    number,
+    number,
+    number,
+    number,
+    number,
+    number,
+    number,
+    number
+];
 export type LerpFunc = (n: number) => number;
-export type VertexColorMap = Record<0 | 1 | 2 | 3, Color>;
+export type VertexColorMap = Record<number, Color>;
+export type ElementRotation<T extends Vector2 | Vector3> = T extends Vector2 ? number : T;
+export type CubeGeometryParams = {
+    width: number;
+    height: number;
+    depth: number;
+};
+export type SquareGeometryParams = {
+    width: number;
+    height: number;
+    colorMap: VertexColorMap;
+};
+export type CircleGeometryParams = {
+    radius: number;
+    detail: number;
+};
+export type SplineGeometryParams = {
+    points: SplinePoint2d[];
+    curves: CubicBezierCurve2d[];
+    distance: number;
+    detail: number;
+    interpolateStart: number;
+    interpolateLimit: number;
+    thickness: number;
+    color: Color;
+    vertexColors: Color[];
+};
+export type LineGeometryParams<T extends Vector2 | Vector3> = {
+    pos: T;
+    to: T;
+    thickness: number;
+};
+export type Line2dGeometryParams = LineGeometryParams<Vector2>;
+export type Line3dGeometryParams = LineGeometryParams<Vector3>;
+export type PolygonGeometryParams = {
+    points: Vertex[];
+};
+export type PipelineGroup = {
+    triangleList2d: GPURenderPipeline;
+    triangleStrip2d: GPURenderPipeline;
+    lineStrip2d: GPURenderPipeline;
+    triangleList3d: GPURenderPipeline;
+    triangleStrip3d: GPURenderPipeline;
+    lineStrip3d: GPURenderPipeline;
+};

package/dist/utils.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="dist" />
 import { SimulationElement, SplinePoint2d } from './graphics.js';
-import { Vector2, Vector3, Vector4 } from './types.js';
-import { Camera } from './simulation.js';
+import { Mat4, Vector2, Vector3, Vector4 } from './types.js';
 export declare class Color {
     r: number;
     g: number;
@@ -53,7 +52,7 @@ 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 applyElementToScene: (scene: SimulationElement[], camera: Camera | null, el: SimulationElement) => void;
+export declare const applyElementToScene: (scene: SimulationElement[], el: SimulationElement) => void;
 declare class Logger {
     constructor();
     private fmt;
@@ -63,7 +62,7 @@ declare class Logger {
     log_error(msg: string): void;
 }
 export declare const logger: Logger;
-export declare function lossyTriangulate(vertices: Vertex[]): (readonly [Vertex, Vertex, Vertex])[];
+export declare function lossyTriangulate<T>(vertices: T[]): (readonly [T, T, T])[];
 /**
  * @param callback1 - called every frame until the animation is finished
  * @param callback2 - called after animation is finished (called immediately when t = 0)
@@ -78,11 +77,13 @@ export declare function easeInOutExpo(t: number): number;
 export declare function easeInOutQuart(t: number): number;
 export declare function easeInOutQuad(t: number): number;
 export declare function vertexBuffer(x: number, y: number, z: number, color: Color, uv?: Vector2): number[];
-export declare function vec3ToPixelRatio(vec: Vector3): void;
+export declare function vector3ToPixelRatio(vec: Vector3): void;
+export declare function vector2ToPixelRatio(vec: Vector2): void;
 export declare function cloneBuf<T extends Float32Array>(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;
 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;
@@ -98,4 +99,8 @@ export declare function interpolateColors(colors: Color[], t: number): Color;
  * @param t - seconds
  */
 export declare function waitFor(t: number): Promise<unknown>;
+export declare function matrixFromRotation(rotation: Vector3): Mat4;
+export declare function rotateMat4(mat: Mat4, rotation: Vector3): void;
+export declare function createPipeline(device: GPUDevice, module: GPUShaderModule, presentationFormat: GPUTextureFormat, entryPoint: string, topology: GPUPrimitiveTopology): GPURenderPipeline;
+export declare function triangulateWireFrameOrder(len: number): number[];
 export {};

package/dist/utils.js

@@ -1,6 +1,6 @@
 import { mat4, vec2, vec3, vec4 } from 'wgpu-matrix';
 import { SimulationElement, SplinePoint2d } from './graphics.js';
-import { BUF_LEN } from './constants.js';
+import { BUF_LEN, colorOffset, uvOffset, vertexSize } from './constants.js';
 export class Color {
     r; // 0 - 255
     g; // 0 - 255
@@ -141,11 +141,8 @@ export const buildMultisampleTexture = (device, ctx, width, height) => {
         sampleCount: 4
     });
 };
-export const applyElementToScene = (scene, camera, el) => {
-    if (!camera)
-        throw logger.error('Camera is not initialized in element');
+export const applyElementToScene = (scene, el) => {
     if (el instanceof SimulationElement) {
-        el.setCamera(camera);
         scene.push(el);
     }
     else {
@@ -266,8 +263,14 @@ export function easeInOutQuad(t) {
 export function vertexBuffer(x, y, z, color, uv = vector2()) {
     return [x, y, z, 1, ...color.toBuffer(), ...uv];
 }
-export function vec3ToPixelRatio(vec) {
-    vec3.mul(vec, vector3(devicePixelRatio, devicePixelRatio, devicePixelRatio), vec);
+export function vector3ToPixelRatio(vec) {
+    vec[0] *= devicePixelRatio;
+    vec[1] *= devicePixelRatio;
+    vec[2] *= devicePixelRatio;
+}
+export function vector2ToPixelRatio(vec) {
+    vec[0] *= devicePixelRatio;
+    vec[1] *= devicePixelRatio;
 }
 export function cloneBuf(buf) {
     return new Float32Array(buf);
@@ -281,6 +284,9 @@ export function vector3(x = 0, y = 0, z = 0) {
 export function vector2(x = 0, y = 0) {
     return vec2.fromValues(x, y);
 }
+export function matrix4() {
+    return mat4.identity();
+}
 export function vector3FromVector2(vec) {
     return vector3(vec[0], vec[1]);
 }
@@ -353,3 +359,82 @@ export function waitFor(t) {
         setTimeout(resolve, t * 1000);
     });
 }
+export function matrixFromRotation(rotation) {
+    let rotMatrix = mat4.identity();
+    mat4.rotateZ(rotMatrix, rotation[2], rotMatrix);
+    mat4.rotateY(rotMatrix, rotation[1], rotMatrix);
+    mat4.rotateX(rotMatrix, rotation[0], rotMatrix);
+    return rotMatrix;
+}
+export function rotateMat4(mat, rotation) {
+    mat4.rotateZ(mat, rotation[2], mat);
+    mat4.rotateY(mat, rotation[1], mat);
+    mat4.rotateX(mat, rotation[0], mat);
+}
+export function createPipeline(device, module, presentationFormat, entryPoint, topology) {
+    return device.createRenderPipeline({
+        layout: 'auto',
+        vertex: {
+            module,
+            entryPoint,
+            buffers: [
+                {
+                    arrayStride: vertexSize,
+                    attributes: [
+                        {
+                            // position
+                            shaderLocation: 0,
+                            offset: 0,
+                            format: 'float32x4'
+                        },
+                        {
+                            // color
+                            shaderLocation: 1,
+                            offset: colorOffset,
+                            format: 'float32x4'
+                        },
+                        {
+                            // size
+                            shaderLocation: 2,
+                            offset: uvOffset,
+                            format: 'float32x2'
+                        }
+                    ]
+                }
+            ]
+        },
+        fragment: {
+            module,
+            entryPoint: 'fragment_main',
+            targets: [
+                {
+                    format: presentationFormat
+                }
+            ]
+        },
+        primitive: {
+            topology
+        },
+        multisample: {
+            count: 4
+        },
+        depthStencil: {
+            depthWriteEnabled: true,
+            depthCompare: 'less',
+            format: 'depth24plus'
+        }
+    });
+}
+export function triangulateWireFrameOrder(len) {
+    const order = Array(len)
+        .fill(0)
+        .map((_, index) => index);
+    let front = 0;
+    let back = len - 1;
+    while (front < back) {
+        order.push(front, back);
+        front++;
+        back--;
+    }
+    return order;
+}

package/package.json

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