diff --git a/README.md b/README.md index 7c8e633..e4b076d 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ import { EventType, WindowBuilder } from "jsr:@divy/sdl2@0.10"; const window = new WindowBuilder("Hello, Deno!", 640, 480).build(); const canvas = window.canvas(); -for (const event of window.events()) { +for await (const event of window.events()) { if (event.type == EventType.Quit) { break; } else if (event.type == EventType.Draw) { diff --git a/examples/bouncy_rects.ts b/examples/bouncy_rects.ts index 03578a0..d4589bf 100644 --- a/examples/bouncy_rects.ts +++ b/examples/bouncy_rects.ts @@ -112,7 +112,7 @@ async function frame() { } // Fire up the event loop -for (const event of window.events()) { +for await (const event of window.events()) { switch (event.type) { case EventType.Draw: await frame(); diff --git a/examples/font/font.ts b/examples/font/font.ts index 35bb551..420bc1c 100644 --- a/examples/font/font.ts +++ b/examples/font/font.ts @@ -20,7 +20,7 @@ async function frame() { stepFrame(); } -for (const event of window.events()) { +for await (const event of window.events()) { if (event.type == EventType.Quit) Deno.exit(0); else if (event.type == EventType.Draw) frame(); } diff --git a/examples/resizable_window.ts b/examples/resizable_window.ts index 1eeebd9..808d4fd 100644 --- a/examples/resizable_window.ts +++ b/examples/resizable_window.ts @@ -5,7 +5,7 @@ const window = new WindowBuilder("Hello, Deno!", 640, 480).resizable().build(); const canvas = window.canvas(); const fps = FPS(); -for (const event of window.events()) { +for await (const event of window.events()) { fps(); if (event.type == EventType.Quit) { break; diff --git a/examples/sprite/main.ts b/examples/sprite/main.ts index fa7c675..e02dc32 100644 --- a/examples/sprite/main.ts +++ b/examples/sprite/main.ts @@ -118,7 +118,7 @@ function frame() { sleepSync(10); } -for (const event of window.events()) { +for await (const event of window.events()) { switch (event.type) { case EventType.Draw: frame(); diff --git a/examples/stars.ts b/examples/stars.ts index 776a696..f94a55d 100644 --- a/examples/stars.ts +++ b/examples/stars.ts @@ -22,7 +22,7 @@ for (let i = 0; i < star_count; i++) { stars.push(star); } -for (const event of window.events()) { +for await (const event of window.events()) { if (event.type == EventType.Quit) Deno.exit(0); else if (event.type == EventType.Draw) { canvas.setDrawColor(0, 0, 0, 255); diff --git a/examples/texture/texture.ts b/examples/texture/texture.ts index d8e6883..867e5a8 100644 --- a/examples/texture/texture.ts +++ b/examples/texture/texture.ts @@ -1,7 +1,6 @@ import { EventType, PixelFormat, - Rect, TextureAccess, WindowBuilder, } from "../../mod.ts"; @@ -23,7 +22,7 @@ canvas.copy(texture); canvas.present(); event_loop: -for (const event of window.events()) { +for await (const event of window.events()) { switch (event.type) { case EventType.Quit: case EventType.KeyDown: diff --git a/webgpu-examples/boids/boids.ts b/webgpu-examples/boids/boids.ts index cd97018..1947b07 100644 --- a/webgpu-examples/boids/boids.ts +++ b/webgpu-examples/boids/boids.ts @@ -5,9 +5,9 @@ import { Rect, Texture, TextureAccess, + Window, WindowBuilder, } from "../../mod.ts"; -import { FPS } from "../../examples/utils.ts"; class Boids { particleCount: number; @@ -60,7 +60,7 @@ class Boids { format: "rgba8unorm-srgb", usage: GPUTextureUsage.RENDER_ATTACHMENT | GPUTextureUsage.COPY_SRC, }); - const { padded, unpadded } = getRowPadding(this.dimensions.width); + const { padded } = getRowPadding(this.dimensions.width); this.outputBuffer = this.device.createBuffer({ label: "Capture", size: padded * this.dimensions.height, @@ -263,7 +263,7 @@ class Boids { view: view, loadOp: "clear", storeOp: "store", - loadValue: { r: 0.0, g: 0.0, b: 0.0, a: 1.0 }, + clearValue: { r: 0.0, g: 0.0, b: 0.0, a: 1.0 }, }, ], }); @@ -384,10 +384,8 @@ const boids = new Boids({ }, await getDevice()); boids.init(); -const tick = FPS(100); - async function loop() { - const event = boids.window.events().next().value; + const event = (await boids.window.events().next()).value; switch (event.type) { // case EventType.Re: { // const { width, height } = event; @@ -408,6 +406,7 @@ async function loop() { case EventType.Quit: case EventType.KeyDown: Deno.exit(0); + break; default: break; }