implement random walk for enemies

fixes carts running too slow in chrome

.github/workflows/ci.yml

@@ -44,7 +44,7 @@ jobs:
     - name: Build
       run: cargo build --release --verbose
     - name: Upload artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: uw8-${{ matrix.build }}
         path: target/release/${{ matrix.exe }}

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "uw8"
-version = "0.4.1"
+version = "0.2.2"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -11,21 +11,21 @@ native = ["wasmtime", "uw8-window", "cpal", "rubato" ]
 browser = ["warp", "tokio", "tokio-stream", "webbrowser"]
 
 [dependencies]
-wasmtime = { git = "https://github.com/bytecodealliance/wasmtime.git", rev = "0f48f939b9870036562ca02ff21253547a9f1a5c", optional = true }
+wasmtime = { version = "5.0.0", optional = true }
 anyhow = "1"
-env_logger = "0.11.3"
+env_logger = "0.10"
 log = "0.4"
 uw8-window = { path = "uw8-window", optional = true }
-notify-debouncer-mini = { version = "0.4.1", default-features = false }
+notify-debouncer-mini = { version = "0.2.1", default-features = false }
 pico-args = "0.5"
 curlywas = { git = "https://github.com/exoticorn/curlywas.git", rev = "0e7ea50" }
 wat = "1"
 uw8-tool = { path = "uw8-tool" }
 same-file = "1"
-warp = { version = "0.3.6", optional = true }
+warp = { version = "0.3.3", optional = true }
-tokio = { version = "1.37.0", features = ["sync", "rt"], optional = true }
+tokio = { version = "1.24.0", features = ["sync", "rt"], optional = true }
-tokio-stream = { version = "0.1.15", features = ["sync"], optional = true }
+tokio-stream = { version = "0.1.11", features = ["sync"], optional = true }
-webbrowser = { version = "0.8.13", optional = true }
+webbrowser = { version = "0.8.6", optional = true }
 ansi_term = "0.12.1"
-cpal = { version = "0.15.3", optional = true }
+cpal = { version = "0.14.2", optional = true }
 rubato = { version = "0.12.0", optional = true }

README.md

@@ -15,9 +15,9 @@ See [here](https://exoticorn.github.io/microw8/) for more information and docs.
 
 ## Downloads
 
-* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-linux.tgz)
+* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.2.2/microw8-0.2.2-linux.tgz)
-* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-macos.tgz)
+* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.2.2/microw8-0.2.2-macos.tgz)
-* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-windows.zip)
+* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.2.2/microw8-0.2.2-windows.zip)
 
 The download includes
 

examples/curlywas/scaled_text.cwa

@@ -1,14 +0,0 @@
-include "../include/microw8-api.cwa"
-
-export fn upd() {
-	printString(USER_MEM);
-}
-
-data USER_MEM {
-	// clear screen, switch to graphics text mode, text scale 4
-	i8(12, 5, 30, 4)
-	// text color, position, print two lines
-	i8(15, 86, 31, 8, 80) "Hello," i8(8, 8, 8, 8, 8, 10) "MicroW8!"
-	// print same two lines with different color and slight offset 
-	i8(15, 47, 31, 10, 82) "Hello," i8(8, 8, 8, 8, 8, 10) "MicroW8!" i8(0)
-}

examples/curlywas/sprites.cwa

@@ -4,13 +4,13 @@ const SPRITE = 0x20000;
 
 export fn upd() {
 	cls(0);
-	let t = time() / 2_f;
+	let t = time();
 	let i: i32;
 	loop spriteLoop {
-		let inline x = sin(t * -1.3 + i as f32 * (3.141 / 30_f)) * 180_f + 160_f;
+		let inline x = sin(t * -1.3 + i as f32 / 8_f) * 180_f + 160_f;
-		let inline y = sin(t * 1.7 + i as f32 * (3.141 / 40_f)) * 140_f + 120_f;
+		let inline y = sin(t * 1.7 + i as f32 / 9_f) * 140_f + 120_f;
-		blitSprite(SPRITE, 16, x as i32, y as i32, (i & 3) * 0x200 + 0x100);
+		blitSprite(SPRITE, 16, x as i32, y as i32, 0x100);
-		branch_if (i +:= 1) < 100: spriteLoop;
+		branch_if (i +:= 1) < 200: spriteLoop;
 	}
 }
 

examples/curlywas/tunnel.cwa

