Update dependencies

s-macke · s-macke · commit 5e3c0c452f4c · 2025-10-04T11:46:47.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,6 @@
 /build/**/*
 /node_modules/**/*
 /backup/**/*
-.idea
+.idea
+
+run_browser.sh
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,12 +2,12 @@
   "name": "webgpu-experiments",
   "version": "0.1.0",
   "dependencies": {
-    "chart.js": "^4.4"
+    "chart.js": "^4.5"
   },
   "devDependencies": {
     "@webgpu/types": "^0.1",
     "copyfiles": "^2.4",
-    "esbuild": "^0.24",
+    "esbuild": "^0.25",
     "typescript": "^5"
   },
   "scripts": {
diff --git a/src/scripts/GPURenderRunner.ts b/src/scripts/GPURenderRunner.ts
@@ -1,9 +1,9 @@
-import {GPURunner, RunnerType} from "./AbstractGPURunner";
+import {GPUAbstractRunner, GPURunner, RunnerType} from "./AbstractGPURunner";
 import {Render} from "./render/render";
 import {Texture} from "./webgpu/texture";
 import {GPU} from "./webgpu/gpu";
 
-export class GPURenderRunner implements GPURunner {
+export class GPURenderRunner implements GPUAbstractRunner {
     runner: GPURunner
     render: Render
 
diff --git a/src/scripts/diffuse/diffuse.ts b/src/scripts/diffuse/diffuse.ts
@@ -258,7 +258,7 @@ export class Diffuse extends GPUAbstractRunner {
         this.previousMouseCoordinatex = GPU.mouseCoordinate.x
         this.previousMouseCoordinatey = GPU.mouseCoordinate.y
 
-        GPU.device.queue.writeBuffer(this.stagingBuffer.buffer, 0, this.stagingData)
+        GPU.device.queue.writeBuffer(this.stagingBuffer.buffer, 0, this.stagingData.buffer)
         let encoder: GPUCommandEncoder = GPU.CreateCommandEncoder()
         {
             let pass: GPUComputePassEncoder = encoder.beginComputePass()
diff --git a/src/scripts/fluid/fluid.ts b/src/scripts/fluid/fluid.ts
@@ -230,6 +230,6 @@ export class Fluid extends GPUAbstractRunner {
             flags[(j * this.width + i)] |= B_r;
         }
 
-        this.flags = await GPU.CreateTextureFromArrayBuffer(this.width, this.height, "r32sint", flags);
+        this.flags = await GPU.CreateTextureFromArrayBuffer(this.width, this.height, "r32sint", flags.buffer);
     }
 }
diff --git a/src/scripts/fluid/poisson/poisson.ts b/src/scripts/fluid/poisson/poisson.ts
@@ -228,8 +228,8 @@ export class Poisson {
                 scalecenter[(j * this.width + i) * 4 + 3] = 0;
             }
 
-        this.scaleedges = await GPU.CreateTextureFromArrayBuffer(this.width, this.height, "rgba8unorm", scaleedges);
-        this.scalecenter = await GPU.CreateTextureFromArrayBuffer(this.width, this.height, "rgba8unorm", scalecenter);
+        this.scaleedges = await GPU.CreateTextureFromArrayBuffer(this.width, this.height, "rgba8unorm", scaleedges.buffer);
+        this.scalecenter = await GPU.CreateTextureFromArrayBuffer(this.width, this.height, "rgba8unorm", scalecenter.buffer);
     }
 
 
diff --git a/src/scripts/fluid/source/source.ts b/src/scripts/fluid/source/source.ts
@@ -108,7 +108,7 @@ export class Source {
         this.stagingData[1] = GPU.mouseCoordinate.y; // set iMouseY
         this.stagingData[2] = GPU.mouseCoordinate.wheel;
         this.stagingData[3] += 1.; // increase iFrame
-        GPU.device.queue.writeBuffer(this.stagingBuffer.buffer, 0, this.stagingData)
+        GPU.device.queue.writeBuffer(this.stagingBuffer.buffer, 0, this.stagingData.buffer)
 
         let encoder: GPUCommandEncoder = GPU.CreateCommandEncoder();
         {
diff --git a/src/scripts/light/light.ts b/src/scripts/light/light.ts
@@ -151,7 +151,7 @@ export class LightPropagation extends GPUAbstractRunner {
         this.stagingData[1] = GPU.mouseCoordinate.y; // set iMouseY
         this.stagingData[2] = GPU.mouseCoordinate.wheel;
         this.stagingData[3] += 1.; // increase iFrame
-        GPU.device.queue.writeBuffer(this.stagingBuffer.buffer, 0, this.stagingData)
+        GPU.device.queue.writeBuffer(this.stagingBuffer.buffer, 0, this.stagingData.buffer)
 
         let encoder: GPUCommandEncoder = GPU.CreateCommandEncoder();
         for(let i = 0; i < 10; i++) {
diff --git a/src/scripts/light2/light.ts b/src/scripts/light2/light.ts
@@ -69,7 +69,7 @@ export class LightPropagation2 extends GPUAbstractRunner {
         this.stagingData[1] = GPU.mouseCoordinate.y; // set iMouseY
         this.stagingData[2] = GPU.mouseCoordinate.wheel;
         this.stagingData[3] += 1.; // increase iFrame
-        GPU.device.queue.writeBuffer(this.stagingBuffer.buffer, 0, this.stagingData)
+        GPU.device.queue.writeBuffer(this.stagingBuffer.buffer, 0, this.stagingData.buffer)
         return this.light.GetCommandBuffer()
     }
 
diff --git a/src/scripts/light_buffer/light.ts b/src/scripts/light_buffer/light.ts
@@ -150,7 +150,7 @@ export class LightPropagationBuffer extends GPUAbstractRunner {
         this.stagingData[1] = GPU.mouseCoordinate.y; // set iMouseY
         this.stagingData[2] = GPU.mouseCoordinate.wheel;
         this.stagingData[3] += 1.; // increase iFrame
-        GPU.device.queue.writeBuffer(this.stagingBuffer.buffer, 0, this.stagingData)
+        GPU.device.queue.writeBuffer(this.stagingBuffer.buffer, 0, this.stagingData.buffer)
 
         let encoder: GPUCommandEncoder = GPU.CreateCommandEncoder();
         for(let i = 0; i < 20; i++) {
diff --git a/src/scripts/light_monte_carlo_path_tracing/light.ts b/src/scripts/light_monte_carlo_path_tracing/light.ts
@@ -66,7 +66,7 @@ export class LightMonteCarloPathTracing extends GPUAbstractRunner {
         this.previousMouseCoordinatey = GPU.mouseCoordinate.y
         this.previousMouseWheel = GPU.mouseCoordinate.wheel
 
-        GPU.device.queue.writeBuffer(this.stagingBuffer.buffer, 0, this.stagingData)
+        GPU.device.queue.writeBuffer(this.stagingBuffer.buffer, 0, this.stagingData.buffer)
         return this.light.GetCommandBuffer()
     }
 
diff --git a/src/scripts/light_monte_carlo_path_tracing/scene/scene.ts b/src/scripts/light_monte_carlo_path_tracing/scene/scene.ts
@@ -63,8 +63,6 @@ export class LightScene {
             ShowError("Creation of SDF failed", e as Error)
             throw e
         }
-        //this.textureSignedDistance = await GPU.createTextureFromTexture(this.sdf.texturea, "rgba16float")
-        //this.textureSignedDistance = this.sdf.texturea
 
         this.bind_group_layout = GPU.device.createBindGroupLayout({
             entries: [{
diff --git a/src/scripts/modules/light/monte_carlo_path_tracing/light.ts b/src/scripts/modules/light/monte_carlo_path_tracing/light.ts
@@ -167,7 +167,7 @@ export class MonteCarloPathTracing extends GPUAbstractRunner {
         this.previousMouseCoordinatey = GPU.mouseCoordinate.y
         this.previousMouseWheel = GPU.mouseCoordinate.wheel
 
-        GPU.device.queue.writeBuffer(this.stagingBuffer.buffer, 0, this.stagingData)
+        GPU.device.queue.writeBuffer(this.stagingBuffer.buffer, 0, this.stagingData.buffer)
 
         let encoder: GPUCommandEncoder = GPU.CreateCommandEncoder();
 
diff --git a/src/scripts/raytrace/raytrace.ts b/src/scripts/raytrace/raytrace.ts
@@ -127,7 +127,7 @@ export class Raytrace extends GPUAbstractRunner {
         this.previousMouseCoordinatex = GPU.mouseCoordinate.x
         this.previousMouseCoordinatey = GPU.mouseCoordinate.y
 
-        GPU.device.queue.writeBuffer(this.stagingBuffer.buffer, 0, this.stagingData)
+        GPU.device.queue.writeBuffer(this.stagingBuffer.buffer, 0, this.stagingData.buffer)
         let encoder: GPUCommandEncoder = GPU.CreateCommandEncoder()
         //let uploadbuffer: GPUBuffer = this.stagingBuffer.updateBufferData(0, this.stagingData, encoder) // TODO: must be destoryed
         {
diff --git a/src/scripts/webgpu/bufferFactory.ts b/src/scripts/webgpu/bufferFactory.ts
@@ -49,7 +49,7 @@ export class BufferFactory {
     }
 
 
-    static createFromArrayBuffer(data: ArrayBuffer) : Buffer {
+    static createFromArrayBuffer(data: ArrayBufferLike) : Buffer {
         console.log("create Buffer from array buffer of size " + data.byteLength);
         let buffer = new Buffer()
         buffer.size = data.byteLength;
diff --git a/src/scripts/webgpu/gpu.ts b/src/scripts/webgpu/gpu.ts
@@ -134,8 +134,7 @@ export class GPU {
 
     static GetWGSLFeatures(): ReadonlySet<string> {
         if (navigator.gpu.wgslLanguageFeatures == null) {
-            const readonly: ReadonlySet<string> = new Set([]);
-            return readonly
+            return new Set([])
         }
         return navigator.gpu.wgslLanguageFeatures
     }
@@ -215,7 +214,7 @@ export class GPU {
         });
     }
 
-    static CreateStorageBufferFromArrayBuffer(data: ArrayBuffer): Buffer {
+    static CreateStorageBufferFromArrayBuffer(data: ArrayBufferLike): Buffer {
         return BufferFactory.createFromArrayBuffer(data)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ export class Diffuse extends GPUAbstractRunner {`
`258`	`258`	`this.previousMouseCoordinatex = GPU.mouseCoordinate.x`
`259`	`259`	`this.previousMouseCoordinatey = GPU.mouseCoordinate.y`
`260`	`260`
`261`		`- GPU.device.queue.writeBuffer(this.stagingBuffer.buffer, 0, this.stagingData)`
	`261`	`+ GPU.device.queue.writeBuffer(this.stagingBuffer.buffer, 0, this.stagingData.buffer)`
`262`	`262`	`let encoder: GPUCommandEncoder = GPU.CreateCommandEncoder()`
`263`	`263`	`{`
`264`	`264`	`let pass: GPUComputePassEncoder = encoder.beginComputePass()`
Original file line number	Diff line number	Diff line change
`@@ -230,6 +230,6 @@ export class Fluid extends GPUAbstractRunner {`
`230`	`230`	`flags[(j * this.width + i)] \|= B_r;`
`231`	`231`	`}`
`232`	`232`
`233`		`- this.flags = await GPU.CreateTextureFromArrayBuffer(this.width, this.height, "r32sint", flags);`
	`233`	`+ this.flags = await GPU.CreateTextureFromArrayBuffer(this.width, this.height, "r32sint", flags.buffer);`
`234`	`234`	`}`
`235`	`235`	`}`
Original file line number	Diff line number	Diff line change
`@@ -228,8 +228,8 @@ export class Poisson {`
`228`	`228`	`scalecenter[(j * this.width + i) * 4 + 3] = 0;`
`229`	`229`	`}`
`230`	`230`
`231`		`- this.scaleedges = await GPU.CreateTextureFromArrayBuffer(this.width, this.height, "rgba8unorm", scaleedges);`
`232`		`- this.scalecenter = await GPU.CreateTextureFromArrayBuffer(this.width, this.height, "rgba8unorm", scalecenter);`
	`231`	`+ this.scaleedges = await GPU.CreateTextureFromArrayBuffer(this.width, this.height, "rgba8unorm", scaleedges.buffer);`
	`232`	`+ this.scalecenter = await GPU.CreateTextureFromArrayBuffer(this.width, this.height, "rgba8unorm", scalecenter.buffer);`
`233`	`233`	`}`
`234`	`234`
`235`	`235`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ export class Source {`
`108`	`108`	`this.stagingData[1] = GPU.mouseCoordinate.y; // set iMouseY`
`109`	`109`	`this.stagingData[2] = GPU.mouseCoordinate.wheel;`
`110`	`110`	`this.stagingData[3] += 1.; // increase iFrame`
`111`		`- GPU.device.queue.writeBuffer(this.stagingBuffer.buffer, 0, this.stagingData)`
	`111`	`+ GPU.device.queue.writeBuffer(this.stagingBuffer.buffer, 0, this.stagingData.buffer)`
`112`	`112`
`113`	`113`	`let encoder: GPUCommandEncoder = GPU.CreateCommandEncoder();`
`114`	`114`	`{`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ export class LightPropagation2 extends GPUAbstractRunner {`
`69`	`69`	`this.stagingData[1] = GPU.mouseCoordinate.y; // set iMouseY`
`70`	`70`	`this.stagingData[2] = GPU.mouseCoordinate.wheel;`
`71`	`71`	`this.stagingData[3] += 1.; // increase iFrame`
`72`		`- GPU.device.queue.writeBuffer(this.stagingBuffer.buffer, 0, this.stagingData)`
	`72`	`+ GPU.device.queue.writeBuffer(this.stagingBuffer.buffer, 0, this.stagingData.buffer)`
`73`	`73`	`return this.light.GetCommandBuffer()`
`74`	`74`	`}`
`75`	`75`