Construct grid buffer in sim module as temporary allocation. Remove s…

…tray log.
electronicarts · Aug 12, 2024 · 2547972 · 2547972
1 parent bb62c94
commit 2547972
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/main.js b/src/main.js
@@ -479,7 +479,6 @@ function loadScene(json)
     ui.setUIElementsToDefault();
     if(json.version >= 2)
     {
-        console.log(json.settings);
         ui.setUIElements(json.settings)
     }
 }

diff --git a/src/sim.js b/src/sim.js
@@ -171,6 +171,17 @@ export function update(gpuContext, inputs)
     const shapeBuffer = constructShapeBuffer(gpuContext, inputs);
     const bukkitSystem = constructBukkitSystem(gpuContext, inputs);
 
+    let gridBuffers = [];
+
+    for(let i = 0; i < 3; ++i)
+    {
+        gridBuffers.push(gpuContext.device.createBuffer({
+            label: `gridBuffer${i}`,
+            size: inputs.gridSize[0] * inputs.gridSize[1] * 4 * 4,
+            usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_DST
+        }));
+    } 
+
     const substepCount = time.doTimeRegulation(inputs);
     for(let substepIdx = 0; substepIdx < substepCount; ++substepIdx)
     {
@@ -182,9 +193,9 @@ export function update(gpuContext, inputs)
         {
             simUniformBuffer = constructSimUniformBuffer(gpuContext, inputs, bukkitSystem, iterationIdx);
 
-            const currentGrid = gpuContext.gridBuffers[bufferIdx]
-            const nextGrid = gpuContext.gridBuffers[(bufferIdx + 1)%3]
-            const nextNextGrid = gpuContext.gridBuffers[(bufferIdx + 2)%3]
+            const currentGrid = gridBuffers[bufferIdx]
+            const nextGrid = gridBuffers[(bufferIdx + 1)%3]
+            const nextNextGrid = gridBuffers[(bufferIdx + 2)%3]
             bufferIdx = (bufferIdx + 1) % 3;
 
             gpu.computeDispatch(Shaders.g2p2g, [simUniformBuffer, gpuContext.particleBuffer, currentGrid, nextGrid, nextNextGrid, bukkitSystem.threadData, bukkitSystem.particleData, shapeBuffer, gpuContext.particleFreeIndicesBuffer], bukkitSystem.dispatch)