ported steady on tim as a sound test

first working version with sound
add simple bytebeat example to test first implementation with
2026-11-14 15:17:19 +01:00 · 2022-03-04 23:38:27 +01:00 · 2022-03-04 09:50:10 +01:00 · 2022-03-02 22:42:23 +01:00 · 2022-03-02 21:50:26 +01:00 · 2022-03-02 08:54:34 +01:00
8 changed files with 240 additions and 112 deletions
@@ -2,22 +2,13 @@
 # It is not intended for manual editing.
 version = 3

-[[package]]
-name = "addr2line"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd"
-dependencies = [
- "gimli 0.25.0",
-]
-
 [[package]]
 name = "addr2line"
 version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
 dependencies = [
- "gimli 0.26.1",
+ "gimli",
 ]

 [[package]]
@@ -68,6 +59,17 @@ dependencies = [
 "yansi",
 ]

+[[package]]
+name = "async-trait"
+version = "0.1.52"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "atty"
 version = "0.2.14"
@@ -91,12 +93,12 @@ version = "0.3.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6"
 dependencies = [
- "addr2line 0.17.0",
+ "addr2line",
 "cc",
 "cfg-if 1.0.0",
 "libc",
 "miniz_oxide",
- "object 0.27.1",
+ "object",
 "rustc-demangle",
 ]

