mirror of
https://github.com/exoticorn/microw8.git
synced 2026-11-13 23:17:19 +01:00
Prepare 0.1.1 release
add devkit mode to web runtime add unpack and compile commands to uw8
This commit is contained in:
1 parent
619ea903ba
commit
c25a52b61b
11 files changed
+105
-18
No files matched your search
Generated
+1
-1
@@ -1517,7 +1517,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "uw8"
|
name = "uw8"
|
||||||
version = "0.1.0"
|
version = "0.1.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"curlywas",
|
"curlywas",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "uw8"
|
name = "uw8"
|
||||||
version = "0.1.0"
|
version = "0.1.1"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|||||||
@@ -53,6 +53,21 @@ Options:
|
|||||||
-l LEVEL, --level LEVEL : Compression level (0-9). Higher compression levels are really slow.
|
-l LEVEL, --level LEVEL : Compression level (0-9). Higher compression levels are really slow.
|
||||||
|
|
||||||
|
|
||||||
|
uw8 unpack <infile> <outfile>
|
||||||
|
|
||||||
|
Unpacks a MicroW8 module into a standard WebAssembly module.
|
||||||
|
|
||||||
|
|
||||||
|
uw8 compile [<options>] <infile> <outfile>
|
||||||
|
|
||||||
|
Compiles a CurlyWas source file to a standard WebAssembly module. Most useful together with
|
||||||
|
the --debug option to get a module that works well in the Chrome debugger.
|
||||||
|
|
||||||
|
Options:
|
||||||
|
|
||||||
|
-d, --debug : Generate a name section to help debugging
|
||||||
|
|
||||||
|
|
||||||
uw8 filter-exports <infile> <outfile>
|
uw8 filter-exports <infile> <outfile>
|
||||||
|
|
||||||
Reads a binary WebAssembly module, removes all exports not used by the MicroW8 platform + everything that is unreachable without those exports and writes the resulting module to <outfile>.
|
Reads a binary WebAssembly module, removes all exports not used by the MicroW8 platform + everything that is unreachable without those exports and writes the resulting module to <outfile>.
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
clang -O2 -Wno-incompatible-library-redeclaration --no-standard-libraries -ffast-math -Xclang -target-feature -Xclang +nontrapping-fptoint -Wl,--no-entry -Wl,--export-all -Wl,--import-memory -Wl,--initial-memory=262144 -Wl,-zstack-size=90000 -o cart.wasm cart.c --target=wasm32 && \
|
clang -O2 -Wno-incompatible-library-redeclaration --no-standard-libraries -ffast-math -Xclang -target-feature -Xclang +nontrapping-fptoint -Wl,--no-entry,--export-all,--import-memory,--initial-memory=262144,--global-base=81920,-zstack-size=4096 -o cart.wasm cart.c --target=wasm32 && \
|
||||||
uw8 filter-exports cart.wasm cart.wasm && \
|
uw8 filter-exports cart.wasm cart.wasm && \
|
||||||
wasm-opt -Oz --fast-math --strip-producers -o cart.wasm cart.wasm && \
|
wasm-opt -Oz --fast-math --strip-producers -o cart.wasm cart.wasm && \
|
||||||
uw8 pack -l 9 cart.wasm cart.uw8
|
uw8 pack -l 9 cart.wasm cart.uw8
|
||||||
@@ -15,11 +15,14 @@ The initial motivation behind MicroW8 was to explore whether there was a way to
|
|||||||
* Gamepad input (D-Pad + 4 Buttons)
|
* Gamepad input (D-Pad + 4 Buttons)
|
||||||
|
|
||||||
## Examples
|
## Examples
|
||||||
* [Fireworks](v0.1pre5#AgwvgP+M59snqjl4CMKw5sqm1Zw9yJCbSviMjeLUdHus2a3yl/a99+uiBeqZgP/2jqSjrLjRk73COMM6OSLpsxK8ugT1kuk/q4hQUqqPpGozHoa0laulzGGcahzdfdJsYaK1sIdeIYS9M5PnJx/Wk9H+PvWEPy2Zvv7I6IW7Fg==) (127 bytes): Some fireworks to welcome 2022.
|
* [Fireworks](v0.1.1#AgwvgP+M59snqjl4CMKw5sqm1Zw9yJCbSviMjeLUdHus2a3yl/a99+uiBeqZgP/2jqSjrLjRk73COMM6OSLpsxK8ugT1kuk/q4hQUqqPpGozHoa0laulzGGcahzdfdJsYaK1sIdeIYS9M5PnJx/Wk9H+PvWEPy2Zvv7I6IW7Fg==) (127 bytes): Some fireworks to welcome 2022.
|
||||||
* [Skip Ahead](v0.1pre5#AgyfpZ80wkW28kiUZ9VIK4v+RPnVxqjK1dz2BcDoNyQPsS2g4OgEzkTe6jyoAfFOmqKrS8SM2aRljBal9mjNn8i4fP9eBK+RehQKxxGtJa9FqftvqEnh3ez1YaYxqj7jgTdzJ/WAYVmKMovBT1myrX3FamqKSOgMsNedLhVTLAhQup3sNcYEjGNo8b0HZ5+AgMgCwYRGCe//XQOMAaAAzqDILgmpEZ/43RKHcQpHEQwbURfNQJpadJe2sz3q5FlQnTGXQ9oSMokidhlC+aR/IpNHieuBGLhFZ2GfnwVQ0geBbQpTPA==) (229 bytes): A port of my [TIC-80 256byte game](http://tic80.com/play?cart=1735) from LoveByte'21
|
* [Skip Ahead](v0.1.1#AgyfpZ80wkW28kiUZ9VIK4v+RPnVxqjK1dz2BcDoNyQPsS2g4OgEzkTe6jyoAfFOmqKrS8SM2aRljBal9mjNn8i4fP9eBK+RehQKxxGtJa9FqftvqEnh3ez1YaYxqj7jgTdzJ/WAYVmKMovBT1myrX3FamqKSOgMsNedLhVTLAhQup3sNcYEjGNo8b0HZ5+AgMgCwYRGCe//XQOMAaAAzqDILgmpEZ/43RKHcQpHEQwbURfNQJpadJe2sz3q5FlQnTGXQ9oSMokidhlC+aR/IpNHieuBGLhFZ2GfnwVQ0geBbQpTPA==) (229 bytes): A port of my [TIC-80 256byte game](http://tic80.com/play?cart=1735) from LoveByte'21
|
||||||
* [OhNoAnotherTunnel](v0.1pre4#Ag95rdCB5Ww5NofyQaKF4P1mrNRso4azgiem4hK99Gh8OMzSpFq3NsNDo7O7pqln10D11l9uXr/ritw7OEzKwbEfCdvaRnS2Z0Kz0iDEZt/gIqOdvFmxsL1MjPQ4XInPbUJpQUonhQq29oP2omFabnQxn0bzoK7mZjcwc5GetHG+hGajkJcRr8oOnjfCol8RD+ha33GYtPnut+GLe4ktzf5UxZwGs6oT9qqC61lRDakN) (177 bytes): A port of my [entry](http://tic80.com/play?cart=1871) in the Outline'21 bytebattle final
|
* [OhNoAnotherTunnel](v0.1.1#AgPP1oEFvPzY/rBZwTumtYn37zeMFgpir1Bkn91jsNcp26VzoUpkAOOJTtnzVBfW+/dGnnIdbq/irBUJztY5wuua80DORTYZndgdwZHcSk15ajc4nyO0g1A6kGWyW56oZk0iPYJA9WtUmoj0Plvy1CGwIZrMe57X7QZcdqc3u6zjTA41Tpiqi9vnO3xbhi8o594Vx0XPXwVzpYq1ZCTYenfAGaXKkDmAFJqiVIsiCg==) (175 bytes): A port of my [entry](http://tic80.com/play?cart=1871) in the Outline'21 bytebattle final
|
||||||
* [Technotunnel](v0.1pre4#AqL8HeK1M9dn2nWNIF5vaq/Vh64pMt5nJIFoFKpBMPUsGtDtpqjo1JbT9LzPhAxCqJ7Yh4TA6oTGd4xhLowf+cWZMY73+7AZmfXJJsBi4cej/hH+4wlAgxFIrnOYnr/18IpnZbsHf0eGm1BhahX74+cVR0TRmNQmYC7GhCNS3mv/3MJn74lCj7t28aBJPjEZhP9fGXdG2u5Egh/Tjdg=) (158 bytes): A port of my [entry](https://tic80.com/play?cart=1873) in the Outline'21 bytebattle quater final
|
* [Technotunnel](v0.1.1#AhPXpq894LaUhp5+HQf39f39/Jc8g5zUrBSc0uyKh36ivskczhY84h55zL8gWpkdvKuRQI+KIt80isKzh8jkM8nILcx0RUvyk8yjE8TgNsgkcORVI0RY5k3qE4ySjaycxa2DVZH61UWZuLsCouuwT7I80TbmmetQSbMywJ/avrrCZIAH0UzQfvOiCJNG48NI0FFY1vjB7a7dcp8Uqg==) (157 bytes): A port of my [entry](https://tic80.com/play?cart=1873) in the Outline'21 bytebattle quater final
|
||||||
* [Font & Palette](v0.1pre4#AgKaeeOuwg5gCKvFIeiitEwMpUI2rymEcu+DDB1vMu9uBoufvUxIr4Y5p4Jj2ukoNO4PE7QS5cN1ZyDMCRfSzYIGZxKlN2J6NKEWK7KVPk9wVUgn1Ip+hsMinWgEO8ETKfPuHoIa4kjI+ULFOMad7vd3rt/lh1Vy9w+R2MXG/7T61d3c7C6KY+eQNS0eW3ys4iU8R6SycuWZuuZ2Sg3Qxp826s+Kt+2qBojpzNOSoyFqyrVyYMTKEkSl0BZOj59Cs1hPm5bq0F1MmVhGAzMhW9V4YeAe): Just a simple viewer for the default font and palette.
|
* [Font & Palette](v0.1.1#At/p39+IBnj6ry1TRe7jzVy2A4tXgBvmoW2itzoyF2aM28pGy5QDiKxqrk8l9sbWZLtnAb+jgOfU+9QhpuyCAkhN6gPOU481IUL/df96vNe3h288Dqwhd3sfFpothIVFsMwRK72kW2hiR7zWsaXyy5pNmjR6BJk4piWx9ApT1ZwoUajhk6/zij6itq/FD1U3jj/J3MOwqZ2ef8Bv6ZPQlJIYVf62icGa69wS6SI1qBpIFiF14F8PcztRVbKIxLpT4ArCS6nz6FPnyUkqATGSBNPJ): Just a simple viewer for the default font and palette.
|
||||||
|
|
||||||
|
Examplers for older versions:
|
||||||
|
|
||||||
* [Technotunnel B/W](v0.1pre2#AQrDAQHAAQIBfwp9A0AgAUEAsiABQcACb7JDmhkgQ5MiBCAEIASUIAFBwAJtQfgAa7IiBSAFlJKRIgaVIgcgByAAskHQD7KVIgIQAEPNzEw/lCIDlCAHIAeUIAOUIAOUQQGykiADIAOUk5GSIgiUIAOTQQqylCACkiIJqCAFIAaVIAiUQQqylCACkiIKqHMgCEEyspQgBpUiCyACkkEUspSocUEFcbJBArIgC5OUQRaylJeoOgB4IAFBAWoiAUGA2ARIDQALCw==) (199 bytes uncompressed): A port of my [entry](https://tic80.com/play?cart=1873) in the Outline'21 bytebattle quater final (older MicroW8 version with monochrome palette)
|
* [Technotunnel B/W](v0.1pre2#AQrDAQHAAQIBfwp9A0AgAUEAsiABQcACb7JDmhkgQ5MiBCAEIASUIAFBwAJtQfgAa7IiBSAFlJKRIgaVIgcgByAAskHQD7KVIgIQAEPNzEw/lCIDlCAHIAeUIAOUIAOUQQGykiADIAOUk5GSIgiUIAOTQQqylCACkiIJqCAFIAaVIAiUQQqylCACkiIKqHMgCEEyspQgBpUiCyACkkEUspSocUEFcbJBArIgC5OUQRaylJeoOgB4IAFBAWoiAUGA2ARIDQALCw==) (199 bytes uncompressed): A port of my [entry](https://tic80.com/play?cart=1873) in the Outline'21 bytebattle quater final (older MicroW8 version with monochrome palette)
|
||||||
* [XorScroll](v0.1pre2#AQovAS0BAX8DQCABIAFBwAJvIABBCm1qIAFBwAJtczoAeCABQQFqIgFBgNgESA0ACws=) (50 bytes uncompressed): A simple scrolling XOR pattern. Fun fact: This is the pre-loaded effect when entering a bytebattle.
|
* [XorScroll](v0.1pre2#AQovAS0BAX8DQCABIAFBwAJvIABBCm1qIAFBwAJtczoAeCABQQFqIgFBgNgESA0ACws=) (50 bytes uncompressed): A simple scrolling XOR pattern. Fun fact: This is the pre-loaded effect when entering a bytebattle.
|
||||||
* [CircleWorm](v0.1pre2#AQp7AXkCAX8CfUEgEA0DQCABskEEspUiAkECspUgALJBiCeylSIDQQWylJIQAEEBspJBoAGylCACQQOylSADQQSylJIQAEEBspJB+ACylCADQRGylCACQQKylJIQAEECspJBELKUIAFBAmxBP2oQEiABQQFqIgFBP0gNAAsL) (126 bytes uncompressed): Just a test for the circle fill function.
|
* [CircleWorm](v0.1pre2#AQp7AXkCAX8CfUEgEA0DQCABskEEspUiAkECspUgALJBiCeylSIDQQWylJIQAEEBspJBoAGylCACQQOylSADQQSylJIQAEEBspJB+ACylCADQRGylCACQQKylJIQAEECspJBELKUIAFBAmxBP2oQEiABQQFqIgFBP0gNAAsL) (126 bytes uncompressed): Just a test for the circle fill function.
|
||||||
|
|||||||
+35
-4
@@ -105,7 +105,7 @@ as a cheap random-access PRNG (aka noise function).
|
|||||||
|
|
||||||
## Graphics
|
## Graphics
|
||||||
|
|
||||||
The default palette can be seen [here](../v0.1pre4#AgKaeeOuwg5gCKvFIeiitEwMpUI2rymEcu+DDB1vMu9uBoufvUxIr4Y5p4Jj2ukoNO4PE7QS5cN1ZyDMCRfSzYIGZxKlN2J6NKEWK7KVPk9wVUgn1Ip+hsMinWgEO8ETKfPuHoIa4kjI+ULFOMad7vd3rt/lh1Vy9w+R2MXG/7T61d3c7C6KY+eQNS0eW3ys4iU8R6SycuWZuuZ2Sg3Qxp826s+Kt+2qBojpzNOSoyFqyrVyYMTKEkSl0BZOj59Cs1hPm5bq0F1MmVhGAzMhW9V4YeAe). (Press Z on the keyboard to switch to palette.)
|
The default palette can be seen [here](../v0.1.0#At/p39+IBnj6ry1TRe7jzVy2A4tXgBvmoW2itzoyF2aM28pGy5QDiKxqrk8l9sbWZLtnAb+jgOfU+9QhpuyCAkhN6gPOU481IUL/df96vNe3h288Dqwhd3sfFpothIVFsMwRK72kW2hiR7zWsaXyy5pNmjR6BJk4piWx9ApT1ZwoUajhk6/zij6itq/FD1U3jj/J3MOwqZ2ef8Bv6ZPQlJIYVf62icGa69wS6SI1qBpIFiF14F8PcztRVbKIxLpT4ArCS6nz6FPnyUkqATGSBNPJ). (Press Z on the keyboard to switch to palette.)
|
||||||
|
|
||||||
The palette can be changed by writing 32bit rgba colors to addresses 0x13000-0x13400.
|
The palette can be changed by writing 32bit rgba colors to addresses 0x13000-0x13400.
|
||||||
|
|
||||||
@@ -192,7 +192,7 @@ The integer time in milliseconds can also be read at address 0x40.
|
|||||||
|
|
||||||
## Text output
|
## Text output
|
||||||
|
|
||||||
The default font can be seen [here](../v0.1pre4#AgKaeeOuwg5gCKvFIeiitEwMpUI2rymEcu+DDB1vMu9uBoufvUxIr4Y5p4Jj2ukoNO4PE7QS5cN1ZyDMCRfSzYIGZxKlN2J6NKEWK7KVPk9wVUgn1Ip+hsMinWgEO8ETKfPuHoIa4kjI+ULFOMad7vd3rt/lh1Vy9w+R2MXG/7T61d3c7C6KY+eQNS0eW3ys4iU8R6SycuWZuuZ2Sg3Qxp826s+Kt+2qBojpzNOSoyFqyrVyYMTKEkSl0BZOj59Cs1hPm5bq0F1MmVhGAzMhW9V4YeAe).
|
The default font can be seen [here](../v0.1.0#At/p39+IBnj6ry1TRe7jzVy2A4tXgBvmoW2itzoyF2aM28pGy5QDiKxqrk8l9sbWZLtnAb+jgOfU+9QhpuyCAkhN6gPOU481IUL/df96vNe3h288Dqwhd3sfFpothIVFsMwRK72kW2hiR7zWsaXyy5pNmjR6BJk4piWx9ApT1ZwoUajhk6/zij6itq/FD1U3jj/J3MOwqZ2ef8Bv6ZPQlJIYVf62icGa69wS6SI1qBpIFiF14F8PcztRVbKIxLpT4ArCS6nz6FPnyUkqATGSBNPJ).
|
||||||
|
|
||||||
The font can be changed by writing 1bpp 8x8 characters to addresses 0x13400-0x13c00.
|
The font can be changed by writing 1bpp 8x8 characters to addresses 0x13400-0x13c00.
|
||||||
|
|
||||||
@@ -305,6 +305,27 @@ Options:
|
|||||||
* `-u`, `--uncompressed`: Use the uncompressed `uw8` format for packing.
|
* `-u`, `--uncompressed`: Use the uncompressed `uw8` format for packing.
|
||||||
* `-l LEVEL`, `--level LEVEL`: Compression level (0-9). Higher compression levels are really slow.
|
* `-l LEVEL`, `--level LEVEL`: Compression level (0-9). Higher compression levels are really slow.
|
||||||
|
|
||||||
|
## `uw8 unpack`
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
|
||||||
|
`uw8 unpack <infile> <outfile>`
|
||||||
|
|
||||||
|
Unpacks a MicroW8 module into a standard WebAssembly module.
|
||||||
|
|
||||||
|
## `uw8 compile`
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
|
||||||
|
`uw8 compile [<options>] <infile> <outfile>`
|
||||||
|
|
||||||
|
Compiles a [CurlyWas](https://github.com/exoticorn/curlywas) source file to a standard WebAssembly module. Most useful together with
|
||||||
|
the `--debug` option to get a module that works well in the Chrome debugger.
|
||||||
|
|
||||||
|
Options:
|
||||||
|
|
||||||
|
* `-d`, `--debug`: Generate a name section to help debugging
|
||||||
|
|
||||||
## `uw8 filter-exports`
|
## `uw8 filter-exports`
|
||||||
|
|
||||||
Usage:
|
Usage:
|
||||||
@@ -393,7 +414,12 @@ using a [custom LZ compression scheme](https://github.com/exoticorn/upkr).
|
|||||||
|
|
||||||
# The web runtime
|
# The web runtime
|
||||||
|
|
||||||
[...]
|
Load carts into the web runtime either by using the "Load cart..." button, or by dragging the file
|
||||||
|
onto the screen area.
|
||||||
|
|
||||||
|
## Input
|
||||||
|
|
||||||
|
For input, you can either use a standard gamepad or keyboard. On a keyboard use the arrow keys and the keys Z, X, A and S to emulate the A, B, X and Y buttons.
|
||||||
|
|
||||||
## Video recording
|
## Video recording
|
||||||
|
|
||||||
@@ -409,4 +435,9 @@ ffmpeg -i IN.webm -vf "scale=960:720:flags=neighbor,pad=1280:720:160:0" -r 60 OU
|
|||||||
|
|
||||||
## Screenshot
|
## Screenshot
|
||||||
|
|
||||||
Pressing F9 opens a download dialog with a screenshot.
|
Pressing F9 opens a download dialog with a screenshot.
|
||||||
|
|
||||||
|
## Devkit mode
|
||||||
|
|
||||||
|
Append `#devkit` to the web runtime url in order to switch to devkit mode. In devkit mode, standard web assembly modules
|
||||||
|
are loaded bypassing the loader, removing all size restrictions. At the same time, the memory limit is increased to 1GB.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
<!doctype html><html><head><meta charset="utf8"><title>MicroW8</title><link href="https://fonts.googleapis.com/css2?family=Josefin+Sans:wght@500&display=swap" rel="stylesheet"><style>body,canvas,html{margin:0;padding:0}html{background-color:#202024;color:#808070;font-family:Josefin Sans,Verdana,Arial Black,sans-serif}body,html{height:100%}body{display:grid;grid-template-rows:1fr 0fr}#uw8{position:absolute}#uw8 a{font-size:130%}#centered{align-self:center;justify-self:center}a{color:#303630}a:hover{color:#405040}#screen{background-color:#202428;border:4px solid #303040;box-shadow:5px 5px 20px #000;cursor:none;height:240px;image-rendering:pixelated;margin-bottom:8px;width:320px}#timer:before{background-color:red;border-radius:6px;content:"";display:inline-block;height:12px;margin-right:3px;width:12px}#message{margin-bottom:8px}.error{color:#e04030}button{background-color:#303440;border:1px solid #404040;border-radius:4px;color:#808070;font-family:inherit;padding:4px}button:hover{background-color:#202010}button:active{background-color:#504450}@media (min-width:680px) and (min-height:620px){#screen{height:480px;width:640px}}@media (min-width:1000px) and (min-height:800px){#screen{height:720px;width:960px}}@media (width:640px) and (height:480px){#screen{border:0;height:480px;margin:0;width:640px}body{overflow:hidden}}</style></head><body> <div id="uw8"> <a href="https://exoticorn.github.io/microw8">MicroW8</a> 0.1.1 </div> <div id="centered"> <canvas id="screen" width="320" height="240"> </canvas> <div id="timer" hidden></div> <div id="message"></div> <button id="cartButton" style="visibility:hidden">Load cart...</button> </div> <div id="footer"> <a href="http://unlicense.org/" ref="license">Unlicense</a> </div> </body><script type="module">function e(e){return e&&e.__esModule?e.default:e}function A(e,A){let t=e?`${e} bytes`:"Insert cart";A&&(t+=` - <span class="error">${A.replaceAll("<","<")}</span>`),document.getElementById("message").innerHTML=t}let t,a,n,r,B,o=document.getElementById("screen"),i=o.getContext("2d"),s=i.createImageData(320,240),l=e=>new Uint8Array(e),c=e=>new Uint32Array(e),F=0,Q=e=>{let A,t="keydown"==e.type;switch(e.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":t&&f(n,!0);break;case"F9":t&&o.toBlob((e=>{E(e,".png")})),e.preventDefault();break;case"F10":t&&function(){if(r)return r.stop(),void(r=null);r=new MediaRecorder(o.captureStream(),{mimeType:"video/webm",videoBitsPerSecond:25e6});let e=[];r.ondataavailable=A=>{e.push(A.data)};let A=document.getElementById("timer");function t(){if(!B)return;let e=Math.floor((Date.now()-B)/1e3);A.innerText=Math.floor(e/60).toString().padStart(2,"0")+":"+(e%60).toString().padStart(2,"0"),setTimeout(t,1e3)}A.hidden=!1,A.innerText="00:00",r.onstop=()=>{A.hidden=!0,E(new Blob(e,{type:"video/webm"}),".webm")},r.start(),B=Date.now(),setTimeout(t,1e3)}(),e.preventDefault()}t?F|=A:F&=~A};async function f(r,B){a&&(a(),a=null);let Q=r.byteLength;if(A(Q),0==Q)return;n=r;let E=window.location.pathname;if(Q<=1024&&!B){let e="";for(let A of l(r))e+=String.fromCharCode(A);E+="#"+btoa(e),E!=window.location.pathname+window.location.hash&&history.pushState(null,null,E)}o.width=o.width;try{let B={initial:4};t||(B.maximum=4);let o,E=new WebAssembly.Memory({initial:4,maximum:t?16:4}),g=l(E.buffer),w={env:{memory:E}},I=e=>{if(o&&(!t||0!=l(e)[0])){g.set(l(e));let A=o.exports.load_uw8(e.byteLength);e=new ArrayBuffer(A),l(e).set(g.slice(0,A))}return e},d=async e=>(await WebAssembly.instantiate(e,w)).instance,h=async e=>d(I(await(await fetch(e)).arrayBuffer()));o=await h(e("data:application/wasm;base64,AGFzbQEAAAABFQRgAX8Bf2ACf38Bf2ADf39%2FAGAAAAIPAQNlbnYGbWVtb3J5AgAEAwkIAAABAgEAAAMGEAN%2FAUEAC38BQQALfwFBAAsHGQIIbG9hZF91dzgAAAp1bmNvbXByZXNzAAQIAQcKngUIxwEBB39BAC0AAEEBayIBQQBIBEAgAA8LQYDAByAAaiECIAFBAXEEQEEBQYHABxAEIQIFQYDAB0EAIAAQAwtBAEGAhA9BCBADQYiEDyEDQQghBEGBwAchBQNAIAUgAkggAyMATiAFLQAAIAMtAABMcnEEQCAEIAQgBRACIgZqIQQgAyMASCAFLQAAIAMtAABGcQRAIAMgAxABaiEDCyAFIAZqIQUMAQsgAyMASARAIAQgBCADEAIiB2ohBCADIAdqIQMMAQsLIAQLPAEEfyAAIQEDQCACIAFBAWoiAS0AACIEQf8AcSADdHIhAiADQQdqIQMgBEEHdQ0ACyABQQFqIABrIAJqCxIBAX8gACABIAEQASICEAMgAgskAANAIAJBAEoEQCAAIAJBAWsiAmogASACai0AADoAAAwBCwsLqQEBBn8gACQBQQAkAgNAIANBgAE6AICADyADQQFqIgNBgQNIDQALAkADQEEAEAYiBQRAIAQEf0EBBUGAAhAGCwRAQYECEAVBAWsiAkUNAwtBwQIQBSEGA0AgASABIAJrLQAAOgAAIAFBAWohASAGQQFrIgYNAAsFQQEhBwNAIAdBAXQgBxAGciIHQYACSA0ACyABIAc6AAAgAUEBaiEBCyAFIQQMAAsLIAELNAECfwNAIAAgAmoQBgRAIAEgACACakEgahAGIAJ0ciEBIAJBAWohAgwBCwsgAUEBIAJ0cgtxAQR%2FA0AjAkGAIEgEQCMCQQh0IwEtAAByJAIjAUEBaiQBDAELCyMCQf8BcSICIAAtAICADyIBIwJBCHUiA2xBgAIgAWsgA2wgAWsgAiABSCIEG2okAiAAIAFBByAEQYECbGogAWtBBHVqOgCAgA8gBAsMAEEAQYCEDxAEJAALC9IDAQBBAAvLA6eP%2Fw9olPgPXPcNZ6GH4sK0YVAeGZhY8FzSxDxK%2Fvv32QOMdeZ4QLHNI9NAW9hr%2B1lpXqgkXw%2FZJ2xueSKrTWbsgq9bIaIhjByG5VC2EE%2Bp0mUsRwQzi7oRDC02b4ywHappXJZHhDLuZKhnjylLE4X%2F9%2FZ66bwxYl1h%2Line truncated
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
<section>
|
<section>
|
||||||
<h1 class="text-center heading-text">A WebAssembly based fantasy console</h1>
|
<h1 class="text-center heading-text">A WebAssembly based fantasy console</h1>
|
||||||
</section>
|
</section>
|
||||||
<a href="v0.1.0">
|
<a href="v0.1.1">
|
||||||
<img class="demonstration-gif" style="width:640px;height:480px;image-rendering:pixelated" src="img/technotunnel.png"></img>
|
<img class="demonstration-gif" style="width:640px;height:480px;image-rendering:pixelated" src="img/technotunnel.png"></img>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
+26
@@ -20,6 +20,8 @@ fn main() -> Result<()> {
|
|||||||
}
|
}
|
||||||
Some("run") => run(args),
|
Some("run") => run(args),
|
||||||
Some("pack") => pack(args),
|
Some("pack") => pack(args),
|
||||||
|
Some("unpack") => unpack(args),
|
||||||
|
Some("compile") => compile(args),
|
||||||
Some("filter-exports") => filter_exports(args),
|
Some("filter-exports") => filter_exports(args),
|
||||||
Some("help") | None => {
|
Some("help") | None => {
|
||||||
println!("uw8 {}", env!("CARGO_PKG_VERSION"));
|
println!("uw8 {}", env!("CARGO_PKG_VERSION"));
|
||||||
@@ -27,6 +29,8 @@ fn main() -> Result<()> {
|
|||||||
println!("Usage:");
|
println!("Usage:");
|
||||||
println!(" uw8 run [-t/--timeout <frames>] [-w/--watch] [-p/--pack] [-u/--uncompressed] [-l/--level] [-o/--output <out-file>] <file>");
|
println!(" uw8 run [-t/--timeout <frames>] [-w/--watch] [-p/--pack] [-u/--uncompressed] [-l/--level] [-o/--output <out-file>] <file>");
|
||||||
println!(" uw8 pack [-u/--uncompressed] [-l/--level] <in-file> <out-file>");
|
println!(" uw8 pack [-u/--uncompressed] [-l/--level] <in-file> <out-file>");
|
||||||
|
println!(" uw8 unpack <in-file> <out-file>");
|
||||||
|
println!(" uw8 compile [-d/--debug] <in-file> <out-file>");
|
||||||
println!(" uw8 filter-exports <in-wasm> <out-wasm>");
|
println!(" uw8 filter-exports <in-wasm> <out-wasm>");
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -166,6 +170,28 @@ fn pack(mut args: Arguments) -> Result<()> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn unpack(mut args: Arguments) -> Result<()> {
|
||||||
|
let in_file = args.free_from_os_str::<PathBuf, bool>(|s| Ok(s.into()))?;
|
||||||
|
let out_file = args.free_from_os_str::<PathBuf, bool>(|s| Ok(s.into()))?;
|
||||||
|
|
||||||
|
uw8_tool::unpack_file(&in_file, &out_file).into()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn compile(mut args: Arguments) -> Result<()> {
|
||||||
|
let mut options = curlywas::Options::default();
|
||||||
|
if args.contains(["-d", "--debug"]) {
|
||||||
|
options = options.with_debug();
|
||||||
|
}
|
||||||
|
|
||||||
|
let in_file = args.free_from_os_str::<PathBuf, bool>(|s| Ok(s.into()))?;
|
||||||
|
let out_file = args.free_from_os_str::<PathBuf, bool>(|s| Ok(s.into()))?;
|
||||||
|
|
||||||
|
let module = curlywas::compile_file(in_file, options)?;
|
||||||
|
File::create(out_file)?.write_all(&module)?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
fn filter_exports(mut args: Arguments) -> Result<()> {
|
fn filter_exports(mut args: Arguments) -> Result<()> {
|
||||||
let in_file = args.free_from_os_str::<PathBuf, bool>(|s| Ok(s.into()))?;
|
let in_file = args.free_from_os_str::<PathBuf, bool>(|s| Ok(s.into()))?;
|
||||||
let out_file = args.free_from_os_str::<PathBuf, bool>(|s| Ok(s.into()))?;
|
let out_file = args.free_from_os_str::<PathBuf, bool>(|s| Ok(s.into()))?;
|
||||||
|
|||||||
+1
-1
@@ -10,7 +10,7 @@
|
|||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="uw8">
|
<div id="uw8">
|
||||||
<a href="https://exoticorn.github.io/microw8">MicroW8</a> 0.1.0
|
<a href="https://exoticorn.github.io/microw8">MicroW8</a> 0.1.1
|
||||||
</div>
|
</div>
|
||||||
<div id="centered">
|
<div id="centered">
|
||||||
<canvas id="screen" width="320" height="240">
|
<canvas id="screen" width="320" height="240">
|
||||||
|
|||||||
+15
-4
@@ -13,6 +13,8 @@ let screen = document.getElementById('screen');
|
|||||||
let canvasCtx = screen.getContext('2d');
|
let canvasCtx = screen.getContext('2d');
|
||||||
let imageData = canvasCtx.createImageData(320, 240);
|
let imageData = canvasCtx.createImageData(320, 240);
|
||||||
|
|
||||||
|
let devkitMode;
|
||||||
|
|
||||||
let cancelFunction;
|
let cancelFunction;
|
||||||
|
|
||||||
let currentData;
|
let currentData;
|
||||||
@@ -51,7 +53,7 @@ let keyHandler = (e) => {
|
|||||||
break;
|
break;
|
||||||
case 'KeyR':
|
case 'KeyR':
|
||||||
if (isKeyDown) {
|
if (isKeyDown) {
|
||||||
runModule(currentData);
|
runModule(currentData, true);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'F9':
|
case 'F9':
|
||||||
@@ -110,7 +112,11 @@ async function runModule(data, keepUrl) {
|
|||||||
screen.width = screen.width;
|
screen.width = screen.width;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
let memory = new WebAssembly.Memory({ initial: 4, maximum: 4 });
|
let memSize = { initial: 4 };
|
||||||
|
if(!devkitMode) {
|
||||||
|
memSize.maximum = 4;
|
||||||
|
}
|
||||||
|
let memory = new WebAssembly.Memory({ initial: 4, maximum: devkitMode ? 16 : 4 });
|
||||||
let memU8 = U8(memory.buffer);
|
let memU8 = U8(memory.buffer);
|
||||||
|
|
||||||
let importObject = {
|
let importObject = {
|
||||||
@@ -122,7 +128,7 @@ async function runModule(data, keepUrl) {
|
|||||||
let loader;
|
let loader;
|
||||||
|
|
||||||
let loadModuleData = (data) => {
|
let loadModuleData = (data) => {
|
||||||
if (U8(data)[0] != 0) {
|
if (loader && (!devkitMode || U8(data)[0] != 0)) {
|
||||||
memU8.set(U8(data));
|
memU8.set(U8(data));
|
||||||
let length = loader.exports.load_uw8(data.byteLength);
|
let length = loader.exports.load_uw8(data.byteLength);
|
||||||
data = new ArrayBuffer(length);
|
data = new ArrayBuffer(length);
|
||||||
@@ -293,11 +299,16 @@ async function runModuleFromURL(url, keepUrl) {
|
|||||||
if(type && type.includes('html')) {
|
if(type && type.includes('html')) {
|
||||||
throw false;
|
throw false;
|
||||||
}
|
}
|
||||||
runModule(await response.arrayBuffer(), keepUrl);
|
runModule(await response.arrayBuffer(), keepUrl || devkitMode);
|
||||||
}
|
}
|
||||||
|
|
||||||
function runModuleFromHash() {
|
function runModuleFromHash() {
|
||||||
let hash = window.location.hash.slice(1);
|
let hash = window.location.hash.slice(1);
|
||||||
|
if(hash == 'devkit') {
|
||||||
|
devkitMode = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
devkitMode = false;
|
||||||
if (hash.length > 0) {
|
if (hash.length > 0) {
|
||||||
if (hash.startsWith("url=")) {
|
if (hash.startsWith("url=")) {
|
||||||
runModuleFromURL(hash.slice(4), true);
|
runModuleFromURL(hash.slice(4), true);
|
||||||
|
|||||||
Reference in new issue
Block a user