simulationjsv2 0.1.3 → 0.1.4

package/dist/graphics.d.ts

@@ -49,6 +49,7 @@ export declare class Square extends SimulationElement {
     private height;
     private rotation;
     private vertexColors;
+    private points;
     /**
      * @param vertexColors{Record<number, Color>} - 0 is top left vertex, numbers increase clockwise
      */

package/dist/graphics.js

@@ -180,6 +180,7 @@ export class Square extends SimulationElement {
     height;
     rotation;
     vertexColors;
+    points;
     /**
      * @param vertexColors{Record<number, Color>} - 0 is top left vertex, numbers increase clockwise
      */
@@ -189,6 +190,12 @@ export class Square extends SimulationElement {
         this.height = height * devicePixelRatio;
         this.rotation = rotation || 0;
         this.vertexColors = vertexColors || {};
+        this.points = [
+            vector2(this.width / 2, this.height / 2),
+            vector2(-this.width / 2, this.height / 2),
+            vector2(-this.width / 2, -this.height / 2),
+            vector2(this.width / 2, -this.height / 2)
+        ];
     }
     scaleWidth(amount, t = 0, f) {
         const finalWidth = this.width * amount;
@@ -271,24 +278,20 @@ export class Square extends SimulationElement {
     }
     getBuffer(camera, force) {
         const resBuffer = [];
+        const vertexOrder = [0, 1, 2, 0, 2, 3];
         if (this.vertexCache.shouldUpdate() || force) {
-            const points = [
-                vector2(this.width / 2, this.height / 2),
-                vector2(-this.width / 2, this.height / 2),
-                vector2(-this.width / 2, -this.height / 2),
-                vector2(this.width / 2, -this.height / 2)
-            ].map((vec) => {
-                const mat = mat4.identity();
-                mat4.rotateZ(mat, this.rotation, mat);
-                vec2.transformMat4(vec, mat, vec);
+            const rotationMat = mat4.identity();
+            mat4.rotateZ(rotationMat, this.rotation, rotationMat);
+            const points = this.points.map((vec) => {
+                vec2.transformMat4(vec, rotationMat, vec);
                 const pos = vector2();
                 vec2.clone(this.getPos(), pos);
                 pos[1] = camera.getScreenSize()[1] - pos[1];
-                vec2.add(pos, vector2(this.width / 2, -this.height / 2), pos);
+                pos[0] += this.width / 2;
+                pos[1] -= this.height / 2;
                 vec2.add(vec, pos, vec);
                 return vec;
             });
-            const vertexOrder = [0, 1, 2, 0, 2, 3];
             vertexOrder.forEach((vertex) => {
                 let vertexColor = this.vertexColors[vertex];
                 vertexColor = vertexColor ? vertexColor : this.getColor();

package/dist/simulation.js

@@ -281,7 +281,7 @@ export class Simulation {
         // sub 10 to start with a reasonable gap between starting time and next frame time
         let prev = Date.now() - 10;
         let prevFps = 0;
-        const frame = () => {
+        const frame = async () => {
             if (!this.running || !canvas)
                 return;
             requestAnimationFrame(frame);
@@ -317,11 +317,11 @@ export class Simulation {
             orthoMatrix.buffer, orthoMatrix.byteOffset, orthoMatrix.byteLength);
             device.queue.writeBuffer(uniformBuffer, 4 * 16 + 4 * 16, // 4x4 matrix + 4x4 matrix
             screenSize.buffer, screenSize.byteOffset, screenSize.byteLength);
-            const vertexArray = [];
-            this.scene.forEach((obj) => {
-                const buffer = obj.getBuffer(this.camera, this.camera.hasUpdated());
-                buffer.forEach((vertex) => vertexArray.push(vertex));
-            });
+            let vertexArray = [];
+            for (let i = 0; i < this.scene.length; i++) {
+                const buffer = this.scene[i].getBuffer(this.camera, this.camera.hasUpdated());
+                vertexArray = vertexArray.concat(buffer);
+            }
             this.camera.updateConsumed();
             const vertexF32Array = new Float32Array(vertexArray);
             const vertexBuffer = device.createBuffer({

package/package.json

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