@@ -332,24 +334,24 @@ dependencies = [

 [[package]]
 name = "cranelift-bforest"
-version = "0.77.0"
+version = "0.81.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15013642ddda44eebcf61365b2052a23fd8b7314f90ba44aa059ec02643c5139"
+checksum = "32f027f29ace03752bb83c112eb4f53744bc4baadf19955e67fcde1d71d2f39d"
 dependencies = [
 "cranelift-entity",
 ]

 [[package]]
 name = "cranelift-codegen"
-version = "0.77.0"
+version = "0.81.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "298f2a7ed5fdcb062d8e78b7496b0f4b95265d20245f2d0ca88f846dd192a3a3"
+checksum = "6c10af69cbf4e228c11bdc26d8f9d5276773909152a769649a160571b282f92f"
 dependencies = [
 "cranelift-bforest",
 "cranelift-codegen-meta",
 "cranelift-codegen-shared",
 "cranelift-entity",
- "gimli 0.25.0",
+ "gimli",
 "log",
 "regalloc",
 "smallvec",
@@ -358,34 +360,33 @@ dependencies = [

 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.77.0"
+version = "0.81.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cf504261ac62dfaf4ffb3f41d88fd885e81aba947c1241275043885bc5f0bac"
+checksum = "290ac14d2cef43cbf1b53ad5c1b34216c9e32e00fa9b6ac57b5e5a2064369e02"
 dependencies = [
 "cranelift-codegen-shared",
- "cranelift-entity",
 ]

 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.77.0"
+version = "0.81.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd2a72db4301dbe7e5a4499035eedc1e82720009fb60603e20504d8691fa9cd"
+checksum = "beb9142d134a03d01e3995e6d8dd3aecf16312261d0cb0c5dcd73d5be2528c1c"

 [[package]]
 name = "cranelift-entity"
-version = "0.77.0"
+version = "0.81.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48868faa07cacf948dc4a1773648813c0e453ff9467e800ff10f6a78c021b546"
+checksum = "1268a50b7cbbfee8514d417fc031cedd9965b15fa9e5ed1d4bc16de86f76765e"
 dependencies = [
 "serde",
 ]

 [[package]]
 name = "cranelift-frontend"
-version = "0.77.0"
+version = "0.81.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "351c9d13b4ecd1a536215ec2fd1c3ee9ee8bc31af172abf1e45ed0adb7a931df"
+checksum = "97ac0d440469e19ab12183e31a9e41b4efd8a4ca5fbde2a10c78c7bb857cc2a4"
 dependencies = [
 "cranelift-codegen",
 "log",
@@ -395,9 +396,9 @@ dependencies = [

 [[package]]
 name = "cranelift-native"
-version = "0.77.0"
+version = "0.81.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6df8b556663d7611b137b24db7f6c8d9a8a27d7f29c7ea7835795152c94c1b75"
+checksum = "794cd1a5694a01c68957f9cfdc5ac092cf8b4e9c2d1697c4a5100f90103e9e9e"
 dependencies = [
 "cranelift-codegen",
 "libc",
@@ -406,9 +407,9 @@ dependencies = [

 [[package]]
 name = "cranelift-wasm"
-version = "0.77.0"
+version = "0.81.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a69816d90db694fa79aa39b89dda7208a4ac74b6f2b8f3c4da26ee1c8bdfc5e"
+checksum = "f2ddd4ca6963f6e94d00e8935986411953581ac893587ab1f0eb4f0b5a40ae65"
 dependencies = [
 "cranelift-codegen",
 "cranelift-entity",
@@ -416,7 +417,7 @@ dependencies = [
 "itertools",
 "log",
 "smallvec",
- "wasmparser 0.80.2",
+ "wasmparser 0.82.0",
 "wasmtime-types",
 ]

@@ -810,21 +811,15 @@ dependencies = [

 [[package]]
 name = "gimli"
-version = "0.25.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7"
+checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
 dependencies = [
 "fallible-iterator",
 "indexmap",
 "stable_deref_trait",
 ]

-[[package]]
-name = "gimli"
-version = "0.26.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
-
 [[package]]
 name = "glob"
 version = "0.3.0"
@@ -1035,6 +1030,12 @@ dependencies = [
 "cfg-if 1.0.0",
 ]

+[[package]]
+name = "io-lifetimes"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec58677acfea8a15352d42fc87d11d63596ade9239e0a7c9352914417515dbe6"
+
 [[package]]
 name = "iovec"
 version = "0.1.4"
@@ -1141,6 +1142,12 @@ dependencies = [
 "winapi 0.3.9",
 ]

+[[package]]
+name = "linux-raw-sys"
+version = "0.0.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7"
+
 [[package]]
 name = "log"
 version = "0.4.14"
@@ -1456,9 +1463,9 @@ dependencies = [

 [[package]]
 name = "object"
-version = "0.26.2"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39f37e50073ccad23b6d09bcb5b263f4e76d3bb6038e4a3c08e52162ffa8abc2"
+checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9"
 dependencies = [
 "crc32fast",
 "indexmap",
@@ -1466,13 +1473,10 @@ dependencies = [
 ]

 [[package]]
-name = "object"
-version = "0.27.1"
+name = "once_cell"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9"
-dependencies = [
- "memchr",
-]
+checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"

 [[package]]
 name = "opaque-debug"
@@ -1729,9 +1733,9 @@ dependencies = [

 [[package]]
 name = "regalloc"
-version = "0.0.31"
+version = "0.0.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "571f7f397d61c4755285cd37853fe8e03271c243424a907415909379659381c5"
+checksum = "62446b1d3ebf980bdc68837700af1d77b37bc430e524bf95319c6eada2a4cc02"
 dependencies = [
 "log",
 "rustc-hash",
@@ -1788,6 +1792,20 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"

+[[package]]
+name = "rustix"
+version = "0.33.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9466f25b92a648960ac1042fd3baa6b0bf285e60f754d7e5070770c813a177a"
+dependencies = [
+ "bitflags",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.9"
@@ -2521,18 +2539,18 @@ version = "0.77.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b35c86d22e720a07d954ebbed772d01180501afe7d03d464f413bb5f8914a8d6"

-[[package]]
-name = "wasmparser"
-version = "0.80.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "449167e2832691a1bff24cde28d2804e90e09586a448c8e76984792c44334a6b"
-
 [[package]]
 name = "wasmparser"
 version = "0.81.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98930446519f63d00a836efdc22f67766ceae8dbcc1571379f2bcabc6b2b9abc"

+[[package]]
+name = "wasmparser"
+version = "0.82.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0559cc0f1779240d6f894933498877ea94f693d84f3ee39c9a9932c6c312bd70"
+
 [[package]]
 name = "wasmparser"
 version = "0.83.0"
@@ -2541,28 +2559,28 @@ checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a"

 [[package]]
 name = "wasmtime"
-version = "0.30.0"
+version = "0.34.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "899b1e5261e3d3420860dacfb952871ace9d7ba9f953b314f67aaf9f8e2a4d89"
+checksum = "4882e78d9daceeaff656d82869f298fd472ea8d8ccf96fbd310da5c1687773ac"
 dependencies = [
 "anyhow",
+ "async-trait",
 "backtrace",
 "bincode",
 "cfg-if 1.0.0",
- "cpp_demangle",
 "indexmap",
 "lazy_static",
 "libc",
 "log",
- "object 0.26.2",
+ "object",
+ "once_cell",
 "paste",
 "psm",
 "rayon",
 "region",
- "rustc-demangle",
 "serde",
 "target-lexicon",
- "wasmparser 0.80.2",
+ "wasmparser 0.82.0",
 "wasmtime-cache",
 "wasmtime-cranelift",
 "wasmtime-environ",
@@ -2575,18 +2593,17 @@ dependencies = [

 [[package]]
 name = "wasmtime-cache"
-version = "0.30.0"
+version = "0.34.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2493b81d7a9935f7af15e06beec806f256bc974a90a843685f3d61f2fc97058"
+checksum = "cf5b9af2d970624455f9ea109acc60cc477afe097f86c190eb519a8b7d6646cd"
 dependencies = [
 "anyhow",
 "base64",
 "bincode",
 "directories-next",
- "errno",
 "file-per-thread-logger",
- "libc",
 "log",
+ "rustix",
 "serde",
 "sha2",
 "toml",
@@ -2596,9 +2613,9 @@ dependencies = [

 [[package]]
 name = "wasmtime-cranelift"
-version = "0.30.0"
+version = "0.34.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99706bacdf5143f7f967d417f0437cce83a724cf4518cb1a3ff40e519d793021"
+checksum = "1ed6ff21d2dbfe568af483f0c508e049fc6a497c73635e2c50c9b1baf3a93ed8"
 dependencies = [
 "anyhow",
 "cranelift-codegen",
@@ -2606,67 +2623,67 @@ dependencies = [
 "cranelift-frontend",
 "cranelift-native",
 "cranelift-wasm",
- "gimli 0.25.0",
+ "gimli",
+ "log",
 "more-asserts",
- "object 0.26.2",
+ "object",
 "target-lexicon",
 "thiserror",
- "wasmparser 0.80.2",
+ "wasmparser 0.82.0",
 "wasmtime-environ",
 ]

 [[package]]
 name = "wasmtime-environ"
-version = "0.30.0"
+version = "0.34.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac42cb562a2f98163857605f02581d719a410c5abe93606128c59a10e84de85b"
+checksum = "860936d38df423b4291b3e31bc28d4895e2208f9daba351c2397d18a0a10e0bf"
 dependencies = [
 "anyhow",
- "cfg-if 1.0.0",
 "cranelift-entity",
- "gimli 0.25.0",
+ "gimli",
 "indexmap",
 "log",
 "more-asserts",
- "object 0.26.2",
+ "object",
 "serde",
 "target-lexicon",
 "thiserror",
- "wasmparser 0.80.2",
+ "wasmparser 0.82.0",
 "wasmtime-types",
 ]

 [[package]]
 name = "wasmtime-fiber"
-version = "0.30.0"
+version = "0.34.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8779dd78755a248512233df4f6eaa6ba075c41bea2085fec750ed2926897bf95"
+checksum = "67e285306aa274d85a22753bef826226e1cc473bac0b541523f46dccf80751cc"
 dependencies = [
 "cc",
- "libc",
+ "rustix",
 "winapi 0.3.9",
 ]

 [[package]]
 name = "wasmtime-jit"
-version = "0.30.0"
+version = "0.34.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24f46dd757225f29a419be415ea6fb8558df9b0194f07e3a6a9c99d0e14dd534"
+checksum = "e794310a0df5266c7ac73e8211a024a49e3860ac0ca2af5db8527be942ad063e"
 dependencies = [
- "addr2line 0.16.0",
+ "addr2line",
 "anyhow",
 "bincode",
 "cfg-if 1.0.0",
- "gimli 0.25.0",
- "libc",
+ "cpp_demangle",
+ "gimli",
 "log",
- "more-asserts",
- "object 0.26.2",
+ "object",
 "region",
+ "rustc-demangle",
+ "rustix",
 "serde",
 "target-lexicon",
 "thiserror",
- "wasmparser 0.80.2",
 "wasmtime-environ",
 "wasmtime-runtime",
 "winapi 0.3.9",
@@ -2674,9 +2691,9 @@ dependencies = [

 [[package]]
 name = "wasmtime-runtime"
-version = "0.30.0"
+version = "0.34.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0122215a44923f395487048cb0a1d60b5b32c73aab15cf9364b798dbaff0996f"
+checksum = "90ffe5cb3db705ea43fcf37475a79891a3ada754c1cbe333540879649de943d5"
 dependencies = [
 "anyhow",
 "backtrace",
@@ -2691,6 +2708,7 @@ dependencies = [
 "more-asserts",
 "rand",
 "region",
+ "rustix",
 "thiserror",
 "wasmtime-environ",
 "wasmtime-fiber",
@@ -2699,14 +2717,14 @@ dependencies = [

 [[package]]
 name = "wasmtime-types"
-version = "0.30.0"
+version = "0.34.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9b01caf8a204ef634ebac99700e77ba716d3ebbb68a1abbc2ceb6b16dbec9e4"
+checksum = "70a5b60d70c1927c5a403f7c751de179414b6b91da75b2312c3ae78196cf9dc3"
 dependencies = [
 "cranelift-entity",
 "serde",
 "thiserror",
- "wasmparser 0.80.2",
+ "wasmparser 0.82.0",
 ]

 [[package]]
@@ -2871,18 +2889,18 @@ checksum = "9fc79f4a1e39857fc00c3f662cbf2651c771f00e9c15fe2abc341806bd46bd71"

 [[package]]
 name = "zstd"
-version = "0.9.2+zstd.1.5.1"
+version = "0.10.0+zstd.1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2390ea1bf6c038c39674f22d95f0564725fc06034a47129179810b2fc58caa54"
+checksum = "3b1365becbe415f3f0fcd024e2f7b45bacfb5bdd055f0dc113571394114e7bdd"
 dependencies = [
 "zstd-safe",
 ]

 [[package]]
 name = "zstd-safe"
-version = "4.1.3+zstd.1.5.1"
+version = "4.1.4+zstd.1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e99d81b99fb3c2c2c794e3fe56c305c63d5173a16a46b5850b07c935ffc7db79"
+checksum = "2f7cd17c9af1a4d6c24beb1cc54b17e2ef7b593dc92f19e9d9acad8b182bbaee"
 dependencies = [
 "libc",
 "zstd-sys",
@@ -2890,9 +2908,9 @@ dependencies = [

 [[package]]
 name = "zstd-sys"
-version = "1.6.2+zstd.1.5.1"
+version = "1.6.3+zstd.1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2daf2f248d9ea44454bfcb2516534e8b8ad2fc91bf818a1885495fc42bc8ac9f"
+checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8"
 dependencies = [
 "cc",
 "libc",
@@ -11,7 +11,7 @@ native = ["wasmtime"]
 browser = ["warp", "tokio", "tokio-stream", "webbrowser"]

 [dependencies]
-wasmtime = { version = "0.30", optional = true }
+wasmtime = { version = "0.34", optional = true }
 anyhow = "1"
 minifb = { version = "0.20", default-features = false, features = ["x11"] }
 notify = "4"
@@ -0,0 +1,27 @@
+// Steady On Tim, It's Only A Budget Game
+// by Gasman / Hooy-Program
+// ported to MicroW8 by exoticorn/icebird
+
+include "../include/microw8-api.cwa"
+
+fn melody(t: i32, T: i32) -> i32 {
+    let lazy b=(T&31)-16;
+    if b < 0 {
+        b = -b;
+    }
+    let lazy K = 1.0 + ((1-((T>>5)&3))%2-1) as f32 / 6.0;
+    let inline arpeggio = ((t as f32 * pow(2.0, ((((0x85>>(t/2000%3*4)) & 15) - 1) as f32 / 12.0 + K))) as i32 & 128) * (!!(T>>8) * (12-T%12)) / 12;
+    let inline melody = (t as f32 * pow(2.0, K+(b/5) as f32 - (((5514>>(b%select(T>>9, 4, 5)*4)&15) as f32) / 12.0))) as i32 & 128;
+    arpeggio +
+    melody
+}
+
+export fn snd(sample: i32) -> f32 {
+    let lazy t = sample / 2;
+    let lazy T = t/5000;
+    let inline mel_arp = melody(t, T)/3 + melody(t, T-3)/5;
+    let inline bass = !!(T>>7) * ((t as f32 * pow(2.0, ((!!(T & 4) * ((T & 7) - 1)) as f32 / 6.0 - 4.0))) as i32 & 63) * ((197 >> (T % 8)) & 1);
+    let inline snare_ish = (random() & 31) * (8 - (T + 4) % 8) / 8;
+    let inline sample = mel_arp + bass + snare_ish;
+    (sample & 255) as f32 / 255 as f32 - 0.5
+}
@@ -4,7 +4,7 @@
        <section>
            <h1 class="text-center heading-text">A WebAssembly based fantasy console</h1>
        </section>
-        <a href="v0.1.1">
+        <a href="v0.1.2">
            <img class="demonstration-gif" style="width:640px;height:480px;image-rendering:pixelated" src="img/technotunnel.png"></img>
        </a>
    </div>
@@ -1 +1 @@
-<!doctype html><html><head><meta charset="utf8"><title>uw8-run</title><style>body,canvas,html{background-color:#202024;margin:0;padding:0}body,html{height:100%}body{display:grid;grid-template-rows:1fr}#screen{align-self:center;border:4px solid #303040;image-rendering:pixelated;justify-self:center}#message{background-color:rgba(0,0,0,.4);color:#c64;font:700 12pt sans-serif;padding:8px;position:absolute;width:calc(100% - 16px);z-index:2}@media (min-width:648px) and (min-height:488px){#screen{height:480px;width:640px}}@media (min-width:968px) and (min-height:728px){#screen{height:720px;width:960px}}</style></head><body> <canvas id="screen" width="320" height="240" tabindex="1"> </canvas> <div id="message"></div> </body><script type="module">function A(A){return A&&A.__esModule?A.default:A}let e=function(e,t={}){t.setMessage||(t.setMessage=(A,e)=>{e&&console.log("error: "+e)});let a,B,n,r,o=e.getContext("2d"),i=o.createImageData(320,240),s=t.devkitMode,F=A=>new Uint8Array(A),g=A=>new Uint32Array(A),l=0,Q=null==t.keyboardElement?e:t.keyboardElement;if(Q){let A=A=>{let a,o="keydown"==A.type;switch(A.code){case"ArrowUp":a=1;break;case"ArrowDown":a=2;break;case"ArrowLeft":a=4;break;case"ArrowRight":a=8;break;case"KeyZ":a=16;break;case"KeyX":a=32;break;case"KeyA":a=64;break;case"KeyS":a=128;break;case"KeyR":o&&c(B,!0);break;case"F9":o&&e.toBlob((A=>{f(A,".png")})),A.preventDefault();break;case"F10":o&&function(){if(n)return n.stop(),void(n=null);n=new MediaRecorder(e.captureStream(),{mimeType:"video/webm",videoBitsPerSecond:25e6});let A=[];n.ondataavailable=e=>{A.push(e.data)};let a=t.timerElement;a&&(a.hidden=!1,a.innerText="00:00");function B(){if(r){if(a){let A=Math.floor((Date.now()-r)/1e3);a.innerText=Math.floor(A/60).toString().padStart(2,"0")+":"+(A%60).toString().padStart(2,"0")}setTimeout(B,1e3)}}n.onstop=()=>{a&&(a.hidden=!0),f(new Blob(A,{type:"video/webm"}),".webm")},n.start(),r=Date.now(),setTimeout(B,1e3)}(),A.preventDefault()}o?l|=a:l&=~a};Q.onkeydown=A,Q.onkeyup=A}async function c(n,r){a&&(a(),a=null);let Q=n.byteLength;if(t.setMessage(Q),0==Q)return;B=n;let f=window.location.pathname;if(Q<=1024&&!r){let A="";for(let e of F(n))A+=String.fromCharCode(e);f+="#"+btoa(A),f!=window.location.pathname+window.location.hash&&history.pushState(null,null,f)}e.width=e.width;try{let e={initial:4};s||(e.maximum=4);let r,f=new WebAssembly.Memory({initial:4,maximum:s?16:4}),E=F(f.buffer),I={env:{memory:f}},d=A=>{if(r&&(!s||0!=F(A)[0])){E.set(F(A));let e=r.exports.load_uw8(A.byteLength);A=new ArrayBuffer(e),F(A).set(E.slice(0,e))}return A},M=async A=>(await WebAssembly.instantiate(A,I)).instance,C=async A=>M(d(await(await fetch(A)).arrayBuffer()));r=await C(A("data:application/wasm;base64,AGFzbQEAAAABFQRgAX8Bf2ACf38Bf2ADf39%2FAGAAAAIPAQNlbnYGbWVtb3J5AgAEAwkIAAABAgEAAAMGEAN%2FAUEAC38BQQALfwFBAAsHGQIIbG9hZF91dzgAAAp1bmNvbXByZXNzAAQIAQcKngUIxwEBB39BAC0AAEEBayIBQQBIBEAgAA8LQYDAByAAaiECIAFBAXEEQEEBQYHABxAEIQIFQYDAB0EAIAAQAwtBAEGAhA9BCBADQYiEDyEDQQghBEGBwAchBQNAIAUgAkggAyMATiAFLQAAIAMtAABMcnEEQCAEIAQgBRACIgZqIQQgAyMASCAFLQAAIAMtAABGcQRAIAMgAxABaiEDCyAFIAZqIQUMAQsgAyMASARAIAQgBCADEAIiB2ohBCADIAdqIQMMAQsLIAQLPAEEfyAAIQEDQCACIAFBAWoiAS0AACIEQf8AcSADdHIhAiADQQdqIQMgBEEHdQ0ACyABQQFqIABrIAJqCxIBAX8gACABIAEQASICEAMgAgskAANAIAJBAEoEQCAAIAJBAWsiAmogASACai0AADoAAAwBCwsLqQEBBn8gACQBQQAkAgNAIANBgAE6AICADyADQQFqIgNBgQNIDQALAkADQEEAEAYiBQRAIAQEf0EBBUGAAhAGCwRAQYECEAVBAWsiAkUNAwtBwQIQBSEGA0AgASABIAJrLQAAOgAAIAFBAWohASAGQQFrIgYNAAsFQQEhBwNAIAdBAXQgBxAGciIHQYACSA0ACyABIAc6AAAgAUEBaiEBCyAFIQQMAAsLIAELNAECfwNAIAAgAmoQBgRAIAEgACACakEgahAGIAJ0ciEBIAJBAWohAgwBCwsgAUEBIAJ0cgtxAQR%2FA0AjAkGAIEgEQCMCQQh0IwEtAAByJAIjAUEBaiQBDAELCyMCQf8BcSICIAAtAICADyIBIwJBCHUiA2xBgAIgAWsgA2wgAWsgAiABSCIEG2okAiAAIAFBByAEQYECbGogAWtBBHVqOgCAgA8gBAsMAEEAQYCEDxAEJAALC9gDAQBBAAvRAwF%2F%2F9fTKCTONmi84%2BnrbVSOH%2Fc6vSf%2BD4d9SJNBc3FX7QfUHxwdZoJ2gbrkOxXMlCFQohTpOfrqH2lON%2BKLJNVfU5Nu4GOO2WMojT29uFcnCJS3%2B1hbxaL%2Fh9lmLYb3zvWsMJ%2BjBoF3XH%2BX3PiQRGj3lSO6d6ROB1tLHAjBvc8KRcJC8ezAHO2KxgN0C60LhqDnEMNRGkiZIGd7vFakdzsTK52rXTWTEF%2BRtXf5UnppLVtDQaKioHW9qgBgNM8z076axgmmzZdgskOHHn3MVWuglavoCFh4dRFW5XmuZwoBT3HKAX%2F6xPFRb56MQoyggxfIPc7Po49uFG7BLqNaZm%2FVzLkVsqcnLbkOu67BrqPS6In7L9Zomf6E5PQp%2FK7DKV5%2FS%2Be15wnC3zqP1Bj6xLe3xzckXir7SHPZsep5NtRy%2FGpcseCHgPNHMos7xPQKdDO%2BAXqvMZuNdOwFZm6TmQ3vmMOdSSpn62axAi0QlRgoxhrA%2F42mIF6TkGbDAElqkMfF0EyKfip%2B2EPJtH7AksMALac%2BkjT9fyIQRGiD5HMZwCTKLxBLX3A07qdkKrXlR5i8pYOXZxAX4vyy9BKV8RfUfvEuqyNXXnBg4e%2BB%2FPnR%2Bg%3D%3D"));for(let A of["acos","asin","atan","atan2","cos","exp","log","sin","tan","pow"])I.env[A]=Math[A];for(let A=9;A<64;++A)I.env["reserved"+A]=()=>{};for(let A=0;A<16;++A)I.env["g_reserved"+A]=0;n=d(n);let u=await C(A("data:;base64,AnevpqDvapimRNPOGhqee07n%2Bv1yTm1n5XES6y7%2BqPUQFqw5livsDo%2Fkram7E1zzZg6qmLzXsUswfnD9AZjEuJOrUjm2TzbQ%2BWO1hv6bvL0OA5NIRBHdnLCD2DJC5a7Jh%2Bn20qczMOvGlUk700JPiog%2BRZrdnPfnjdZrltFOZBk1oyEomoNCnRBIG%2Bd2U%2BJ%2FfcPD%2FV5KVii8nTeMgUfwVbKV79ZcQGuE4VPTr0nA80eJso3NQUtKG8IWxj9LEus4f2c0dEpDNmDI9qq9a12KBBCrzzqR046Line truncated
+<!doctype html><html><head><meta charset="utf8"><title>uw8-run</title><style>body,canvas,html{background-color:#202024;margin:0;padding:0}body,html{height:100%}body{display:grid;grid-template-rows:1fr}#screen{align-self:center;border:4px solid #303040;image-rendering:pixelated;justify-self:center}#message{background-color:rgba(0,0,0,.4);color:#c64;font:700 12pt sans-serif;padding:8px;position:absolute;width:calc(100% - 16px);z-index:2}@media (min-width:648px) and (min-height:488px){#screen{height:480px;width:640px}}@media (min-width:968px) and (min-height:728px){#screen{height:720px;width:960px}}</style></head><body> <canvas id="screen" width="320" height="240" tabindex="1"> </canvas> <div id="message"></div> </body><script type="module">function e(e){return e&&e.__esModule?e.default:e}class t extends AudioWorkletNode{constructor(e){super(e,"apu",{outputChannelCount:[2]})}}let A=e=>new Uint8Array(e),a=e=>new Uint32Array(e);let B=function(B,n={}){n.setMessage||(n.setMessage=(e,t)=>{t&&console.log("error: "+t)});let r,o,s,i,l=B.getContext("2d"),F=l.createImageData(320,240),c=n.devkitMode,g=0,d=null==n.keyboardElement?B:n.keyboardElement;if(d){let e=e=>{let t,A="keydown"==e.type;switch(e.code){case"ArrowUp":t=1;break;case"ArrowDown":t=2;break;case"ArrowLeft":t=4;break;case"ArrowRight":t=8;break;case"KeyZ":t=16;break;case"KeyX":t=32;break;case"KeyA":t=64;break;case"KeyS":t=128;break;case"KeyR":A&&f(o,!0);break;case"F9":A&&B.toBlob((e=>{D(e,".png")})),e.preventDefault();break;case"F10":A&&function(){if(s)return s.stop(),void(s=null);s=new MediaRecorder(B.captureStream(),{mimeType:"video/webm",videoBitsPerSecond:25e6});let e=[];s.ondataavailable=t=>{e.push(t.data)};let t=n.timerElement;t&&(t.hidden=!1,t.innerText="00:00");function A(){if(i){if(t){let e=Math.floor((Date.now()-i)/1e3);t.innerText=Math.floor(e/60).toString().padStart(2,"0")+":"+(e%60).toString().padStart(2,"0")}setTimeout(A,1e3)}}s.onstop=()=>{t&&(t.hidden=!0),D(new Blob(e,{type:"video/webm"}),".webm")},s.start(),i=Date.now(),setTimeout(A,1e3)}(),e.preventDefault()}A?g|=t:g&=~t};d.onkeydown=e,d.onkeyup=e}async function f(s,i){r&&(r(),r=null);let d=new AudioContext({sampleRate:44100}),D=!0;r=()=>{d.close(),D=!1},await d.audioWorklet.addModule(e("data:application/javascript,class%20e%20extends%20AudioWorkletProcessor%7Bconstructor%28%29%7Bsuper%28%29%2Cthis.sampleIndex%3D0%2Cthis.port.onmessage%3De%3D%3E%7Bthis.load%28e.data%5B0%5D%2Ce.data%5B1%5D%29%7D%7Dasync%20load%28e%2Cs%29%7Blet%20t%3D%7Benv%3A%7Bmemory%3Anew%20WebAssembly.Memory%28%7Binitial%3A4%2Cmaximum%3A4%7D%29%7D%7D%3Bfor%28let%20e%20of%5B%22acos%22%2C%22asin%22%2C%22atan%22%2C%22atan2%22%2C%22cos%22%2C%22exp%22%2C%22log%22%2C%22sin%22%2C%22tan%22%2C%22pow%22%5D%29t.env%5Be%5D%3DMath%5Be%5D%3Bfor%28let%20e%3D9%3Be%3C64%3B%2B%2Be%29t.env%5B%22reserved%22%2Be%5D%3D%28%29%3D%3E%7B%7D%3Bfor%28let%20e%3D0%3Be%3C16%3B%2B%2Be%29t.env%5B%22g_reserved%22%2Be%5D%3D0%3Blet%20a%3Dasync%20e%3D%3E%28await%20WebAssembly.instantiate%28e%2Ct%29%29.instance%2Cn%3Dawait%20a%28e%29%3Bfor%28let%20e%20in%20n.exports%29t.env%5Be%5D%3Dn.exports%5Be%5D%3Blet%20o%3Dawait%20a%28s%29%3Bthis.snd%3Do.exports.snd%7Dprocess%28e%2Cs%2Ct%29%7Bif%28this.snd%29%7Blet%20e%3Ds%5B0%5D%2Ct%3Dthis.sampleIndex%2Ca%3De%5B0%5D.length%3Bfor%28let%20s%3D0%3Bs%3Ca%3B%2B%2Bs%29e%5B0%5D%5Bs%5D%3Dthis.snd%28t%2B%2B%29%2Ce%5B1%5D%5Bs%5D%3Dthis.snd%28t%2B%2B%29%3Bthis.sampleIndex%3D4294967295%26t%7Dreturn%210%7D%7DregisterProcessor%28%22apu%22%2Ce%29%3B"));let Q=new t(d),C=s.byteLength;if(n.setMessage(C),0==C)return;o=s;let E=window.location.pathname;if(C<=1024&&!i){let e="";for(let t of A(s))e+=String.fromCharCode(t);E+="#"+btoa(e),E!=window.location.pathname+window.location.hash&&history.pushState(null,null,E)}B.width=B.width;try{let t={initial:4};c||(t.maximum=4);let B,r=new WebAssembly.Memory(t),i=A(r.buffer),E={env:{memory:r}},I=e=>{if(B&&(!c||0!=A(e)[0])){i.set(A(e));let t=B.exports.load_uw8(e.byteLength);e=new ArrayBuffer(t),A(e).set(i.slice(0,t))}return e},u=async e=>(await WebAssembly.instantiate(e,E)).instance,M=async e=>I(await(await fetch(e)).arrayBuffer());B=await u(await M(e("data:application/wasm;base64,AGFzbQEAAAABFQRgAX8Bf2ACf38Bf2ADf39%2FAGAAAAIPAQNlbnYGbWVtb3J5AgAEAwkIAAABAgEAAAMGEAN%2FAUEAC38BQQALfwFBAAsHGQIIbG9hZF91dzgAAAp1bmNvbXByZXNzAAQIAQcKngUIxwEBB39BAC0AAEEBayIBQQBIBEAgAA8LQYDAByAAaiECIAFBAXEEQEEBQYHABxAEIQIFQYDAB0EAIAAQAwtBAEGAhA9BCBADQYiEDyEDQQghBEGBwAchBQNAIAUgAkggAyMATiAFLQAAIAMtAABMcnEEQCAEIAQgBRACIgZqIQQgAyMASCAFLQAAIAMtAABGcQRAIAMgAxABaiEDCyAFIAZqIQUMAQsgAyMASARAIAQgBCADEAIiB2ohBCADIAdqIQMMAQsLIAQLPAEEfyAAIQEDQCACIAFBAWoiAS0AACIEQf8AcSADdHIhAiADQQdqIQMgBEEHdQ0ACyABQQFqIABrIAJqCxIBAX8gACABIAEQASICEAMgAgskAANAIAJBAEoEQCAAIAJBAWsiAmogASACai0AADoAAAwBCwsLqQEBBn8gACQBQQAkAgNAIANBgAE6AICADyADQQFqIgNBgQNIDQALAkADQEEAEAYiBQRAIAQEf0EBBUGAAhAGCwRAQYECEAVBAWsiAkUNAwtBwQIQBSEGA0AgASABIAJrLQAAOgAAIAFBAWohASAGQQFrIgYNAAsFQQEhBwNAIAdBAXQgBxAGciIHQYACSA0ACyABIAc6AAAgAUEBaiEBCyAFIQQMAAsLIAELNAECfwNAIAAgAmoQBgRAIAEgACACakEgaLine truncated
@@ -0,0 +1,2 @@
+#!/bin/bash
+rm -rf .parcel-cache && yarn parcel src/index.html
@@ -0,0 +1,60 @@
+class APU extends AudioWorkletProcessor {
+    constructor() {
+        super();
+        this.sampleIndex = 0;
+        this.port.onmessage = (ev) => {
+            this.load(ev.data[0], ev.data[1]);
+        };
+    }
+
+    async load(platform_data, data) {
+        let memory = new WebAssembly.Memory({ initial: 4, maximum: 4 });
+
+        let importObject = {
+            env: {
+                memory
+            },
+        };
+
+        for (let n of ['acos', 'asin', 'atan', 'atan2', 'cos', 'exp', 'log', 'sin', 'tan', 'pow']) {
+            importObject.env[n] = Math[n];
+        }
+
+        for (let i = 9; i < 64; ++i) {
+            importObject.env['reserved' + i] = () => { };
+        }
+
+        for (let i = 0; i < 16; ++i) {
+            importObject.env['g_reserved' + i] = 0;
+        }
+
+        let instantiate = async (data) => (await WebAssembly.instantiate(data, importObject)).instance;
+
+        let platform_instance = await instantiate(platform_data);
+
+        for (let name in platform_instance.exports) {
+            importObject.env[name] = platform_instance.exports[name]
+        }
+
+        let instance = await instantiate(data);
+
+        this.snd = instance.exports.snd;
+    }
+
+    process(inputs, outputs, parameters) {
+        if(this.snd) {
+            let channels = outputs[0];
+            let index = this.sampleIndex;
+            let numSamples = channels[0].length;
+            for(let i = 0; i < numSamples; ++i) {
+                channels[0][i] = this.snd(index++);
+                channels[1][i] = this.snd(index++);
+            }
+            this.sampleIndex = index & 0xffffffff;
+        }
+
+        return true;
+    }
+}
+
+registerProcessor('apu', APU);
@@ -1,5 +1,15 @@
 import loaderUrl from "data-url:../../platform/bin/loader.wasm";
 import platformUrl from "data-url:../../platform/bin/platform.uw8";
+import audioWorkletUrl from "data-url:./audiolet.js";
+
+class AudioNode extends AudioWorkletNode {
+    constructor(context) {
+        super(context, 'apu', {outputChannelCount: [2]});
+    }
+}
+
+let U8 = (d) => new Uint8Array(d);
+let U32 = (d) => new Uint32Array(d);

 export default function MicroW8(screen, config = {}) {
    if(!config.setMessage) {
@@ -18,9 +28,6 @@ export default function MicroW8(screen, config = {}) {
    
    let currentData;
    
-    let U8 = (d) => new Uint8Array(d);
-    let U32 = (d) => new Uint32Array(d);
-    
    let pad = 0;
    let keyboardElement = config.keyboardElement == undefined ? screen : config.keyboardElement;
    if(keyboardElement) {
@@ -90,6 +97,16 @@ export default function MicroW8(screen, config = {}) {
            cancelFunction = null;
        }
    
+        let audioContext = new AudioContext({sampleRate: 44100});
+        let keepRunning = true;
+        cancelFunction = () => {
+            audioContext.close();
+            keepRunning = false;
+        }
+
+        await audioContext.audioWorklet.addModule(audioWorkletUrl);
+        let audioNode = new AudioNode(audioContext);
+
        let cartridgeSize = data.byteLength;
    
        config.setMessage(cartridgeSize);
@@ -119,7 +136,7 @@ export default function MicroW8(screen, config = {}) {
            if(!devkitMode) {
                memSize.maximum = 4;
            }
-            let memory = new WebAssembly.Memory({ initial: 4, maximum: devkitMode ? 16 : 4 });
+            let memory = new WebAssembly.Memory(memSize);
            let memU8 = U8(memory.buffer);
    
            let importObject = {
@@ -142,9 +159,9 @@ export default function MicroW8(screen, config = {}) {
    
            let instantiate = async (data) => (await WebAssembly.instantiate(data, importObject)).instance;
    
-            let loadModuleURL = async (url) => instantiate(loadModuleData(await (await fetch(url)).arrayBuffer()));
+            let loadModuleURL = async (url) => loadModuleData(await (await fetch(url)).arrayBuffer());
    
-            loader = await loadModuleURL(loaderUrl);
+            loader = await instantiate(await loadModuleURL(loaderUrl));
    
            for (let n of ['acos', 'asin', 'atan', 'atan2', 'cos', 'exp', 'log', 'sin', 'tan', 'pow']) {
                importObject.env[n] = Math[n];
@@ -160,7 +177,10 @@ export default function MicroW8(screen, config = {}) {
    
            data = loadModuleData(data);
    
-            let platform_instance = await loadModuleURL(platformUrl);
+            let platform_data = await loadModuleURL(platformUrl);
+            audioNode.port.postMessage([platform_data, data]);
+
+            let platform_instance = await instantiate(platform_data);
    
            for (let name in platform_instance.exports) {
                importObject.env[name] = platform_instance.exports[name]
@@ -172,11 +192,10 @@ export default function MicroW8(screen, config = {}) {
    
            let startTime = Date.now();
    
-            let keepRunning = true;
-            cancelFunction = () => keepRunning = false;
-    
            const timePerFrame = 1000 / 60;
            let nextFrame = startTime;
+
+            audioNode.connect(audioContext.destination);
    
            function mainloop() {
                if (!keepRunning) {
@@ -216,7 +235,9 @@ export default function MicroW8(screen, config = {}) {
                        let u32Mem = U32(memory.buffer);
                        u32Mem[16] = now - startTime;
                        u32Mem[17] = pad | gamepad;
-                        instance.exports.upd();
+                        if(instance.exports.upd) {
+                            instance.exports.upd();
+                        }
                        platform_instance.exports.endFrame();
    
                        let palette = U32(memory.buffer.slice(0x13000, 0x13000 + 1024));
Author	SHA1	Message	Date
dranke	9063e872d3	ported steady on tim as a sound test	2022-03-04 23:38:27 +01:00
dranke	85240599e8	first working version with sound	2022-03-04 09:50:10 +01:00
dranke	35ec5fdb59	add simple bytebeat example to test first implementation with	2022-03-02 22:42:23 +01:00
dranke	a6a82ff5a1	update wasmtime version	2022-03-02 21:50:26 +01:00
dranke	973814a629	update hero link to 0.1.2	2022-03-02 08:54:34 +01:00