simulationjsv2 0.2.6 → 0.2.8

package/dist/geometry.d.ts

@@ -12,6 +12,8 @@ export declare abstract class Geometry {
     updateMatrix(matrix: Mat4): void;
     getType(): "list" | "strip";
     abstract recompute(): void;
+    getTriangleVertexCount(): number;
+    getWireframeVertexCount(): number;
     protected bufferFromOrder(order: number[], color: Color): number[];
     getWireframeBuffer(color: Color): number[];
     getTriangleBuffer(color: Color): number[];

package/dist/geometry.js

@@ -16,6 +16,12 @@ export class Geometry {
     getType() {
         return this.geometryType;
     }
+    getTriangleVertexCount() {
+        return this.triangleOrder.length;
+    }
+    getWireframeVertexCount() {
+        return this.wireframeOrder.length;
+    }
     bufferFromOrder(order, color) {
         return order
             .map((vertexIndex) => {

package/dist/graphics.d.ts

@@ -25,6 +25,7 @@ export declare abstract class SimulationElement<T extends Vector2 | Vector3 = Ve
     abstract rotate(amount: ElementRotation<T>, t?: number, f?: LerpFunc): Promise<void>;
     abstract rotateTo(rotation: ElementRotation<T>, t?: number, f?: LerpFunc): Promise<void>;
     protected abstract updateMatrix(camera: Camera): void;
+    getVertexCount(): number;
     protected defaultUpdateMatrix(camera: Camera): void;
     getBuffer(camera: Camera): number[];
 }

package/dist/graphics.js

@@ -1,5 +1,5 @@
 import { vec3, mat4, vec2, vec4 } from 'wgpu-matrix';
-import { Vertex, VertexCache, cloneBuf, color, colorFromVector4, vector3ToPixelRatio, vector2, vector3, vertex, Color, transitionValues, logger, vector2FromVector3, matrix4, rotateMat4, vector3FromVector2 } from './utils.js';
+import { Vertex, VertexCache, cloneBuf, color, colorFromVector4, vector3ToPixelRatio, vector2, vector3, vertex, Color, transitionValues, logger, vector2FromVector3, matrix4, rotateMat4, vector3FromVector2, vector2ToPixelRatio } from './utils.js';
 import { CircleGeometry, CubeGeometry, Line2dGeometry, Line3dGeometry, PlaneGeometry, PolygonGeometry, SplineGeometry, SquareGeometry } from './geometry.js';
 export class SimulationElement {
     color;
@@ -46,6 +46,12 @@ export class SimulationElement {
             this.vertexCache.updated();
         }, t, f);
     }
+    getVertexCount() {
+        if (this.isWireframe()) {
+            return this.geometry.getWireframeVertexCount();
+        }
+        return this.geometry.getTriangleVertexCount();
+    }
     defaultUpdateMatrix(camera) {
         const matrix = matrix4();
         if (typeof this.rotation === 'number') {
@@ -219,6 +225,7 @@ export class Square extends SimulationElement2d {
      */
     constructor(pos, width, height, color, rotation, vertexColors) {
         super(pos, rotation, color);
+        vector2ToPixelRatio(this.pos);
         this.width = width * devicePixelRatio;
         this.height = height * devicePixelRatio;
         this.vertexColors = this.cloneColorMap(vertexColors || {});

package/dist/simulation.d.ts

@@ -19,6 +19,7 @@ export declare class Simulation {
     stop(): void;
     setBackground(color: Color): void;
     render(device: GPUDevice, ctx: GPUCanvasContext): void;
+    private getVertexCount;
     private renderScene;
     fitElement(): void;
     private assertHasCanvas;

package/dist/simulation.js

@@ -294,24 +294,33 @@ export class Simulation {
         };
         requestAnimationFrame(frame);
     }
-    renderScene(device, passEncoder, scene) {
+    getVertexCount(scene) {
+        let total = 0;
+        for (let i = 0; i < scene.length; i++) {
+            if (scene[i] instanceof SceneCollection)
+                continue;
+            total += scene[i].getVertexCount();
+        }
+        return total;
+    }
+    async renderScene(device, passEncoder, scene) {
         if (this.pipelines === null)
             return;
+        let totalVertices = this.getVertexCount(scene);
+        const vertexBuffer = device.createBuffer({
+            size: totalVertices * 40,
+            usage: GPUBufferUsage.VERTEX | GPUBufferUsage.COPY_DST
+        });
+        let currentOffset = 0;
         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);
+            const buffer = new Float32Array(scene[i].getBuffer(this.camera));
+            const vertexCount = buffer.length / BUF_LEN;
+            device.queue.writeBuffer(vertexBuffer, currentOffset, buffer);
             vertexBuffer.unmap();
-            const vertexCount = vertexF32Array.length / BUF_LEN;
             if (scene[i].isWireframe()) {
                 if (scene[i].is3d) {
                     passEncoder.setPipeline(this.pipelines.lineStrip3d);
@@ -339,8 +348,9 @@ export class Simulation {
                     }
                 }
             }
-            passEncoder.setVertexBuffer(0, vertexBuffer);
+            passEncoder.setVertexBuffer(0, vertexBuffer, currentOffset, buffer.byteLength);
             passEncoder.draw(vertexCount);
+            currentOffset += buffer.byteLength;
         }
     }
     fitElement() {

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