simulationjsv2 0.7.2 → 0.7.3

package/TODO.md

@@ -1,5 +1,7 @@
 # TODO
 
+- [ ] Make materials
+  - [ ] Move shader group to material
 - [ ] Fix transparency
 - [x] Update `updateModelMatrix2d`
 - [x] Trace line element (wireframe strip for tracing paths)

package/dist/graphics.d.ts

@@ -200,6 +200,7 @@ export declare class Instance<T extends AnySimulationElement> extends Simulation
     private matrixBuffer;
     private baseMat;
     private maxInstances;
+    private hasMapped;
     isInstance: boolean;
     constructor(obj: T, numInstances: number);
     setNumInstances(numInstances: number): void;

package/dist/graphics.js

@@ -979,6 +979,7 @@ export class Instance extends SimulationElement3d {
     matrixBuffer;
     baseMat;
     maxInstances;
+    hasMapped;
     isInstance = true;
     constructor(obj, numInstances) {
         super(vector3(), vector3());
@@ -990,6 +991,7 @@ export class Instance extends SimulationElement3d {
         this.instanceMatrix = [];
         this.is3d = obj.is3d;
         this.geometry = new BlankGeometry();
+        this.hasMapped = false;
         this.baseMat = matrix4();
         for (let i = 0; i < numInstances; i++) {
             const clone = cloneBuf(this.baseMat);
@@ -1024,6 +1026,17 @@ export class Instance extends SimulationElement3d {
         if (instance >= this.instanceMatrix.length || instance < 0)
             return;
         this.instanceMatrix[instance] = transformation;
+        const device = globalInfo.getDevice();
+        if (!device)
+            return;
+        if (!this.matrixBuffer) {
+            const minSize = this.maxInstances * mat4ByteLength;
+            const size = Math.max(minSize, this.instanceMatrix.length);
+            this.allocBuffer(size);
+        }
+        const buf = new Float32Array(transformation);
+        device.queue.writeBuffer(this.matrixBuffer, instance * mat4ByteLength, buf.buffer, buf.byteOffset, buf.byteLength);
+        this.matrixBuffer.unmap();
     }
     allocBuffer(size) {
         const device = globalInfo.getDevice();
@@ -1047,6 +1060,7 @@ export class Instance extends SimulationElement3d {
         const buf = new Float32Array(this.instanceMatrix.map((mat) => [...mat]).flat());
         device.queue.writeBuffer(this.matrixBuffer, 0, buf.buffer, buf.byteOffset, buf.byteLength);
         this.matrixBuffer.unmap();
+        this.hasMapped = true;
     }
     getInstances() {
         return this.instanceMatrix;
@@ -1055,7 +1069,9 @@ export class Instance extends SimulationElement3d {
         return this.instanceMatrix.length;
     }
     getMatrixBuffer() {
-        this.mapBuffer();
+        if (!this.hasMapped) {
+            this.mapBuffer();
+        }
         return this.matrixBuffer;
     }
     getVertexCount() {

package/dist/simulation.js

@@ -69,16 +69,21 @@ class FrameRateView {
     fpsBuffer = [];
     maxFpsBufferLength = 8;
     prevAvg = 0;
+    showing;
     constructor(show) {
         this.el = document.createElement('div');
         this.el.classList.add('simjs-frame-rate');
+        this.showing = show;
         const style = document.createElement('style');
         style.innerHTML = simjsFrameRateCss;
-        if (show) {
+        if (this.showing) {
             document.head.appendChild(style);
             document.body.appendChild(this.el);
         }
     }
+    isActive() {
+        return this.showing;
+    }
     updateFrameRate(num) {
         if (this.fpsBuffer.length < this.maxFpsBufferLength) {
             this.fpsBuffer.push(num);
@@ -400,9 +405,7 @@ export class Simulation extends Settings {
         let prev = Date.now() - 10;
         let prevFps = 0;
         const frame = async () => {
-            if (!canvas)
-                return;
-            if (!this.renderInfo)
+            if (!canvas || !this.renderInfo)
                 return;
             requestAnimationFrame(frame);
             if (!this.running)
@@ -411,7 +414,7 @@ export class Simulation extends Settings {
             const diff = Math.max(now - prev, 1);
             prev = now;
             const fps = 1000 / diff;
-            if (fps === prevFps) {
+            if (fps === prevFps && this.frameRateView.isActive()) {
                 this.frameRateView.updateFrameRate(fps);
             }
             prevFps = fps;

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