@@ -3,14 +3,12 @@ include "../include/microw8-api.cwa"
 export fn upd() {
     let i: i32;
     loop pixels {
-        let inline t = 16!56;
+        let inline t = time() * 63 as f32;
-        let inline x = (i % 320 - 160) as f32;
+        let lazy x = (i % 320 - 160) as f32;
-        let inline y = (i #/ 320 - 120) as f32;
+        let lazy y = (i / 320 - 120) as f32;
-        let inline d = 0xa000 as f32 / sqrt(x * x + y * y);
+        let inline d = 40000 as f32 / sqrt(x * x + y * y);
-        let inline a = atan2(x, y) * 163_f; // (512 / pi)
+        let inline u = atan2(x, y) * (512.0 / 3.141);
-        let inline u = i32.trunc_sat_f32_s(a) + t;
+        let inline c = ((i32.trunc_sat_f32_s(d + t * 2 as f32) ^ i32.trunc_sat_f32_s(u + t)) & 255) >> 4;
-        let inline v = i32.trunc_sat_f32_s(d) + t * 2;
-        let inline c = ((v ^ u) #/ 16) % 16;
         i?FRAMEBUFFER = c;
 
         branch_if (i := i + 1) < 320*240: pixels;

examples/zig/.gitignore

@@ -1,2 +1,2 @@
-/zig-cache/
+zig-cache/
-/zig-out/
+zig-out/

examples/zig/game/build.zig

@@ -5,11 +5,7 @@ pub fn build(b: *std.build.Builder) void {
 
     const lib = b.addSharedLibrary("cart", "main.zig", .unversioned);
     lib.setBuildMode(mode);
-    lib.setTarget(.{
+    lib.setTarget(.{ .cpu_arch = .wasm32, .os_tag = .freestanding, .cpu_features_add = std.Target.wasm.featureSet(&.{.nontrapping_fptoint}) });
-        .cpu_arch = .wasm32,
-        .os_tag = .freestanding,
-        .cpu_features_add = std.Target.wasm.featureSet(&.{ .nontrapping_fptoint })
-    });
     lib.import_memory = true;
     lib.initial_memory = 262144;
     lib.max_memory = 262144;
@@ -18,19 +14,13 @@ pub fn build(b: *std.build.Builder) void {
     lib.install();
 
     if (lib.install_step) |install_step| {
-        const run_filter_exports = b.addSystemCommand(&[_][]const u8{
+        const run_filter_exports = b.addSystemCommand(&[_][]const u8{ "uw8", "filter-exports", "zig-out/lib/cart.wasm", "zig-out/lib/cart-filtered.wasm" });
-            "uw8", "filter-exports", "zig-out/lib/cart.wasm", "zig-out/lib/cart-filtered.wasm"
-        });
         run_filter_exports.step.dependOn(&install_step.step);
 
-        const run_wasm_opt = b.addSystemCommand(&[_][]const u8{
+        const run_wasm_opt = b.addSystemCommand(&[_][]const u8{ "wasm-opt", "--enable-nontrapping-float-to-int", "-Oz", "-o", "zig-out/cart.wasm", "zig-out/lib/cart-filtered.wasm" });
-            "wasm-opt", "-Oz", "-o", "zig-out/cart.wasm", "zig-out/lib/cart-filtered.wasm"
-        });
         run_wasm_opt.step.dependOn(&run_filter_exports.step);
 
-        const run_uw8_pack = b.addSystemCommand(&[_][]const u8{
+        const run_uw8_pack = b.addSystemCommand(&[_][]const u8{ "uw8", "pack", "-l", "5", "zig-out/cart.wasm", "zig-out/cart.uw8" });
-            "uw8", "pack", "-l", "9", "zig-out/cart.wasm", "zig-out/cart.uw8"
-        });
         run_uw8_pack.step.dependOn(&run_wasm_opt.step);
 
         const make_opt = b.step("make_opt", "make size optimized cart");

examples/zig/game/main.zig

@@ -0,0 +1,142 @@
+const uw8 = @import("uw8.zig");
+
+var redBallSprite: [16 * 16]u8 = undefined;
+var greenBallSprite: [16 * 16]u8 = undefined;
+var blueBallSprite: [16 * 16]u8 = undefined;
+var wallSprite: [24 * 24]u8 = undefined;
+
+const SphereConfigStep = struct { size: u8, color: u8 };
+// zig fmt: off
+const redSphereConfig: [4]SphereConfigStep = .{
+    .{ .size = 0, .color = 0x3d },
+    .{ .size = 2, .color = 0x48 },
+    .{ .size = 6, .color = 0x65 },
+    .{ .size = 9, .color = 0x55 }
+};
+const greenSphereConfig: [4]SphereConfigStep = .{
+    .{ .size = 0, .color = 0x7d },
+    .{ .size = 2, .color = 0x88 },
+    .{ .size = 6, .color = 0x96 },
+    .{ .size = 9, .color = 0xa3 }
+};
+const blueSphereConfig: [4]SphereConfigStep = .{
+    .{ .size = 0, .color = 0x2e },
+    .{ .size = 2, .color = 0x19 },
+    .{ .size = 6, .color = 0x17 },
+    .{ .size = 9, .color = 0x24 }
+};
+
+const levelData: [14] *const [19]u8 = .{
+  "xxxxxxxxxxxxxxxxxxx",
+  "x      x   x      x",
+  "x x xx   x   xx x x",
+  "x x  xxx x xxx  x x",
+  "x xx x       x xx x",
+  "x xx   xxxxx   xx x",
+  "x    x       x    x",
+  "x xx xx xxx xx xx x",
+  "x  x xx     xx x  x",
+  "xx x    x x    x xx",
+  "x  xx xxx xxx xx  x",
+  "x xx   x   x   xx x",
+  "x    x   x   x    x",
+  "xxxxxxxxxxxxxxxxxxx",
+};
+// zig fmt: on
+
+export fn start() void {
+    blitSphere(&redBallSprite, &redSphereConfig);
+    blitSphere(&greenBallSprite, &greenSphereConfig);
+    blitSphere(&blueBallSprite, &blueSphereConfig);
+
+    createWallSprite();
+}
+
+fn blitSphere(sprite: [*]u8, config: []const SphereConfigStep) void {
+    for (config) |circle| {
+        uw8.circle(8, 8, 8, circle.color);
+        uw8.circle(5, 6, @intToFloat(f32, circle.size), 0);
+        uw8.grabSprite(sprite, 16, 0, 0, 0x100);
+    }
+}
+
+fn createWallSprite() void {
+    uw8.cls(0xe4);
+    var i: i32 = 0;
+    while (i < 50) : (i += 1) {
+        const x = uw8.randomf() * 16;
+        const y = uw8.randomf() * 16;
+        const radius = uw8.randomf() * 2 + 1;
+        const c = @intCast(u8, (uw8.random() & 3)) + 0x95;
+        var j: i32 = 0;
+        while (j < 9) : (j += 1) {
+            uw8.circle(x + @intToFloat(f32, @rem(j, 3) * 16), y + @intToFloat(f32, @divFloor(j, 3) * 16), radius, c);
+        }
+    }
+    uw8.grabSprite(&wallSprite, 16, 16, 16, 0);
+}
+
+export fn upd() void {
+    uw8.cls(0);
+
+    var y: usize = 0;
+    while (y < levelData.len) : (y += 1) {
+        var x: usize = 0;
+        while (x < levelData[y].len) : (x += 1) {
+            if (levelData[y][x] == 'x') {
+                uw8.blitSprite(&wallSprite, 16, 8 + @intCast(i32, x) * 16, @intCast(i32, y) * 16, 0);
+            }
+        }
+    }
+
+    updateEnemy(&enemies[0], &redBallSprite);
+    updateEnemy(&enemies[1], &greenBallSprite);
+    updateEnemy(&enemies[2], &blueBallSprite);
+}
+
+const EntityState = struct { x: i32, y: i32, dir: u2 };
+var enemies: [3]EntityState = .{
+    .{ .x = 16, .y = 16, .dir = 1 },
+    .{ .x = 16 * 18, .y = 16, .dir = 3 },
+    .{ .x = 16, .y = 16 * 12, .dir = 1 },
+};
+
+fn updateEnemy(enemy: *EntityState, sprite: [*]u8) void {
+    switch (enemy.dir) {
+        0 => enemy.y -= 1,
+        1 => enemy.x += 1,
+        2 => enemy.y += 1,
+        3 => enemy.x -= 1,
+    }
+    if (((enemy.x | enemy.y) & 15) == 0) {
+        const tx = @intCast(usize, enemy.x) / 16;
+        const ty = @intCast(usize, enemy.y) / 16;
+        var dir = enemy.dir;
+        var count: u32 = 0;
+        if (enemy.dir != 2 and levelData[ty - 1][tx] == ' ') {
+            dir = 0;
+            count += 1;
+        }
+        if (enemy.dir != 3 and levelData[ty][tx + 1] == ' ') {
+            count += 1;
+            if (uw8.random() % count == 0) {
+                dir = 1;
+            }
+        }
+        if (enemy.dir != 0 and levelData[ty + 1][tx] == ' ') {
+            count += 1;
+            if (uw8.random() % count == 0) {
+                dir = 2;
+            }
+        }
+        if (enemy.dir != 1 and levelData[ty][tx - 1] == ' ') {
+            count += 1;
+            if (uw8.random() % count == 0) {
+                dir = 3;
+            }
+        }
+        enemy.dir = dir;
+    }
+
+    uw8.blitSprite(sprite, 16, 8 + enemy.x, enemy.y, 0x100);
+}

examples/zig/game/uw8.zig

@@ -0,0 +1,10 @@
+pub extern fn random() u32;
+pub extern fn randomf() f32;
+pub extern fn time() f32;
+pub extern fn cls(color: u8) void;
+pub extern fn circle(x: f32, y: f32, radiu: f32, color: u8) void;
+pub extern fn blitSprite(spriteData: [*]u8, size: u32, x: i32, y: i32, ctrl: u32) void;
+pub extern fn grabSprite(spriteData: [*]u8, size: u32, x: i32, y: i32, ctrl: u32) void;
+pub extern fn printString(str: [*:0]u8) void;
+pub extern fn printInt(value: i32) void;
+pub extern fn printChar(char: u32) void;

examples/zig/tunnel/build.zig

@@ -0,0 +1,31 @@
+const std = @import("std");
+
+pub fn build(b: *std.build.Builder) void {
+    const mode = std.builtin.Mode.ReleaseSmall;
+
+    const lib = b.addSharedLibrary("cart", "main.zig", .unversioned);
+    lib.setBuildMode(mode);
+    lib.setTarget(.{ .cpu_arch = .wasm32, .os_tag = .freestanding, .cpu_features_add = std.Target.wasm.featureSet(&.{.nontrapping_fptoint}) });
+    lib.import_memory = true;
+    lib.initial_memory = 262144;
+    lib.max_memory = 262144;
+    lib.global_base = 81920;
+    lib.stack_size = 8192;
+    lib.install();
+
+    if (lib.install_step) |install_step| {
+        const run_filter_exports = b.addSystemCommand(&[_][]const u8{ "uw8", "filter-exports", "zig-out/lib/cart.wasm", "zig-out/lib/cart-filtered.wasm" });
+        run_filter_exports.step.dependOn(&install_step.step);
+
+        const run_wasm_opt = b.addSystemCommand(&[_][]const u8{ "wasm-opt", "--enable-nontrapping-float-to-int", "-Oz", "-o", "zig-out/cart.wasm", "zig-out/lib/cart-filtered.wasm" });
+        run_wasm_opt.step.dependOn(&run_filter_exports.step);
+
+        const run_uw8_pack = b.addSystemCommand(&[_][]const u8{ "uw8", "pack", "-l", "9", "zig-out/cart.wasm", "zig-out/cart.uw8" });
+        run_uw8_pack.step.dependOn(&run_wasm_opt.step);
+
+        const make_opt = b.step("make_opt", "make size optimized cart");
+        make_opt.dependOn(&run_uw8_pack.step);
+
+        b.default_step = make_opt;
+    }
+}

examples/zig/tunnel/main.zig

@@ -13,8 +13,10 @@ export fn upd() void {
         var u = atan2(x, y) * 512.0 / 3.141;
         var c = @intCast(u8, (@floatToInt(i32, d + t * 2.0) ^ @floatToInt(i32, u + t)) & 255) >> 4;
 
-        FRAMEBUFFER[@as(usize, i)] = c;
+        FRAMEBUFFER[i] = c;
         i += 1;
-        if(i >= 320*240) { break; }
+        if (i >= 320 * 240) {
+            break;
+        }
     }
 }

platform/Cargo.lock

@@ -19,54 +19,47 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.11"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
- "cfg-if",
+ "getrandom",
  "once_cell",
  "version_check",
- "zerocopy",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.81"
+version = "1.0.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
+checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3"
 
 [[package]]
 name = "ariadne"
-version = "0.1.5"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1cb2a2046bea8ce5e875551f5772024882de0b540c7f93dfc5d6cf1ca8b030c"
+checksum = "7080ae01b2f0c312065d4914cd0f0de045eb8832e9415b355106a6cff3073cb4"
 dependencies = [
  "yansi",
 ]
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
-
-[[package]]
-name = "bitflags"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "bytemuck"
-version = "1.15.0"
+version = "1.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
+checksum = "439989e6b8c38d1b6570a384ef1e49c8848128f5a97f3914baef02920842712f"
 
 [[package]]
 name = "cc"
-version = "1.0.92"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41"
+checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
 
 [[package]]
 name = "cdivsufsort"
@@ -95,47 +88,54 @@ dependencies = [
 
 [[package]]
 name = "const-random"
-version = "0.1.18"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
+checksum = "f590d95d011aa80b063ffe3253422ed5aa462af4e9867d43ce8337562bac77c4"
 dependencies = [
  "const-random-macro",
+ "proc-macro-hack",
 ]
 
 [[package]]
 name = "const-random-macro"
-version = "0.1.16"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
+checksum = "615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40"
 dependencies = [
  "getrandom",
- "once_cell",
+ "lazy_static",
+ "proc-macro-hack",
  "tiny-keccak",
 ]
 
 [[package]]
 name = "crc32fast"
-version = "1.4.0"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.12"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
+checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
 dependencies = [
+ "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.19"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
+dependencies = [
+ "cfg-if",
+ "lazy_static",
+]
 
 [[package]]
 name = "crunchy"
@@ -156,80 +156,54 @@ dependencies = [
  "wasmparser 0.83.0",
 ]
 
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "fallible-iterator"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
-
 [[package]]
 name = "fallible_collections"
-version = "0.4.9"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a88c69768c0a15262df21899142bc6df9b9b823546d4b4b9a7bc2d6c448ec6fd"
+checksum = "3f57ccc32870366ae684be48b32a1a2e196f98a42a9b4361fe77e13fd4a34755"
 dependencies = [
- "hashbrown 0.13.2",
+ "hashbrown",
 ]
 
 [[package]]
 name = "flate2"
-version = "1.0.28"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
 ]
 
 [[package]]
-name = "getrandom"
+name = "form_urlencoded"
-version = "0.2.14"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
+checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
 dependencies = [
  "cfg-if",
  "libc",
  "wasi",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
-dependencies = [
- "fallible-iterator",
- "indexmap 1.9.3",
- "stable_deref_trait",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "hashbrown"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
 dependencies = [
- "ahash 0.8.11",
+ "ahash 0.7.6",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.14.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
-
 [[package]]
 name = "heck"
 version = "0.3.3"
@@ -246,25 +220,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005"
 
 [[package]]
-name = "indexmap"
+name = "idna"
-version = "1.9.3"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
 dependencies = [
- "autocfg",
+ "unicode-bidi",
- "hashbrown 0.12.3",
+ "unicode-normalization",
 ]
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "1.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
 dependencies = [
- "equivalent",
+ "autocfg",
- "hashbrown 0.14.3",
+ "hashbrown",
 ]
 
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
 [[package]]
 name = "leb128"
 version = "0.2.5"
@@ -279,15 +259,15 @@ checksum = "478ee9e62aaeaf5b140bd4138753d1f109765488581444218d3ddda43234f3e8"
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
 
 [[package]]
 name = "lodepng"
-version = "3.10.1"
+version = "3.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a42d298694b14401847de29abd44adf278b42e989e516deac7b72018400002d8"
+checksum = "f0ad39f75bbaa4b10bb6f2316543632a8046a5bcf9c785488d79720b21f044f8"
 dependencies = [
  "crc32fast",
  "fallible_collections",
@@ -298,45 +278,55 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
+dependencies = [
+ "cfg-if",
+]
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.2"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
 dependencies = [
  "adler",
 ]
 
 [[package]]
 name = "num-traits"
-version = "0.2.18"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
 
 [[package]]
 name = "pbr"
-version = "1.1.1"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed5827dfa0d69b6c92493d6c38e633bbaa5937c153d0d7c28bf12313f8c6d514"
+checksum = "ff5751d87f7c00ae6403eb1fcbba229b9c76c9a30de8c1cf87182177b168cea2"
 dependencies = [
  "crossbeam-channel",
  "libc",
+ "time",
  "winapi",
 ]
 
+[[package]]
+name = "percent-encoding"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+
 [[package]]
 name = "pico-args"
 version = "0.4.2"
@@ -360,28 +350,34 @@ dependencies = [
 ]
 
 [[package]]
-name = "proc-macro2"
+name = "proc-macro-hack"
-version = "1.0.79"
+version = "0.5.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
 dependencies = [
- "unicode-ident",
+ "unicode-xid",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "rgb"
-version = "0.8.37"
+version = "0.8.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8"
+checksum = "3603b7d71ca82644f79b5a06d1220e9a58ede60bd32255f698cb1af8838b8db3"
 dependencies = [
  "bytemuck",
 ]
@@ -395,58 +391,45 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "semver"
-version = "1.0.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
 dependencies = [
  "proc-macro2",
  "quote",
- "unicode-ident",
+ "unicode-xid",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.58"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
+checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.58"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
+checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn",
+]
+
+[[package]]
+name = "time"
+version = "0.1.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
+dependencies = [
+ "libc",
+ "winapi",
 ]
 
 [[package]]
@@ -459,16 +442,46 @@ dependencies = [
 ]
 
 [[package]]
-name = "unicode-ident"
+name = "tinyvec"
-version = "1.0.12"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+dependencies = [
+ "tinyvec",
+]
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
 
 [[package]]
 name = "upkr"
@@ -481,6 +494,17 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "url"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
 [[package]]
 name = "uw8-tool"
 version = "0.1.0"
@@ -490,30 +514,28 @@ dependencies = [
  "pico-args 0.5.0",
  "upkr",
  "walrus",
- "wasm-encoder 0.201.0",
+ "wasm-encoder 0.22.0",
- "wasmparser 0.201.0",
+ "wasmparser 0.99.0",
 ]
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
 
 [[package]]
 name = "walrus"
-version = "0.20.3"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c03529cd0c4400a2449f640d2f27cd1b48c3065226d15e26d98e4429ab0adb7"
+checksum = "4eb08e48cde54c05f363d984bb54ce374f49e242def9468d2e1b6c2372d291f8"
 dependencies = [
  "anyhow",
- "gimli",
  "id-arena",
  "leb128",
  "log",
  "walrus-macro",
- "wasm-encoder 0.29.0",
+ "wasmparser 0.77.0",
- "wasmparser 0.80.2",
 ]
 
 [[package]]
@@ -525,14 +547,14 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.10.2+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
 [[package]]
 name = "wasm-encoder"
@@ -545,27 +567,18 @@ dependencies = [
 
 [[package]]
 name = "wasm-encoder"
-version = "0.29.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881"
+checksum = "ef126be0e14bdf355ac1a8b41afc89195289e5c7179f80118e3abddb472f0810"
-dependencies = [
- "leb128",
-]
-
-[[package]]
-name = "wasm-encoder"
-version = "0.201.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9c7d2731df60006819b013f64ccc2019691deccf6e11a1804bc850cd6748f1a"
 dependencies = [
  "leb128",
 ]
 
 [[package]]
 name = "wasmparser"
-version = "0.80.2"
+version = "0.77.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "449167e2832691a1bff24cde28d2804e90e09586a448c8e76984792c44334a6b"
+checksum = "b35c86d22e720a07d954ebbed772d01180501afe7d03d464f413bb5f8914a8d6"
 
 [[package]]
 name = "wasmparser"
@@ -575,13 +588,12 @@ checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a"
 
 [[package]]
 name = "wasmparser"
-version = "0.201.0"
+version = "0.99.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84e5df6dba6c0d7fafc63a450f1738451ed7a0b52295d83e868218fa286bf708"
+checksum = "9ef3b717afc67f848f412d4f02c127dd3e35a0eecd58c684580414df4fde01d3"
 dependencies = [
- "bitflags",
+ "indexmap",
- "indexmap 2.2.6",
+ "url",
- "semver",
 ]
 
 [[package]]
@@ -608,26 +620,6 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "yansi"
-version = "0.5.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
+checksum = "9fc79f4a1e39857fc00c3f662cbf2651c771f00e9c15fe2abc341806bd46bd71"
-
-[[package]]
-name = "zerocopy"
-version = "0.7.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.58",
-]

platform/src/ges.cwa

@@ -62,6 +62,7 @@ export fn sndGes(t: i32) -> f32 {
             let phase = channelState!GesChannelState.Phase;
 
             let inline pulseWidth = channelReg?1;
+            let phaseShift = (pulseWidth - 128) * 255;
             let invPhaseInc = 1 as f32 / phaseInc as f32;
 
             i = 0;
@@ -130,7 +131,7 @@ export fn sndGes(t: i32) -> f32 {
                 let phaseInc = (freq * (65536.0 / 44100.0)) as i32;
 
                 let phase = channelState!GesChannelState.Phase;
-                if modSrc < ch {
+                if modSrc > ch {
                     phase = phase - (phaseInc << 6);
                 }
 

platform/src/platform.cwa

@@ -62,7 +62,6 @@ export fn cls(col: i32) {
     textCursorX = 0;
     textCursorY = 0;
     outputChannel = 0;
-    textScale = 1;
     memory.fill(120, col, 320*240);
 }
 
@@ -448,7 +447,6 @@ global mut textCursorY = 0;
 global mut textColor = 15;
 global mut bgColor = 0;
 global mut outputChannel = 0;
-global mut textScale = 1;
 
 export fn printChar(char: i32) {
     loop chars {
@@ -460,8 +458,6 @@ export fn printChar(char: i32) {
 global mut controlCodeLength = 0;
 
 fn printSingleChar(char: i32) {
-    let charSize = 8 * textScale;
-
     if outputChannel >= 2 & (char < 4 | char > 6) {
         logChar(char);
         return;
@@ -495,9 +491,9 @@ fn printSingleChar(char: i32) {
     }
 
     if char == 8 {
-        textCursorX = textCursorX - charSize;
+        textCursorX = textCursorX - 8;
         if !outputChannel & textCursorX < 0 {
-            textCursorX = 320-charSize;
+            textCursorX = 320-8;
             printSingleChar(11);
         }
         return;
@@ -507,34 +503,34 @@ fn printSingleChar(char: i32) {
         if !outputChannel & textCursorX >= 320 {
             printChar(0xd0a);
         }
-        textCursorX = textCursorX + charSize;
+        textCursorX = textCursorX + 8;
         return;
     }
 
     if char == 10 {
-        textCursorY = textCursorY + charSize;
+        textCursorY = textCursorY + 8;
         if !outputChannel & textCursorY >= 240 {
-            textCursorY = 240 - charSize;
+            textCursorY = 240 - 8;
             let i: i32;
             loop scroll_copy {
-                i!120 = (i + 320 * charSize)!120;
+                i!120 = i!(120 + 320 * 8);
-                branch_if (i := i + 4) < 320 * (240 - charSize): scroll_copy;
+                branch_if (i := i + 4) < 320 * (240 - 8): scroll_copy;
             }
-            rectangle(0 as f32, (240 - charSize) as f32, 320 as f32, charSize as f32, bgColor);
+            rectangle(0 as f32, (240 - 8) as f32, 320 as f32, 8 as f32, bgColor);
         }
         return;
     }
 
     if char == 11 {
-        textCursorY = textCursorY - charSize;
+        textCursorY = textCursorY - 8;
         if !outputChannel & textCursorY < 0 {
             textCursorY = 0;
-            let i = 320 * (240 - charSize);
+            let i = 320 * (240 - 8);
             loop scroll_copy {
-                (i + 320 * charSize)!116 = i!116;
+                i!(116 + 320 * 8) = i!116;
                 branch_if (i := i - 4): scroll_copy;
             }
-            rectangle(0 as f32, 0 as f32, 320 as f32, charSize as f32, bgColor);
+            rectangle(0 as f32, 0 as f32, 320 as f32, 8 as f32, bgColor);
         }
         return;
     }
@@ -566,12 +562,6 @@ fn printSingleChar(char: i32) {
         return;
     }
 
-    if char == 30 {
-        let scale = 0x12d20?1;
-        textScale = select(scale > 0 & scale <= 16, scale, 1);
-        return;
-    }
-
     if char == 31 {
         textCursorX = 0x12d20?1 * (8 - outputChannel * 6);
         textCursorY = 0x12d20?2 * (8 - outputChannel * 7);
@@ -594,7 +584,7 @@ data(0x12d00) {
     1, 1, 1, 1, // 16-19,
     1, 1, 1, 1, // 20-23,
     1, 1, 1, 1, // 24-27,
-    1, 1, 2, 3 // 28-31
+    1, 1, 1, 3 // 28-31
   )
 }
 
@@ -603,28 +593,26 @@ fn drawChar(char: i32) {
         printChar(0xd0a);
     }
 
-    let charSize = 8 * textScale;
-
     let y: i32;
     loop rows {
-        let bits = (char * 8 + y / textScale)?0x13400;
+        let bits = (char * 8 + y)?0x13400;
         let x = 0;
         if outputChannel {
             loop pixels {
-                if (bits << (x / textScale)) & 128 {
+                if (bits := bits << 1) & 256 {
                     setPixel(textCursorX + x, textCursorY + y, textColor);
                 }
-                branch_if (x := x + 1) < charSize: pixels;
+                branch_if (x := x + 1) < 8: pixels;
             }
         } else {
             loop pixels {
-                setPixel(textCursorX + x, textCursorY + y, select((bits << (x / textScale)) & 128, textColor, bgColor));
+                setPixel(textCursorX + x, textCursorY + y, select((bits := bits << 1) & 256, textColor, bgColor));
-                branch_if (x := x + 1) < charSize: pixels;
+                branch_if (x := x + 1) < 8: pixels;
             }
         }
-        branch_if (y := y + 1) < charSize: rows;
+        branch_if (y := y + 1) < 8: rows;
     }
-    textCursorX = textCursorX + charSize;
+    textCursorX = textCursorX + 8;
 }
 
 export fn printString(ptr: i32) {

site/content/_index.md

@@ -31,19 +31,50 @@ Examplers for older versions:
 
 ## Versions
 
-### v0.4.1
+### v0.2.2
 
-* [Web runtime](../v0.4.1)
+* [Web runtime](v0.2.2)
-* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-linux.tgz)
+* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.2.2/microw8-0.2.2-linux.tgz)
-* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-macos.tgz)
+* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.2.2/microw8-0.2.2-macos.tgz)
-* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-windows.zip)
+* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.2.2/microw8-0.2.2-windows.zip)
 
 Changes:
 
-* Windows: fix bad/inconsistent frame rate
+* call `start` function after loading cart if the cart exports one
-* fix choppy sound on devices with sample rates != 44100 kHz
+* fix `sndGes` having the wrong name and not being included in the auto imports
-* add scale mode 'fill' option
+* fix control codes 4-6 (change text output mode) being invoked when used as parameters in other control sequences
+* only open browser window once a cart was compiled sucessfully when running with `-b`
 
+### v0.2.1
+
+* [Web runtime](v0.2.1)
+* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.2.1/microw8-0.2.1-linux.tgz)
+* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.2.1/microw8-0.2.1-macos.tgz)
+* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.2.1/microw8-0.2.1-windows.zip)
+
+Changes:
+
+* new gpu accelerated renderer with (optional) crt filter
+* optimized `hline` function, a big speed-up when drawing large filled circles or rectangles
+* print fractional size of packed `uw8` cart
+
+### v0.2.0
+
+* [Web runtime](v0.2.0)
+* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.2.0/microw8-0.2.0-linux.tgz)
+* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.2.0/microw8-0.2.0-macos.tgz)
+* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.2.0/microw8-0.2.0-windows.zip)
+
+Changes:
+
+* [add sound support!](docs#sound)
+* add support to redirect text output to the console for debugging using control code 6
+* update curlywas:
+  * add support for `else if`
+  * add support for escape sequences in strings
+  * add support for char literals
+  * add support for binop-assignment, eg. `+=`, `^=`, `<<=` etc. (also support for the tee operator: `+:=`)
+  * "integer constant cast to float" literal syntax in CurlyWas (ex. `1_f` is equivalent to `1 as f32`)
 
 ### Older versions
 

site/content/docs.md

@@ -5,7 +5,7 @@ description = "Docs"
 
 # Overview
 
-MicroW8 loads WebAssembly modules with a maximum size of 256kb. Your module needs to export
+MicroW8 loads WebAssembly modules with a maximum size of 256kb. You module needs to export
 a function `fn upd()` which will be called once per frame.
 After calling `upd` MicroW8 will display the 320x240 8bpp framebuffer located
 at offset 120 in memory with the 32bpp palette located at 0x13000.
@@ -21,7 +21,7 @@ loaded.
 00000-00040: user memory
 00040-00044: time since module start in ms
 00044-0004c: gamepad state
-0004c-00050: number of frames since module start
+0004c-00050: reserved
 00050-00070: sound data (synced to sound thread)
 00070-00078: reserved
 00078-12c78: frame buffer
@@ -238,13 +238,6 @@ When printing characters only the foreground pixels are set, the background is "
 
 Moving/printing past any border does not cause any special operation, the cursor just goes off-screen.
 
-### Text scale
-
-An integer text scale factor in the range 1x-16x can be set with control char 30. An attempt to
-set a scale outside that range will reset the scale to 1x.
-
-After startup and `cls` the scale is initialized to 1x.
-
 ### Control chars
 
 Characters 0-31 are control characters and don't print by default. They take the next 0-2 following characters as parameters.
@@ -269,8 +262,7 @@ Avoid the reserved control chars, they are currently NOPs but their behavior can
 | 15    | color      | Set the text color                         |
 | 16-23 | -          | Reserved                                   |
 | 24    | -          | Swap text/background colors                |
-| 25-29 | -          | Reserved                                   |
+| 25-30 | -          | Reserved                                   |
-| 30    | scale      | Set text scale (1-16)                      |
 | 31    | x, y       | Set cursor position (*)                    |
 
 (*) In graphics mode, the x coordinate is doubled when using control char 31 to be able to cover the whole screen with one byte.
@@ -279,7 +271,7 @@ Avoid the reserved control chars, they are currently NOPs but their behavior can
 
 Control code 6 switches all text output (except codes 4 and 5 to switch output back to the screen) to the console. Where exactly this ends
 up (if at all) is an implementation detail of the runtimes. The native dev-runtime writes the debug output to `stdout`, the web runtime to
-the debug console using `console.log`. Both implementations buffer the output until they encounter a newline character (10) in the output stream.
+the debug console using `console.log`. Both implementation buffer the output until they encounter a newline character (10) in the output stream.
 
 There may be future runtimes that ignore the debug output completely.
 
@@ -468,7 +460,6 @@ when using the native runtime:
 * `--no-gpu`:  Force old cpu-only window code
 * `--filter FILTER`:  Select an upscale filter at startup
 * `--fullscreen`:  Start in fullscreen mode
-* `--scale-fill`:  Scale to fill whole screen, potentially cropping parts of the frame buffer.
 
 Note that the cpu-only window does not support fullscreen nor upscale filters.
 
@@ -485,7 +476,7 @@ The upscale filter options are:
 5, auto_crt (default)   : ss_crt below 960x720, chromatic_crt otherwise
 ```
 
-You can switch the upscale filter at any time using the keys 1-5. You can toggle fullscreen with F. You can toggle between scale modes 'fit' and 'fill' with M.
+You can switch the upscale filter at any time using the keys 1-5. You can toggle fullscreen with F.
 
 ## `uw8 pack`
 
@@ -595,7 +586,7 @@ a base module provided by MicroW8.
 
 You can generate this base module yourself using
 `uw8-tool`. As a quick summary, it provides all function
-types with up to 7 parameters (i32 or f32) where the
+types with up to 5 parameters (i32 or f32) where the
 `f32` parameters always preceed the `i32` parameters.
 Then it includes all imports that MicroW8 provides,
 a function section with a single function of type

site/content/versions.md

@@ -2,77 +2,9 @@
 description = "Versions"
 +++
 
-### v0.4.1
-
-* [Web runtime](../v0.4.1)
-* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-linux.tgz)
-* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-macos.tgz)
-* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-windows.zip)
-
-Changes:
-
-* Windows: fix bad/inconsistent frame rate
-* fix choppy sound on devices with sample rates != 44100 kHz
-* add scale mode 'fill' option
-
-### v0.4.0
-
-* [Web runtime](../v0.4.0)
-* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.4.0/microw8-0.4.0-linux.tgz)
-* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.4.0/microw8-0.4.0-macos.tgz)
-* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.4.0/microw8-0.4.0-windows.zip)
-
-Changes:
-
-* add support for sound on mono- and surround-only devices
-* update wasmtime dependency to fix performance regression in 0.3.0
-* add frame counter since module start at location 72
-* add 6 and 7 parameter function types to base module
-
-### v0.3.0
-
-* [Web runtime](../v0.3.0)
-* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.3.0/microw8-0.3.0-linux.tgz)
-* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.3.0/microw8-0.3.0-macos.tgz)
-* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.3.0/microw8-0.3.0-windows.zip)
-
-Changes:
-
-* add blitSprite and grabSprite API calls
-* add support for integer scaling up to 16x for printing text
-* fix incompatibility with sound devices only offering 16bit audio formats
-* add support for br_table instruction in packed carts
-
-### v0.2.2
-
-* [Web runtime](../v0.2.2)
-* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.2.2/microw8-0.2.2-linux.tgz)
-* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.2.2/microw8-0.2.2-macos.tgz)
-* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.2.2/microw8-0.2.2-windows.zip)
-
-Changes:
-
-* call `start` function after loading cart if the cart exports one
-* fix `sndGes` having the wrong name and not being included in the auto imports
-* fix control codes 4-6 (change text output mode) being invoked when used as parameters in other control sequences
-* only open browser window once a cart was compiled sucessfully when running with `-b`
-
-### v0.2.1
-
-* [Web runtime](../v0.2.1)
-* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.2.1/microw8-0.2.1-linux.tgz)
-* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.2.1/microw8-0.2.1-macos.tgz)
-* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.2.1/microw8-0.2.1-windows.zip)
-
-Changes:
-
-* new gpu accelerated renderer with (optional) crt filter
-* optimized `hline` function, a big speed-up when drawing large filled circles or rectangles
-* print fractional size of packed `uw8` cart
-
 ### v0.2.0
 
-* [Web runtime](../v0.2.0)
+* [Web runtime](v0.2.0)
 * [Linux](https://github.com/exoticorn/microw8/releases/download/v0.2.0/microw8-0.2.0-linux.tgz)
 * [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.2.0/microw8-0.2.0-macos.tgz)
 * [Windows](https://github.com/exoticorn/microw8/releases/download/v0.2.0/microw8-0.2.0-windows.zip)
@@ -90,7 +22,7 @@ Changes:
 
 ### v0.2.0-rc3
 
-* [Web runtime](../v0.2.0-rc3)
+* [Web runtime](v0.2.0-rc3)
 * [Linux](https://github.com/exoticorn/microw8/releases/download/v0.2.0-rc3/microw8-0.2.0-rc3-linux.tgz)
 * [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.2.0-rc3/microw8-0.2.0-rc3-macos.tgz)
 * [Windows](https://github.com/exoticorn/microw8/releases/download/v0.2.0-rc3/microw8-0.2.0-rc3-windows.zip)
@@ -108,7 +40,7 @@ Changes:
 
 ### v0.2.0-rc2
 
-* [Web runtime](../v0.2.0-rc2)
+* [Web runtime](v0.2.0-rc2)
 * [Linux](https://github.com/exoticorn/microw8/releases/download/v0.2.0-rc2/microw8-0.2.0-rc2-linux.tgz)
 * [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.2.0-rc2/microw8-0.2.0-rc2-macos.tgz)
 * [Windows](https://github.com/exoticorn/microw8/releases/download/v0.2.0-rc2/microw8-0.2.0-rc2-windows.zip)
@@ -119,7 +51,7 @@ Changes:
 
 ### v0.2.0-rc1
 
-* [Web runtime](../v0.2.0-rc1)
+* [Web runtime](v0.2.0-rc1)
 * [Linux](https://github.com/exoticorn/microw8/releases/download/v0.2.0-rc1/microw8-0.2.0-rc1-linux.tgz)
 * [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.2.0-rc1/microw8-0.2.0-rc1-macos.tgz)
 * [Windows](https://github.com/exoticorn/microw8/releases/download/v0.2.0-rc1/microw8-0.2.0-rc1-windows.zip)
@@ -135,7 +67,7 @@ Known issues:
 
 ### v0.1.2
 
-* [Web runtime](../v0.1.2)
+* [Web runtime](v0.1.2)
 * [Linux](https://github.com/exoticorn/microw8/releases/download/v0.1.2/microw8-0.1.2-linux.tgz)
 * [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.1.2/microw8-0.1.2-macos.tgz)
 * [Windows](https://github.com/exoticorn/microw8/releases/download/v0.1.2/microw8-0.1.2-windows.zip)
@@ -143,13 +75,13 @@ Known issues:
 Changes:
 
 * add option to `uw8 run` to run the cart in the browser using the web runtime
-*../ CurlyWas: implement `include` support
+* CurlyWas: implement `include` support
 * CurlyWas: implement support for constants
 * fix crash when trying to draw zero sized line
 
 ### v0.1.1
 
-* [Web runtime](../v0.1.1)
+* [Web runtime](v0.1.1)
 * [Linux](https://github.com/exoticorn/microw8/releases/download/v0.1.1/microw8-0.1.1-linux.tgz)
 * [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.1.1/microw8-0.1.1-macos.tgz)
 * [Windows](https://github.com/exoticorn/microw8/releases/download/v0.1.1/microw8-0.1.1-windows.zip)
@@ -158,16 +90,16 @@ Changes:
 
 * implement more robust file watcher
 * add basic video recording on F10 in web runtime
-*../ add screenshot on F9
+* add screenshot on F9
 * add watchdog to interrupt hanging update in native runtime
 * add devkit mode to web runtime
-*../ add unpack and compile commands to uw8
+* add unpack and compile commands to uw8
 * add support for table/element section in pack command
 * disable wayland support (caused missing window decorations in gnome)
 
 ### v0.1.0
 
-* [Web runtime](../v0.1.0)
+* [Web runtime](v0.1.0)
 * [Linux](https://github.com/exoticorn/microw8/releases/download/v0.1.0/microw8-0.1.0-linux.tgz)
 * [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.1.0/microw8-0.1.0-macos.tgz)
 * [Windows](https://github.com/exoticorn/microw8/releases/download/v0.1.0/microw8-0.1.0-windows.zip)

site/templates/index.html

@@ -4,7 +4,7 @@
         <section>
             <h1 class="text-center heading-text">A WebAssembly based fantasy console</h1>
         </section>
-        <a href="v0.4.1">
+        <a href="v0.2.2">
             <img class="demonstration-gif" style="width:640px;height:480px;image-rendering:pixelated" src="img/technotunnel.png"></img>
         </a>
     </div>

src/filewatcher.rs

@@ -16,15 +16,17 @@ pub struct FileWatcher {
 impl FileWatcher {
     pub fn new() -> Result<FileWatcher> {
         let (tx, rx) = mpsc::channel();
-        let debouncer = new_debouncer(Duration::from_millis(100), move |res| match res {
+        let debouncer = new_debouncer(Duration::from_millis(100), None, move |res| match res {
             Ok(events) => {
                 for event in events {
                     let _ = tx.send(event);
                 }
             }
-            Err(err) => {
+            Err(errs) => {
+                for err in errs {
                     eprintln!("Error watching for file changes: {err}");
                 }
+            }
         })?;
         Ok(FileWatcher {
             debouncer,

src/run_native.rs

@@ -2,12 +2,12 @@ use std::sync::{mpsc, Arc, Mutex};
 use std::time::Duration;
 use std::{thread, time::Instant};
 
-use anyhow::{anyhow, bail, Result};
+use anyhow::{anyhow, Result};
 use cpal::traits::*;
 use rubato::Resampler;
 use uw8_window::{Window, WindowConfig};
 use wasmtime::{
-    Engine, Func, GlobalType, Memory, MemoryType, Module, Mutability, Store, TypedFunc, ValType,
+    Engine, GlobalType, Memory, MemoryType, Module, Mutability, Store, TypedFunc, ValType,
 };
 
 pub struct MicroW8 {
@@ -27,7 +27,6 @@ struct UW8Instance {
     end_frame: TypedFunc<(), ()>,
     update: Option<TypedFunc<(), ()>>,
     start_time: Instant,
-    frame_counter: u32,
     watchdog: Arc<Mutex<UW8WatchDog>>,
     sound_tx: Option<mpsc::SyncSender<RegisterUpdate>>,
 }
@@ -91,7 +90,7 @@ impl super::Runtime for MicroW8 {
         let memory = wasmtime::Memory::new(&mut store, MemoryType::new(4, Some(4)))?;
 
         let mut linker = wasmtime::Linker::new(&self.engine);
-        linker.define(&store, "env", "memory", memory)?;
+        linker.define("env", "memory", memory)?;
 
         let loader_instance = linker.instantiate(&mut store, &self.loader_module)?;
         let load_uw8 = loader_instance.get_typed_func::<i32, i32>(&mut store, "load_uw8")?;
@@ -160,7 +159,6 @@ impl super::Runtime for MicroW8 {
             end_frame,
             update,
             start_time: Instant::now(),
-            frame_counter: 0,
             watchdog,
             sound_tx,
         });
@@ -183,21 +181,20 @@ impl super::Runtime for MicroW8 {
         if let Some(mut instance) = self.instance.take() {
             let time = (now - instance.start_time).as_millis() as i32;
             let next_frame = {
-                let offset = ((time as u32 as i64 * 6) % 100 - 50) / 6;
+                let frame = (time as u32 as u64 * 6 / 100) as u32;
-                let max = now + Duration::from_millis(17);
+                let cur_offset = (time as u32).wrapping_sub((frame as u64 * 100 / 6) as u32);
-                let next_center = now + Duration::from_millis((16 - offset) as u64);
+                let next_time =
-                next_center.min(max)
+                    ((frame as u64 + 1) * 100 / 6 + cur_offset.max(1).min(4) as u64) as u32;
+                let offset = next_time.wrapping_sub(time as u32);
+                now + Duration::from_millis(offset as u64)
             };
 
             {
                 let mem = instance.memory.data_mut(&mut instance.store);
                 mem[64..68].copy_from_slice(&time.to_le_bytes());
                 mem[68..72].copy_from_slice(&input.gamepads);
-                mem[72..76].copy_from_slice(&instance.frame_counter.to_le_bytes());
             }
 
-            instance.frame_counter = instance.frame_counter.wrapping_add(1);
-
             instance.store.set_epoch_deadline(self.timeout as u64);
             if let Some(ref update) = instance.update {
                 if let Err(err) = update.call(&mut instance.store, ()) {
@@ -260,12 +257,15 @@ fn add_native_functions(
         }
     })?;
     for i in 0..16 {
-        let global = wasmtime::Global::new(
+        linker.define(
+            "env",
+            &format!("g_reserved{}", i),
+            wasmtime::Global::new(
                 &mut *store,
                 GlobalType::new(ValType::I32, Mutability::Const),
                 0.into(),
+            )?,
         )?;
-        linker.define(&store, "env", &format!("g_reserved{}", i), global)?;
     }
 
     Ok(())
@@ -278,18 +278,14 @@ fn instantiate_platform(
 ) -> Result<wasmtime::Instance> {
     let platform_instance = linker.instantiate(&mut *store, &platform_module)?;
 
-    let exports: Vec<(String, Func)> = platform_instance
+    for export in platform_instance.exports(&mut *store) {
-        .exports(&mut *store)
+        linker.define(
-        .map(|e| {
+            "env",
-            (
+            export.name(),
-                e.name().to_owned(),
+            export
-                e.into_func()
+                .into_func()
                 .expect("platform surely only exports functions"),
-            )
+        )?;
-        })
-        .collect();
-    for (name, func) in exports {
-        linker.define(&store, "env", &name, func)?;
     }
 
     Ok(platform_instance)
@@ -316,7 +312,7 @@ fn init_sound(
     let memory = wasmtime::Memory::new(&mut store, MemoryType::new(4, Some(4)))?;
 
     let mut linker = wasmtime::Linker::new(engine);
-    linker.define(&store, "env", "memory", memory)?;
+    linker.define("env", "memory", memory)?;
     add_native_functions(&mut linker, &mut store)?;
 
     let platform_instance = instantiate_platform(&mut linker, &mut store, platform_module)?;
@@ -333,37 +329,23 @@ fn init_sound(
     let mut configs: Vec<_> = device
         .supported_output_configs()?
         .filter(|config| {
-            config.sample_format() == cpal::SampleFormat::F32
+            config.channels() == 2 && config.sample_format() == cpal::SampleFormat::F32
-                || config.sample_format() == cpal::SampleFormat::I16
         })
         .collect();
-
-    if configs.is_empty() {
-        eprintln!(
-            "No suitable audio output config found on device \"{}\", available configs:",
-            device.name()?
-        );
-        for config in device.supported_output_configs()? {
-            eprintln!("  {}ch {}", config.channels(), config.sample_format());
-        }
-        bail!("Failed to configure audio out");
-    }
-
     configs.sort_by_key(|config| {
         let rate = 44100
             .max(config.min_sample_rate().0)
             .min(config.max_sample_rate().0);
-        let rate_prio = if rate >= 44100 {
+        if rate >= 44100 {
             rate - 44100
         } else {
             (44100 - rate) * 1000
-        };
+        }
-        let format_prio = (config.sample_format() == cpal::SampleFormat::I16) as u32;
-        let channels_prio = (config.channels() != 2) as u32 * 16777216;
-        rate_prio + format_prio + channels_prio
     });
-    let config = configs.into_iter().next().unwrap();
+    let config = configs
-
+        .into_iter()
+        .next()
+        .ok_or_else(|| anyhow!("Could not find float output config"))?;
     let sample_rate = cpal::SampleRate(44100)
         .max(config.min_sample_rate())
         .min(config.max_sample_rate());
@@ -374,8 +356,6 @@ fn init_sound(
             cpal::BufferSize::Fixed(256.max(min).min(max))
         }
     };
-    let sample_format = config.sample_format();
-    let num_channels = config.channels();
     let config = cpal::StreamConfig {
         buffer_size,
         ..config.config()
@@ -408,8 +388,9 @@ fn init_sound(
     let mut sample_index = 0;
     let mut pending_updates: Vec<RegisterUpdate> = Vec::with_capacity(30);
     let mut current_time = 0;
-
+    let stream = device.build_output_stream(
-    let mut callback = move |mut outer_buffer: &mut [f32]| {
+        &config,
+        move |mut outer_buffer: &mut [f32], _| {
             let mut first_update = true;
             while let Ok(update) = rx.try_recv() {
                 if first_update {
@@ -444,14 +425,6 @@ fn init_sound(
                     mem[64..68].copy_from_slice(&current_time.to_le_bytes());
                 }
 
-            fn clamp_sample(s: f32) -> f32 {
-                if s.is_nan() {
-                    0.0
-                } else {
-                    s.max(-1.0).min(1.0)
-                }
-            }
-
                 if let Some(ref mut resampler) = resampler {
                     while !buffer.is_empty() {
                         let copy_size = resampler.output_buffers[0]
@@ -462,12 +435,10 @@ fn init_sound(
                             resampler.input_buffers[0].clear();
                             resampler.input_buffers[1].clear();
                             for _ in 0..resampler.resampler.input_frames_next() {
-                            resampler.input_buffers[0].push(clamp_sample(
+                                resampler.input_buffers[0]
-                                snd.call(&mut store, (sample_index,)).unwrap_or(0.0),
+                                    .push(snd.call(&mut store, (sample_index,)).unwrap_or(0.0));
-                            ));
+                                resampler.input_buffers[1]
-                            resampler.input_buffers[1].push(clamp_sample(
+                                    .push(snd.call(&mut store, (sample_index + 1,)).unwrap_or(0.0));
-                                snd.call(&mut store, (sample_index + 1,)).unwrap_or(0.0),
-                            ));
                                 sample_index = sample_index.wrapping_add(2);
                             }
 
@@ -482,7 +453,8 @@ fn init_sound(
                             resampler.output_index = 0;
                         } else {
                             for i in 0..copy_size {
-                            buffer[i * 2] = resampler.output_buffers[0][resampler.output_index + i];
+                                buffer[i * 2] =
+                                    resampler.output_buffers[0][resampler.output_index + i];
                                 buffer[i * 2 + 1] =
                                     resampler.output_buffers[1][resampler.output_index + i];
                             }
@@ -492,136 +464,20 @@ fn init_sound(
                     }
                 } else {
                     for v in buffer {
-                    *v = clamp_sample(snd.call(&mut store, (sample_index,)).unwrap_or(0.0));
+                        *v = snd.call(&mut store, (sample_index,)).unwrap_or(0.0);
                         sample_index = sample_index.wrapping_add(1);
                     }
                 }
 
                 outer_buffer = &mut outer_buffer[step_size..];
-            current_time = current_time.wrapping_add((step_size * 500 / sample_rate).max(1) as i32);
+                current_time =
+                    current_time.wrapping_add((step_size * 500 / sample_rate).max(1) as i32);
             }
-    };
-
-    fn f32_to_i16<F>(mut buffer: &mut [i16], callback: &mut F)
-    where
-        F: FnMut(&mut [f32]),
-    {
-        let mut float_buffer = [0f32; 256];
-
-        while !buffer.is_empty() {
-            let step_size = buffer.len().min(float_buffer.len());
-            let step_buffer = &mut float_buffer[..step_size];
-            callback(step_buffer);
-            for (dest, src) in buffer.iter_mut().take(step_size).zip(step_buffer.iter()) {
-                *dest = (src.max(-1.0).min(1.0) * 32767.0) as i16;
-            }
-            buffer = &mut buffer[step_size..];
-        }
-    }
-
-    fn stereo_to_mono<F>(mut buffer: &mut [f32], callback: &mut F)
-    where
-        F: FnMut(&mut [f32]),
-    {
-        let mut in_buffer = [0f32; 256];
-
-        while !buffer.is_empty() {
-            let step_size = buffer.len().min(in_buffer.len() / 2);
-            let step_buffer = &mut in_buffer[..step_size * 2];
-            callback(step_buffer);
-            for (index, dest) in buffer.iter_mut().take(step_size).enumerate() {
-                *dest = (step_buffer[index * 2] + step_buffer[index * 2 + 1]) * 0.5;
-            }
-            buffer = &mut buffer[step_size..];
-        }
-    }
-
-    fn stereo_to_surround<F>(mut buffer: &mut [f32], num_channels: usize, callback: &mut F)
-    where
-        F: FnMut(&mut [f32]),
-    {
-        let mut in_buffer = [0f32; 256];
-        buffer.fill(0.);
-
-        while !buffer.is_empty() {
-            let step_size = (buffer.len() / num_channels).min(in_buffer.len() / 2);
-            let step_buffer = &mut in_buffer[..step_size * 2];
-            callback(step_buffer);
-            for index in 0..step_size {
-                buffer[index * num_channels + 0] = step_buffer[index * 2 + 0];
-                buffer[index * num_channels + 1] = step_buffer[index * 2 + 1];
-            }
-            buffer = &mut buffer[step_size * num_channels..];
-        }
-    }
-
-    let stream = if sample_format == cpal::SampleFormat::F32 {
-        if num_channels == 2 {
-            device.build_output_stream(
-                &config,
-                move |buffer: &mut [f32], _| callback(buffer),
-                move |err| {
-                    dbg!(err);
-                },
-                None,
-            )?
-        } else if num_channels == 1 {
-            device.build_output_stream(
-                &config,
-                move |buffer: &mut [f32], _| stereo_to_mono(buffer, &mut callback),
-                move |err| {
-                    dbg!(err);
-                },
-                None,
-            )?
-        } else {
-            device.build_output_stream(
-                &config,
-                move |buffer: &mut [f32], _| {
-                    stereo_to_surround(buffer, num_channels as usize, &mut callback)
         },
         move |err| {
             dbg!(err);
         },
-                None,
+    )?;
-            )?
-        }
-    } else {
-        if num_channels == 2 {
-            device.build_output_stream(
-                &config,
-                move |buffer: &mut [i16], _| f32_to_i16(buffer, &mut callback),
-                move |err| {
-                    dbg!(err);
-                },
-                None,
-            )?
-        } else if num_channels == 1 {
-            device.build_output_stream(
-                &config,
-                move |buffer: &mut [i16], _| {
-                    f32_to_i16(buffer, &mut |b| stereo_to_mono(b, &mut callback))
-                },
-                move |err| {
-                    dbg!(err);
-                },
-                None,
-            )?
-        } else {
-            device.build_output_stream(
-                &config,
-                move |buffer: &mut [i16], _| {
-                    f32_to_i16(buffer, &mut |b| {
-                        stereo_to_surround(b, num_channels as usize, &mut callback)
-                    })
-                },
-                move |err| {
-                    dbg!(err);
-                },
-                None,
-            )?
-        }
-    };
 
     Ok(Uw8Sound { stream, tx })
 }

todo.txt

@@ -1 +0,0 @@
-* add support for 16bit sound (not just float)

uw8-tool/Cargo.lock

@@ -4,27 +4,21 @@ version = 3
 
 [[package]]
 name = "anyhow"
-version = "1.0.81"
+version = "1.0.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
+checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
-
-[[package]]
-name = "bitflags"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "cc"
-version = "1.0.92"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41"
+checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
 
 [[package]]
 name = "cdivsufsort"
@@ -37,41 +31,38 @@ dependencies = [
 ]
 
 [[package]]
-name = "crossbeam-channel"
+name = "cfg-if"
-version = "0.5.12"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
 dependencies = [
+ "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.19"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "fallible-iterator"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
-
-[[package]]
-name = "gimli"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
 dependencies = [
- "fallible-iterator",
+ "cfg-if",
- "indexmap 1.9.3",
+ "lazy_static",
- "stable_deref_trait",
+]
+
+[[package]]
+name = "form_urlencoded"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+dependencies = [
+ "percent-encoding",
 ]
 
 [[package]]
@@ -80,12 +71,6 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
-[[package]]
-name = "hashbrown"
-version = "0.14.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
-
 [[package]]
 name = "heck"
 version = "0.3.3"
@@ -102,25 +87,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005"
 
 [[package]]
-name = "indexmap"
+name = "idna"
-version = "1.9.3"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
 dependencies = [
- "autocfg",
+ "unicode-bidi",
- "hashbrown 0.12.3",
+ "unicode-normalization",
 ]
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "1.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
 dependencies = [
- "equivalent",
+ "autocfg",
- "hashbrown 0.14.3",
+ "hashbrown",
 ]
 
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
 [[package]]
 name = "leb128"
 version = "0.2.5"
@@ -135,36 +126,46 @@ checksum = "478ee9e62aaeaf5b140bd4138753d1f109765488581444218d3ddda43234f3e8"
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.112"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
+dependencies = [
+ "cfg-if",
+]
 
 [[package]]
 name = "num-traits"
-version = "0.2.18"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "pbr"
-version = "1.1.1"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed5827dfa0d69b6c92493d6c38e633bbaa5937c153d0d7c28bf12313f8c6d514"
+checksum = "ff5751d87f7c00ae6403eb1fcbba229b9c76c9a30de8c1cf87182177b168cea2"
 dependencies = [
  "crossbeam-channel",
  "libc",
+ "time",
  "winapi",
 ]
 
+[[package]]
+name = "percent-encoding"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+
 [[package]]
 name = "pico-args"
 version = "0.5.0"
@@ -173,18 +174,18 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.79"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
 dependencies = [
- "unicode-ident",
+ "unicode-xid",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d"
 dependencies = [
  "proc-macro2",
 ]
@@ -198,71 +199,89 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "semver"
-version = "1.0.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "1.0.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+checksum = "ecb2e6da8ee5eb9a61068762a32fa9619cc591ceb055b3687f4cd4051ec2e06b"
 dependencies = [
  "proc-macro2",
  "quote",
- "unicode-ident",
+ "unicode-xid",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.58"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
+checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.58"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
+checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn",
 ]
 
 [[package]]
-name = "unicode-ident"
+name = "time"
-version = "1.0.12"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
+dependencies = [
+ "libc",
+ "wasi",
+ "winapi",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+dependencies = [
+ "tinyvec",
+]
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
 
 [[package]]
 name = "upkr"
@@ -275,6 +294,17 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "url"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
 [[package]]
 name = "uw8-tool"
 version = "0.1.0"
@@ -284,24 +314,22 @@ dependencies = [
  "pico-args",
  "upkr",
  "walrus",
- "wasm-encoder 0.201.0",
+ "wasm-encoder",
- "wasmparser 0.201.0",
+ "wasmparser 0.99.0",
 ]
 
 [[package]]
 name = "walrus"
-version = "0.20.3"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c03529cd0c4400a2449f640d2f27cd1b48c3065226d15e26d98e4429ab0adb7"
+checksum = "4eb08e48cde54c05f363d984bb54ce374f49e242def9468d2e1b6c2372d291f8"
 dependencies = [
  "anyhow",
- "gimli",
  "id-arena",
  "leb128",
  "log",
  "walrus-macro",
- "wasm-encoder 0.29.0",
+ "wasmparser 0.77.0",
- "wasmparser 0.80.2",
 ]
 
 [[package]]
@@ -313,42 +341,38 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
-name = "wasm-encoder"
+name = "wasi"
-version = "0.29.0"
+version = "0.10.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-dependencies = [
- "leb128",
-]
 
 [[package]]
 name = "wasm-encoder"
-version = "0.201.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9c7d2731df60006819b013f64ccc2019691deccf6e11a1804bc850cd6748f1a"
+checksum = "ef126be0e14bdf355ac1a8b41afc89195289e5c7179f80118e3abddb472f0810"
 dependencies = [
  "leb128",
 ]
 
 [[package]]
 name = "wasmparser"
-version = "0.80.2"
+version = "0.77.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "449167e2832691a1bff24cde28d2804e90e09586a448c8e76984792c44334a6b"
+checksum = "b35c86d22e720a07d954ebbed772d01180501afe7d03d464f413bb5f8914a8d6"
 
 [[package]]
 name = "wasmparser"
-version = "0.201.0"
+version = "0.99.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84e5df6dba6c0d7fafc63a450f1738451ed7a0b52295d83e868218fa286bf708"
+checksum = "9ef3b717afc67f848f412d4f02c127dd3e35a0eecd58c684580414df4fde01d3"
 dependencies = [
- "bitflags",
+ "indexmap",
- "indexmap 2.2.6",
+ "url",
- "semver",
 ]
 
 [[package]]

uw8-tool/Cargo.toml

@@ -6,9 +6,9 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-wasmparser = "0.201"
+wasmparser = "0.99"
-wasm-encoder = "0.201"
+wasm-encoder = "0.22"
-walrus = { version = "0.20.3", default-features = false }
+walrus = "0.19"
 anyhow = "1"
 pico-args = "0.5"
 upkr = { git = "https://github.com/exoticorn/upkr.git", rev = "080db40d0088bbee2bdf3c5c75288ac7853d6b7a" }

uw8-tool/src/base_module.rs

@@ -37,7 +37,7 @@ impl BaseModule {
 
         let mut types = vec![];
         let mut type_map = HashMap::new();
-        for num_params in 0..8 {
+        for num_params in 0..6 {
             for num_f32 in 0..=num_params {
                 for &result in &[None, Some(ValType::I32), Some(ValType::F32)] {
                     let mut params = vec![];

uw8-tool/src/filter_exports.rs

@@ -8,7 +8,7 @@ pub fn filter_exports(in_path: &Path, out_path: &Path) -> Result<()> {
         .exports
         .iter()
         .filter_map(|export| match export.name.as_str() {
-            "start" | "upd" | "snd" => None,
+            "upd" | "snd" | "start" => None,
             _ => Some(export.id()),
         })
         .collect();

uw8-tool/src/pack.rs

@@ -490,6 +490,7 @@ impl<'a> ParsedModule<'a> {
                 element_section.active(
                     None,
                     &wasm_encoder::ConstExpr::i32_const(element.start_index as i32),
+                    ValType::FuncRef,
                     wasm_encoder::Elements::Functions(&functions),
                 );
             }
@@ -535,10 +536,9 @@ fn copy_section(module: &mut wasm_encoder::Module, data: &[u8]) -> Result<()> {
 fn read_type_section(reader: TypeSectionReader) -> Result<Vec<base_module::FunctionType>> {
     let mut function_types = vec![];
 
-    for rec_group in reader {
+    for type_def in reader {
-        for sub_type in rec_group?.into_types() {
+        match type_def? {
-            match sub_type.composite_type {
+            wasmparser::Type::Func(fnc) => {
-                wasmparser::CompositeType::Func(fnc) => {
                 if fnc.results().len() > 1 {
                     bail!("Multi-value not supported");
                 }
@@ -546,8 +546,6 @@ fn read_type_section(reader: TypeSectionReader) -> Result<Vec<base_module::Funct
                 let result = to_val_type_vec(fnc.results())?.into_iter().next();
                 function_types.push(FunctionType { params, result });
             }
-                _ => bail!("Only function types are supported"),
-            }
         }
     }
 
@@ -559,8 +557,8 @@ fn validate_table_section(reader: TableSectionReader) -> Result<()> {
         bail!("Only up to one table supported");
     }
 
-    let table = reader.into_iter().next().unwrap()?;
+    let type_ = reader.into_iter().next().unwrap()?;
-    if !table.ty.element_type.is_func_ref() {
+    if type_.element_type != wasmparser::ValType::FuncRef {
         bail!("Only one funcref table is supported");
     }
 
@@ -649,12 +647,9 @@ impl Element {
             wasmparser::ElementItems::Functions(funcs_reader) => {
                 let start_index = if let wasmparser::ElementKind::Active {
                     offset_expr,
-                    table_index,
+                    table_index: 0,
                 } = element.kind
                 {
-                    if table_index.map(|i| i > 0).unwrap_or(false) {
-                        bail!("Only function table with index 0 is supported");
-                    }
                     let mut init_reader = offset_expr.get_operators_reader();
                     if let wasmparser::Operator::I32Const { value: start_index } =
                         init_reader.read()?

uw8-window/Cargo.toml

@@ -6,13 +6,13 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-env_logger = "0.11.3"
+winit = "0.27.5"
-winit = "0.28.6"
+env_logger = "0.10"
 log = "0.4"
 pico-args = "0.5"
-wgpu = "0.17"
+wgpu = "0.15"
-pollster = "0.3.0"
+pollster = "0.2.5"
-bytemuck = { version = "1.15", features = [ "derive" ] }
+bytemuck = { version = "1.13", features = [ "derive" ] }
 anyhow = "1"
-minifb = { version = "0.25.0", default-features = false, features = ["x11"] }
+minifb = { version = "0.23.0", default-features = false, features = ["x11"] }
 winapi = { version = "0.3.9", features = [ "timeapi" ] }

uw8-window/src/gpu/crt.rs

@@ -1,7 +1,7 @@
 use wgpu::util::DeviceExt;
 use winit::dpi::PhysicalSize;
 
-use super::{scale_mode::ScaleMode, Filter};
+use super::Filter;
 
 pub struct CrtFilter {
     uniform_buffer: wgpu::Buffer,
@@ -15,10 +15,9 @@ impl CrtFilter {
         screen: &wgpu::TextureView,
         resolution: PhysicalSize<u32>,
         surface_format: wgpu::TextureFormat,
-        scale_mode: ScaleMode,
     ) -> CrtFilter {
         let uniforms = Uniforms {
-            texture_scale: scale_mode.texture_scale_from_resolution(resolution),
+            texture_scale: texture_scale_from_resolution(resolution),
         };
 
         let uniform_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
@@ -113,9 +112,9 @@ impl CrtFilter {
 }
 
 impl Filter for CrtFilter {
-    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>, scale_mode: ScaleMode) {
+    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>) {
         let uniforms = Uniforms {
-            texture_scale: scale_mode.texture_scale_from_resolution(new_size),
+            texture_scale: texture_scale_from_resolution(new_size),
         };
         queue.write_buffer(&self.uniform_buffer, 0, bytemuck::cast_slice(&[uniforms]));
     }
@@ -127,6 +126,16 @@ impl Filter for CrtFilter {
     }
 }
 
+fn texture_scale_from_resolution(res: PhysicalSize<u32>) -> [f32; 4] {
+    let scale = ((res.width as f32) / 160.0).min((res.height as f32) / 120.0);
+    [
+        res.width as f32 / scale,
+        res.height as f32 / scale,
+        2.0 / scale,
+        0.0,
+    ]
+}
+
 #[repr(C)]
 #[derive(Debug, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
 struct Uniforms {

uw8-window/src/gpu/crt.wgsl

@@ -17,7 +17,7 @@ fn vs_main(
     let i = in_vertex_index / 3u + in_vertex_index % 3u;
     let x = -1.0 + f32(i % 2u) * 322.0;
     let y = -1.0 + f32(i / 2u) * 242.0;
-    out.clip_position = vec4<f32>((vec2<f32>(x, y) - vec2<f32>(160.0, 120.0)) * uniforms.texture_scale.xy, 0.0, 1.0);
+    out.clip_position = vec4<f32>((vec2<f32>(x, y) - vec2<f32>(160.0, 120.0)) / uniforms.texture_scale.xy, 0.0, 1.0);
     out.tex_coords = vec2<f32>(x, y);
     return out;
 }

uw8-window/src/gpu/fast_crt.rs

@@ -1,7 +1,7 @@
 use wgpu::util::DeviceExt;
 use winit::dpi::PhysicalSize;
 
-use super::{scale_mode::ScaleMode, Filter};
+use super::Filter;
 
 pub struct FastCrtFilter {
     uniform_buffer: wgpu::Buffer,
@@ -16,10 +16,9 @@ impl FastCrtFilter {
         resolution: PhysicalSize<u32>,
         surface_format: wgpu::TextureFormat,
         chromatic: bool,
-        scale_mode: ScaleMode,
     ) -> FastCrtFilter {
         let uniforms = Uniforms {
-            texture_scale: scale_mode.texture_scale_from_resolution(resolution),
+            texture_scale: texture_scale_from_resolution(resolution),
         };
 
         let uniform_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
@@ -132,9 +131,9 @@ impl FastCrtFilter {
 }
 
 impl Filter for FastCrtFilter {
-    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>, scale_mode: ScaleMode) {
+    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>) {
         let uniforms = Uniforms {
-            texture_scale: scale_mode.texture_scale_from_resolution(new_size),
+            texture_scale: texture_scale_from_resolution(new_size),
         };
         queue.write_buffer(&self.uniform_buffer, 0, bytemuck::cast_slice(&[uniforms]));
     }
@@ -146,6 +145,16 @@ impl Filter for FastCrtFilter {
     }
 }
 
+fn texture_scale_from_resolution(res: PhysicalSize<u32>) -> [f32; 4] {
+    let scale = ((res.width as f32) / 160.0).min((res.height as f32) / 120.0);
+    [
+        scale / res.width as f32,
+        scale / res.height as f32,
+        2.0 / scale,
+        0.0,
+    ]
+}
+
 #[repr(C)]
 #[derive(Debug, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
 struct Uniforms {

uw8-window/src/gpu/fast_crt.wgsl

@@ -30,8 +30,8 @@ fn row_factor(offset: f32) -> f32 {
 }
 
 fn col_factor(offset: f32) -> f32 {
-    let o = max(0.0, abs(offset) - 0.4);
+    let offset = max(0.0, abs(offset) - 0.4);
-    return 1.0 / (1.0 + o * o * 16.0);
+    return 1.0 / (1.0 + offset * offset * 16.0);
 }
 
 fn sample_screen(tex_coords: vec2<f32>) -> vec4<f32> {

uw8-window/src/gpu/mod.rs

@@ -1,7 +1,6 @@
 use crate::{Input, WindowConfig, WindowImpl};
 use anyhow::{anyhow, Result};
-use scale_mode::ScaleMode;
+use std::{num::NonZeroU32, time::Instant};
-use std::time::Instant;
 
 use winit::{
     dpi::PhysicalSize,
@@ -14,7 +13,6 @@ use winit::platform::run_return::EventLoopExtRunReturn;
 
 mod crt;
 mod fast_crt;
-pub mod scale_mode;
 mod square;
 
 use crt::CrtFilter;
@@ -36,7 +34,6 @@ pub struct Window {
     next_frame: Instant,
     is_fullscreen: bool,
     is_open: bool,
-    scale_mode: ScaleMode,
 }
 
 impl Window {
@@ -44,10 +41,7 @@ impl Window {
         async fn create(window_config: WindowConfig) -> Result<Window> {
             let event_loop = EventLoop::new();
             let window = WindowBuilder::new()
-                .with_inner_size(PhysicalSize::new(
+                .with_inner_size(PhysicalSize::new(640u32, 480))
-                    (320. * window_config.scale).round() as u32,
-                    (240. * window_config.scale).round() as u32,
-                ))
                 .with_min_inner_size(PhysicalSize::new(320u32, 240))
                 .with_title("MicroW8")
                 .with_fullscreen(if window_config.fullscreen {
@@ -78,13 +72,7 @@ impl Window {
 
             let surface_config = wgpu::SurfaceConfiguration {
                 present_mode: wgpu::PresentMode::AutoNoVsync,
-                ..surface
+                ..surface.get_default_config(&adapter, window.inner_size().width, window.inner_size().height).expect("Surface incompatible with adapter")
-                    .get_default_config(
-                        &adapter,
-                        window.inner_size().width,
-                        window.inner_size().height,
-                    )
-                    .expect("Surface incompatible with adapter")
             };
 
             let filter: Box<dyn Filter> = create_filter(
@@ -93,7 +81,6 @@ impl Window {
                 window.inner_size(),
                 surface_config.format,
                 window_config.filter,
-                window_config.scale_mode,
             );
 
             surface.configure(&device, &surface_config);
@@ -113,7 +100,6 @@ impl Window {
                 next_frame: Instant::now(),
                 is_fullscreen: window_config.fullscreen,
                 is_open: true,
-                scale_mode: window_config.scale_mode,
             })
         }
 
@@ -133,7 +119,7 @@ impl WindowImpl for Window {
                         self.surface_config.width = new_size.width;
                         self.surface_config.height = new_size.height;
                         self.surface.configure(&self.device, &self.surface_config);
-                        self.filter.resize(&self.queue, new_size, self.scale_mode);
+                        self.filter.resize(&self.queue, new_size);
                     }
                     WindowEvent::CloseRequested => {
                         self.is_open = false;
@@ -170,20 +156,6 @@ impl WindowImpl for Window {
                                     self.is_fullscreen = fullscreen.is_some();
                                     self.window.set_fullscreen(fullscreen);
                                 }
-                                Some(VirtualKeyCode::M) => {
-                                    self.scale_mode = match self.scale_mode {
-                                        ScaleMode::Fit => ScaleMode::Fill,
-                                        ScaleMode::Fill => ScaleMode::Fit,
-                                    };
-                                    self.filter.resize(
-                                        &self.queue,
-                                        PhysicalSize {
-                                            width: self.surface_config.width,
-                                            height: self.surface_config.height,
-                                        },
-                                        self.scale_mode,
-                                    );
-                                }
                                 Some(VirtualKeyCode::R) => reset = true,
                                 Some(VirtualKeyCode::Key1) => new_filter = Some(1),
                                 Some(VirtualKeyCode::Key2) => new_filter = Some(2),
@@ -217,7 +189,6 @@ impl WindowImpl for Window {
                     self.window.inner_size(),
                     self.surface_config.format,
                     new_filter,
-                    self.scale_mode,
                 );
             }
         });
@@ -280,7 +251,6 @@ fn create_filter(
     window_size: PhysicalSize<u32>,
     surface_format: wgpu::TextureFormat,
     filter: u32,
-    scale_mode: ScaleMode,
 ) -> Box<dyn Filter> {
     match filter {
         1 => Box::new(SquareFilter::new(
@@ -288,7 +258,6 @@ fn create_filter(
             screen_texture,
             window_size,
             surface_format,
-            scale_mode,
         )),
         2 => Box::new(FastCrtFilter::new(
             device,
@@ -296,14 +265,12 @@ fn create_filter(
             window_size,
             surface_format,
             false,
-            scale_mode,
         )),
         3 => Box::new(CrtFilter::new(
             device,
             screen_texture,
             window_size,
             surface_format,
-            scale_mode,
         )),
         4 => Box::new(FastCrtFilter::new(
             device,
@@ -311,20 +278,18 @@ fn create_filter(
             window_size,
             surface_format,
             true,
-            scale_mode,
         )),
         _ => Box::new(AutoCrtFilter::new(
             device,
             screen_texture,
             window_size,
             surface_format,
-            scale_mode,
         )),
     }
 }
 
 trait Filter {
-    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>, scale_mode: ScaleMode);
+    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>);
     fn render<'a>(&'a self, render_pass: &mut wgpu::RenderPass<'a>);
 }
 
@@ -340,11 +305,9 @@ impl AutoCrtFilter {
         screen: &wgpu::TextureView,
         resolution: PhysicalSize<u32>,
         surface_format: wgpu::TextureFormat,
-        scale_mode: ScaleMode,
     ) -> AutoCrtFilter {
-        let small = CrtFilter::new(device, screen, resolution, surface_format, scale_mode);
+        let small = CrtFilter::new(device, screen, resolution, surface_format);
-        let large =
+        let large = FastCrtFilter::new(device, screen, resolution, surface_format, true);
-            FastCrtFilter::new(device, screen, resolution, surface_format, true, scale_mode);
         AutoCrtFilter {
             small,
             large,
@@ -354,9 +317,9 @@ impl AutoCrtFilter {
 }
 
 impl Filter for AutoCrtFilter {
-    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>, scale_mode: ScaleMode) {
+    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>) {
-        self.small.resize(queue, new_size, scale_mode);
+        self.small.resize(queue, new_size);
-        self.large.resize(queue, new_size, scale_mode);
+        self.large.resize(queue, new_size);
         self.resolution = new_size;
     }
 
@@ -391,7 +354,7 @@ impl PaletteScreenMode {
             format: wgpu::TextureFormat::R8Uint,
             usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,
             label: None,
-            view_formats: &[],
+            view_formats: &[]
         });
 
         let palette_texture = device.create_texture(&wgpu::TextureDescriptor {
@@ -406,7 +369,7 @@ impl PaletteScreenMode {
             format: wgpu::TextureFormat::Rgba8UnormSrgb,
             usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,
             label: None,
-            view_formats: &[],
+            view_formats: &[]
         });
 
         let screen_texture = device.create_texture(&wgpu::TextureDescriptor {
@@ -421,7 +384,7 @@ impl PaletteScreenMode {
             format: wgpu::TextureFormat::Rgba8UnormSrgb,
             usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::RENDER_ATTACHMENT,
             label: None,
-            view_formats: &[],
+            view_formats: &[]
         });
 
         let framebuffer_texture_view =
@@ -528,7 +491,7 @@ impl PaletteScreenMode {
             &bytemuck::cast_slice(pixels),
             wgpu::ImageDataLayout {
                 offset: 0,
-                bytes_per_row: Some(320),
+                bytes_per_row: NonZeroU32::new(320),
                 rows_per_image: None,
             },
             wgpu::Extent3d {
@@ -550,7 +513,7 @@ impl PaletteScreenMode {
             &bytemuck::cast_slice(palette),
             wgpu::ImageDataLayout {
                 offset: 0,
-                bytes_per_row: Some(256 * 4),
+                bytes_per_row: NonZeroU32::new(256 * 4),
                 rows_per_image: None,
             },
             wgpu::Extent3d {

uw8-window/src/gpu/scale_mode.rs

@@ -1,28 +0,0 @@
-use winit::dpi::PhysicalSize;
-
-#[derive(Debug, Copy, Clone)]
-pub enum ScaleMode {
-    Fit,
-    Fill,
-}
-
-impl Default for ScaleMode {
-    fn default() -> ScaleMode {
-        ScaleMode::Fit
-    }
-}
-
-impl ScaleMode {
-    pub fn texture_scale_from_resolution(&self, res: PhysicalSize<u32>) -> [f32; 4] {
-        let scale = match self {
-            ScaleMode::Fit => ((res.width as f32) / 160.0).min((res.height as f32) / 120.0),
-            ScaleMode::Fill => ((res.width as f32) / 160.0).max((res.height as f32) / 120.0),
-        };
-        [
-            scale / res.width as f32,
-            scale / res.height as f32,
-            2.0 / scale,
-            0.0,
-        ]
-    }
-}

uw8-window/src/gpu/square.rs

@@ -1,7 +1,7 @@
 use wgpu::util::DeviceExt;
 use winit::dpi::PhysicalSize;
 
-use super::{scale_mode::ScaleMode, Filter};
+use super::Filter;
 
 pub struct SquareFilter {
     uniform_buffer: wgpu::Buffer,
@@ -15,10 +15,9 @@ impl SquareFilter {
         screen: &wgpu::TextureView,
         resolution: PhysicalSize<u32>,
         surface_format: wgpu::TextureFormat,
-        scale_mode: ScaleMode,
     ) -> SquareFilter {
         let uniforms = Uniforms {
-            texture_scale: scale_mode.texture_scale_from_resolution(resolution),
+            texture_scale: texture_scale_from_resolution(resolution),
         };
 
         let uniform_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
@@ -127,9 +126,9 @@ impl SquareFilter {
 }
 
 impl Filter for SquareFilter {
-    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>, scale_mode: ScaleMode) {
+    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>) {
         let uniforms = Uniforms {
-            texture_scale: scale_mode.texture_scale_from_resolution(new_size),
+            texture_scale: texture_scale_from_resolution(new_size),
         };
         queue.write_buffer(&self.uniform_buffer, 0, bytemuck::cast_slice(&[uniforms]));
     }
@@ -141,6 +140,16 @@ impl Filter for SquareFilter {
     }
 }
 
+fn texture_scale_from_resolution(res: PhysicalSize<u32>) -> [f32; 4] {
+    let scale = ((res.width as f32) / 160.0).min((res.height as f32) / 120.0);
+    [
+        scale / res.width as f32,
+        scale / res.height as f32,
+        2.0 / scale,
+        0.0,
+    ]
+}
+
 #[repr(C)]
 #[derive(Debug, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
 struct Uniforms {

uw8-window/src/lib.rs

@@ -1,5 +1,4 @@
 use anyhow::Result;
-use gpu::scale_mode::ScaleMode;
 use std::time::Instant;
 
 mod cpu;
@@ -16,7 +15,7 @@ struct FpsCounter {
 }
 
 impl Window {
-    pub fn new(mut config: WindowConfig) -> Result<Window> {
+    pub fn new(config: WindowConfig) -> Result<Window> {
         let fps_counter = if config.fps_counter {
             Some(FpsCounter {
                 start: Instant::now(),
@@ -25,7 +24,6 @@ impl Window {
         } else {
             None
         };
-        config.scale = config.scale.max(1.).min(20.);
         if config.enable_gpu {
             match gpu::Window::new(config) {
                 Ok(window) => {
@@ -73,8 +71,6 @@ pub struct WindowConfig {
     filter: u32,
     fullscreen: bool,
     fps_counter: bool,
-    scale: f32,
-    scale_mode: ScaleMode,
 }
 
 impl Default for WindowConfig {
@@ -84,8 +80,6 @@ impl Default for WindowConfig {
             filter: 5,
             fullscreen: false,
             fps_counter: false,
-            scale: 2.,
-            scale_mode: ScaleMode::Fit,
         }
     }
 }
@@ -108,13 +102,6 @@ impl WindowConfig {
         }
         self.fullscreen = args.contains("--fullscreen");
         self.fps_counter = args.contains("--fps");
-        self.scale = args
-            .opt_value_from_str("--scale")
-            .unwrap()
-            .unwrap_or(self.scale);
-        if args.contains("--scale-fill") {
-            self.scale_mode = ScaleMode::Fill;
-        }
     }
 }
 

web/package.json

@@ -4,6 +4,5 @@
     "@parcel/optimizer-data-url": "^2.0.0",
     "@parcel/transformer-inline-string": "^2.0.0",
     "parcel": "^2.0.0"
-  },
+  }
-  "dependencies": {}
 }

web/src/index.html

@@ -10,7 +10,7 @@
     </head>
     <body>
         <div id="uw8">
-            <a href="https://exoticorn.github.io/microw8">MicroW8</a> 0.4.1
+            <a href="https://exoticorn.github.io/microw8">MicroW8</a> 0.2.2
         </div>
         <div id="centered">
             <canvas class="screen" id="screen" width="320" height="240">

web/src/microw8.js

@@ -240,7 +240,6 @@ export default function MicroW8(screen, config = {}) {
             await audioReadyPromise;
     
             let startTime = Date.now();
-            let frameCounter = 0;
     
             const timePerFrame = 1000 / 60;
 
@@ -275,7 +274,7 @@ export default function MicroW8(screen, config = {}) {
     
                 try {
                     let restart = false;
-                    let thisFrame;
+                    let nextFrame = 0;
                     if (!isPaused) {
                         let gamepads = navigator.getGamepads();
                         let gamepad = 0;
@@ -307,7 +306,6 @@ export default function MicroW8(screen, config = {}) {
                         let time = Date.now() - startTime;
                         u32Mem[16] = time;
                         u32Mem[17] = pad | gamepad;
-                        u32Mem[18] = frameCounter++;
                         if(instance.exports.upd) {
                             instance.exports.upd();
                         }
@@ -323,13 +321,12 @@ export default function MicroW8(screen, config = {}) {
                         }
                         canvasCtx.putImageData(imageData, 0, 0);
 
-                        let timeOffset = ((time * 6) % 100 - 50) / 6;
+                        let thisFrame = Math.floor(time * 6 / 100);
-                        thisFrame = startTime + time - timeOffset / 8;
+                        let timeOffset = time - thisFrame * 100 / 6;
-                    } else {
+                        nextFrame = Math.ceil(startTime + (thisFrame + 1) * 100 / 6 + Math.min(4, timeOffset));
-                        thisFrame = Date.now();
                     }
                     let now = Date.now();
-                    let nextFrame = Math.max(thisFrame + timePerFrame, now);
+                    nextFrame = Math.max(nextFrame, now);
     
                     if (restart) {
                         runModule(currentData);