From c90bc1318a895742d1ec8a8103044d43fab380f4 Mon Sep 17 00:00:00 2001 From: Milky2018 <842376130@qq.com> Date: Thu, 12 Nov 2026 20:13:35 +0800 Subject: [PATCH 1/3] Embed example assets at build time and expose asset catalogues --- .github/workflows/deploy.yaml | 2 +- .gitignore | 3 +- docs/CHANGELOG.md | 6 ++ docs/tutorial-en.md | 1 - docs/tutorial-zh.md | 1 - .../cards/assets/cards/assets-manifest.json | 55 ----------- examples/cards/embedded_assets/assets.mbt | 66 +++++++++++++ examples/cards/embedded_assets/moon.pkg | 59 +++++++++++ .../cards/embedded_assets/pkg.generated.mbti | 76 +++++++++++++++ examples/cards/index.html | 1 - examples/cards/main.mbt | 1 + examples/cards/moon.pkg | 1 + examples/moon.mod | 1 - examples/pixeladventure/asset_io_support.mbt | 33 +------ .../pixeladventure/assets-manifest.json | 20 ---- .../pixeladventure/embedded_assets/assets.mbt | 82 ++++++++++++++++ .../pixeladventure/embedded_assets/moon.pkg | 24 +++++ .../embedded_assets/pkg.generated.mbti | 97 +++++++++++++++++++ examples/pixeladventure/main.mbt | 1 + examples/pixeladventure/moon.pkg | 2 +- examples/preload-assets.js | 90 ----------------- .../assets/survivors/assets-manifest.json | 28 ------ examples/survivors/embedded_assets/assets.mbt | 71 ++++++++++++++ examples/survivors/embedded_assets/moon.pkg | 31 ++++++ .../embedded_assets/pkg.generated.mbti | 68 +++++++++++++ examples/survivors/index.html | 1 - examples/survivors/main.mbt | 1 + examples/survivors/moon.pkg | 1 + selene-core/moon.mod | 1 - selene-core/src/asset/io.mbt | 12 ++- selene-core/src/asset/io_test.mbt | 17 ++++ selene-core/src/asset/pkg.generated.mbti | 4 +- selene-core/src/platform_asset_io/default.mbt | 14 ++- selene-core/src/platform_asset_io/pkg.mbti | 4 +- selene-core/src/tiled/moon.pkg | 1 - selene-core/src/tiled/tiled_wbtest.mbt | 43 +++++++- selene-core/src/tiled/world.mbt | 27 ++++-- selene-webgpu/README.md | 23 +++++ selene-webgpu/src/embedded_assets.mbt | 32 ++++++ selene-webgpu/src/embedded_assets_wbtest.mbt | 42 ++++++++ selene-webgpu/src/js_canvas_api.mbt | 7 +- selene-webgpu/src/js_platform_io.mbt | 2 +- selene-webgpu/src/moon.pkg | 1 + selene-webgpu/src/pkg.generated.mbti | 4 +- .../src/platform_asset_io/asset_io.mbt | 12 ++- 45 files changed, 815 insertions(+), 254 deletions(-) delete mode 100644 examples/cards/assets/cards/assets-manifest.json create mode 100644 examples/cards/embedded_assets/assets.mbt create mode 100644 examples/cards/embedded_assets/moon.pkg create mode 100644 examples/cards/embedded_assets/pkg.generated.mbti delete mode 100644 examples/pixeladventure/assets/pixeladventure/assets-manifest.json create mode 100644 examples/pixeladventure/embedded_assets/assets.mbt create mode 100644 examples/pixeladventure/embedded_assets/moon.pkg create mode 100644 examples/pixeladventure/embedded_assets/pkg.generated.mbti delete mode 100644 examples/preload-assets.js delete mode 100644 examples/survivors/assets/survivors/assets-manifest.json create mode 100644 examples/survivors/embedded_assets/assets.mbt create mode 100644 examples/survivors/embedded_assets/moon.pkg create mode 100644 examples/survivors/embedded_assets/pkg.generated.mbti create mode 100644 selene-core/src/asset/io_test.mbt create mode 100644 selene-webgpu/src/embedded_assets.mbt create mode 100644 selene-webgpu/src/embedded_assets_wbtest.mbt diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index b25e651f..5f56c4c1 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -36,7 +36,7 @@ jobs: mkdir -p "$site" cp page/index.html "$site/index.html" cp -R --parents \ - examples/index.html examples/preload-assets.js \ + examples/index.html \ examples/*/index.html examples/*/screenshot.png examples/*/assets \ _build/js/release/build/Milky2018/selene-examples-web/*/web/web.js \ "$site" diff --git a/.gitignore b/.gitignore index a8a38758..ba1daceb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,11 @@ .DS_Store __pycache__/ page/examples/ -page/preload-assets.js page/assets/ todo.md .mooncakes/ _build/ target + +examples/*/embedded_assets/*.g.mbt diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 6a7361da..3aeeb866 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -4,6 +4,9 @@ ### Added +- Expose registered asset paths for Tiled world pattern discovery without host + directory scans. + - Add `Query::set(entity, row)` for World-bound point writes that preserve component layouts and iterator validity and reject non-matching rows. @@ -48,6 +51,9 @@ ### Changed +- Embed example game assets with `moonbit-community/embed` through `dev_build` + and route WebGPU image, font, and audio loading through the embedded data. + Remove the network preloader, asset manifests, and `moonbitlang/x` dependency. - Migrate ordinary gameplay, UI, camera, firing, collision-event, and animation helpers in Cards, Pixel Adventure, and Survivors to injected queries, resources, Commands, and clocks. Private named parameter views combine diff --git a/docs/tutorial-en.md b/docs/tutorial-en.md index d18d510a..a18a096e 100644 --- a/docs/tutorial-en.md +++ b/docs/tutorial-en.md @@ -111,7 +111,6 @@ import { "Milky2018/selene/transform", "Milky2018/selene/ui", "moonbitlang/core/json", - "moonbitlang/x/fs", } ``` diff --git a/docs/tutorial-zh.md b/docs/tutorial-zh.md index cef33545..d6f583ab 100644 --- a/docs/tutorial-zh.md +++ b/docs/tutorial-zh.md @@ -111,7 +111,6 @@ import { "Milky2018/selene/transform", "Milky2018/selene/ui", "moonbitlang/core/json", - "moonbitlang/x/fs", } ``` diff --git a/examples/cards/assets/cards/assets-manifest.json b/examples/cards/assets/cards/assets-manifest.json deleted file mode 100644 index 2af0f322..00000000 --- a/examples/cards/assets/cards/assets-manifest.json +++ /dev/null @@ -1,55 +0,0 @@ -[ - "10-C.png", - "10-D.png", - "10-H.png", - "10-S.png", - "2-C.png", - "2-D.png", - "2-H.png", - "2-S.png", - "3-C.png", - "3-D.png", - "3-H.png", - "3-S.png", - "4-C.png", - "4-D.png", - "4-H.png", - "4-S.png", - "5-C.png", - "5-D.png", - "5-H.png", - "5-S.png", - "6-C.png", - "6-D.png", - "6-H.png", - "6-S.png", - "7-C.png", - "7-D.png", - "7-H.png", - "7-S.png", - "8-C.png", - "8-D.png", - "8-H.png", - "8-S.png", - "9-C.png", - "9-D.png", - "9-H.png", - "9-S.png", - "A-C.png", - "A-D.png", - "A-H.png", - "A-S.png", - "J-C.png", - "J-D.png", - "J-H.png", - "J-S.png", - "K-C.png", - "K-D.png", - "K-H.png", - "K-S.png", - "Q-C.png", - "Q-D.png", - "Q-H.png", - "Q-S.png", - "ThaleahFat.ttf" -] diff --git a/examples/cards/embedded_assets/assets.mbt b/examples/cards/embedded_assets/assets.mbt new file mode 100644 index 00000000..33c12d27 --- /dev/null +++ b/examples/cards/embedded_assets/assets.mbt @@ -0,0 +1,66 @@ +///| +let catalogue : Map[String, Bytes] = Map([ + ("assets/cards/10-C.png", assets.cards.v_10_c_png), + ("assets/cards/10-D.png", assets.cards.v_10_d_png), + ("assets/cards/10-H.png", assets.cards.v_10_h_png), + ("assets/cards/10-S.png", assets.cards.v_10_s_png), + ("assets/cards/2-C.png", assets.cards.v_2_c_png), + ("assets/cards/2-D.png", assets.cards.v_2_d_png), + ("assets/cards/2-H.png", assets.cards.v_2_h_png), + ("assets/cards/2-S.png", assets.cards.v_2_s_png), + ("assets/cards/3-C.png", assets.cards.v_3_c_png), + ("assets/cards/3-D.png", assets.cards.v_3_d_png), + ("assets/cards/3-H.png", assets.cards.v_3_h_png), + ("assets/cards/3-S.png", assets.cards.v_3_s_png), + ("assets/cards/4-C.png", assets.cards.v_4_c_png), + ("assets/cards/4-D.png", assets.cards.v_4_d_png), + ("assets/cards/4-H.png", assets.cards.v_4_h_png), + ("assets/cards/4-S.png", assets.cards.v_4_s_png), + ("assets/cards/5-C.png", assets.cards.v_5_c_png), + ("assets/cards/5-D.png", assets.cards.v_5_d_png), + ("assets/cards/5-H.png", assets.cards.v_5_h_png), + ("assets/cards/5-S.png", assets.cards.v_5_s_png), + ("assets/cards/6-C.png", assets.cards.v_6_c_png), + ("assets/cards/6-D.png", assets.cards.v_6_d_png), + ("assets/cards/6-H.png", assets.cards.v_6_h_png), + ("assets/cards/6-S.png", assets.cards.v_6_s_png), + ("assets/cards/7-C.png", assets.cards.v_7_c_png), + ("assets/cards/7-D.png", assets.cards.v_7_d_png), + ("assets/cards/7-H.png", assets.cards.v_7_h_png), + ("assets/cards/7-S.png", assets.cards.v_7_s_png), + ("assets/cards/8-C.png", assets.cards.v_8_c_png), + ("assets/cards/8-D.png", assets.cards.v_8_d_png), + ("assets/cards/8-H.png", assets.cards.v_8_h_png), + ("assets/cards/8-S.png", assets.cards.v_8_s_png), + ("assets/cards/9-C.png", assets.cards.v_9_c_png), + ("assets/cards/9-D.png", assets.cards.v_9_d_png), + ("assets/cards/9-H.png", assets.cards.v_9_h_png), + ("assets/cards/9-S.png", assets.cards.v_9_s_png), + ("assets/cards/A-C.png", assets.cards.a_c_png), + ("assets/cards/A-D.png", assets.cards.a_d_png), + ("assets/cards/A-H.png", assets.cards.a_h_png), + ("assets/cards/A-S.png", assets.cards.a_s_png), + ("assets/cards/J-C.png", assets.cards.j_c_png), + ("assets/cards/J-D.png", assets.cards.j_d_png), + ("assets/cards/J-H.png", assets.cards.j_h_png), + ("assets/cards/J-S.png", assets.cards.j_s_png), + ("assets/cards/K-C.png", assets.cards.k_c_png), + ("assets/cards/K-D.png", assets.cards.k_d_png), + ("assets/cards/K-H.png", assets.cards.k_h_png), + ("assets/cards/K-S.png", assets.cards.k_s_png), + ("assets/cards/Q-C.png", assets.cards.q_c_png), + ("assets/cards/Q-D.png", assets.cards.q_d_png), + ("assets/cards/Q-H.png", assets.cards.q_h_png), + ("assets/cards/Q-S.png", assets.cards.q_s_png), + ("assets/cards/ThaleahFat.ttf", assets.cards.thaleahfat_ttf), +]) + +///| +pub fn read(path : String) -> Bytes? { + catalogue.get(path) +} + +///| +pub fn paths() -> Array[String] { + catalogue.keys().collect() +} diff --git a/examples/cards/embedded_assets/moon.pkg b/examples/cards/embedded_assets/moon.pkg new file mode 100644 index 00000000..875ba8a0 --- /dev/null +++ b/examples/cards/embedded_assets/moon.pkg @@ -0,0 +1,59 @@ +dev_build( + input: [ + "../assets/cards/10-C.png", + "../assets/cards/10-D.png", + "../assets/cards/10-H.png", + "../assets/cards/10-S.png", + "../assets/cards/2-C.png", + "../assets/cards/2-D.png", + "../assets/cards/2-H.png", + "../assets/cards/2-S.png", + "../assets/cards/3-C.png", + "../assets/cards/3-D.png", + "../assets/cards/3-H.png", + "../assets/cards/3-S.png", + "../assets/cards/4-C.png", + "../assets/cards/4-D.png", + "../assets/cards/4-H.png", + "../assets/cards/4-S.png", + "../assets/cards/5-C.png", + "../assets/cards/5-D.png", + "../assets/cards/5-H.png", + "../assets/cards/5-S.png", + "../assets/cards/6-C.png", + "../assets/cards/6-D.png", + "../assets/cards/6-H.png", + "../assets/cards/6-S.png", + "../assets/cards/7-C.png", + "../assets/cards/7-D.png", + "../assets/cards/7-H.png", + "../assets/cards/7-S.png", + "../assets/cards/8-C.png", + "../assets/cards/8-D.png", + "../assets/cards/8-H.png", + "../assets/cards/8-S.png", + "../assets/cards/9-C.png", + "../assets/cards/9-D.png", + "../assets/cards/9-H.png", + "../assets/cards/9-S.png", + "../assets/cards/A-C.png", + "../assets/cards/A-D.png", + "../assets/cards/A-H.png", + "../assets/cards/A-S.png", + "../assets/cards/J-C.png", + "../assets/cards/J-D.png", + "../assets/cards/J-H.png", + "../assets/cards/J-S.png", + "../assets/cards/K-C.png", + "../assets/cards/K-D.png", + "../assets/cards/K-H.png", + "../assets/cards/K-S.png", + "../assets/cards/Q-C.png", + "../assets/cards/Q-D.png", + "../assets/cards/Q-H.png", + "../assets/cards/Q-S.png", + "../assets/cards/ThaleahFat.ttf", + ], + output: "assets.g.mbt", + command: "moonx moonbit-community/embed@0.1.3 \"$pkg_dir/../assets\" -o \"$output\"", +) diff --git a/examples/cards/embedded_assets/pkg.generated.mbti b/examples/cards/embedded_assets/pkg.generated.mbti new file mode 100644 index 00000000..32e70ace --- /dev/null +++ b/examples/cards/embedded_assets/pkg.generated.mbti @@ -0,0 +1,76 @@ +// Generated using `moon info`, DON'T EDIT IT +package "Milky2018/selene-examples/cards/embedded_assets" + +// Values +pub let assets : AssetsFixture + +pub fn paths() -> Array[String] + +pub fn read(String) -> Bytes? + +// Errors + +// Types and methods +pub struct AssetsFixture { + cards : CardsFixture +} + +pub struct CardsFixture { + v_2_c_png : Bytes + v_2_d_png : Bytes + v_2_h_png : Bytes + v_2_s_png : Bytes + v_3_c_png : Bytes + v_3_d_png : Bytes + v_3_h_png : Bytes + v_3_s_png : Bytes + v_4_c_png : Bytes + v_4_d_png : Bytes + v_4_h_png : Bytes + v_4_s_png : Bytes + v_5_c_png : Bytes + v_5_d_png : Bytes + v_5_h_png : Bytes + v_5_s_png : Bytes + v_6_c_png : Bytes + v_6_d_png : Bytes + v_6_h_png : Bytes + v_6_s_png : Bytes + v_7_c_png : Bytes + v_7_d_png : Bytes + v_7_h_png : Bytes + v_7_s_png : Bytes + v_8_c_png : Bytes + v_8_d_png : Bytes + v_8_h_png : Bytes + v_8_s_png : Bytes + v_9_c_png : Bytes + v_9_d_png : Bytes + v_9_h_png : Bytes + v_9_s_png : Bytes + a_c_png : Bytes + a_d_png : Bytes + a_h_png : Bytes + a_s_png : Bytes + j_c_png : Bytes + j_d_png : Bytes + j_h_png : Bytes + j_s_png : Bytes + k_c_png : Bytes + k_d_png : Bytes + k_h_png : Bytes + k_s_png : Bytes + q_c_png : Bytes + q_d_png : Bytes + q_h_png : Bytes + q_s_png : Bytes + v_10_c_png : Bytes + v_10_d_png : Bytes + v_10_h_png : Bytes + v_10_s_png : Bytes + thaleahfat_ttf : Bytes +} + +// Type aliases + +// Traits diff --git a/examples/cards/index.html b/examples/cards/index.html index ac5f8839..3ccd34a8 100644 --- a/examples/cards/index.html +++ b/examples/cards/index.html @@ -139,7 +139,6 @@ } } - + ``` -Run the local server from the repository root: +Run the local server from the repository root, serving the Pages directory: ```shell -python3 -m http.server 8000 +python3 -m http.server --directory page 8000 ``` Open `http://localhost:8000/examples/pixeladventure/` to play. diff --git a/docs/tutorial-zh.md b/docs/tutorial-zh.md index d6f583ab..d69d26a0 100644 --- a/docs/tutorial-zh.md +++ b/docs/tutorial-zh.md @@ -50,7 +50,7 @@ python3 -m http.server 8000 我们将要制作的游戏如下: -![](../examples/pixeladventure/screenshot.png) +![](../page/examples/pixeladventure/screenshot.png) 我们会在流程中展示如何制作: @@ -417,19 +417,20 @@ fn volume_button_input_system(_world : @ecs.World) -> Unit { 构建命令: ```shell -moon -C examples-web build ./pixeladventure/web --target js --release +moon build examples-web/pixeladventure/web --target js --release +cp _build/js/release/build/Milky2018/selene-examples-web/pixeladventure/web/web.js page/examples/pixeladventure/web.js ``` -构建后可直接使用 `examples/pixeladventure/index.html`,其中脚本路径如下: +构建后可直接使用 `page/examples/pixeladventure/index.html`,其中脚本路径如下: ```html - + ``` -然后在仓库根目录启动本地 Web 服务: +然后在仓库根目录启动本地 Web 服务,以 `page/` 为站点目录: ```shell -python3 -m http.server 8000 +python3 -m http.server --directory page 8000 ``` 访问 `http://localhost:8000/examples/pixeladventure/` 即可游玩。 diff --git a/examples/pixeladventure/embedded_assets/moon.pkg b/examples/pixeladventure/embedded_assets/moon.pkg index b0c2f809..117d2b6c 100644 --- a/examples/pixeladventure/embedded_assets/moon.pkg +++ b/examples/pixeladventure/embedded_assets/moon.pkg @@ -14,7 +14,6 @@ dev_build( "../assets/pixeladventure/Menu/Buttons/Volume.png", "../assets/pixeladventure/Menu/Buttons/VolumeOff.png", "../assets/pixeladventure/Terrain/Terrain (16x16).png", - "../assets/pixeladventure/arrowkey.png", "../assets/pixeladventure/sounds/coin.wav", "../assets/pixeladventure/sounds/hurt.wav", "../assets/pixeladventure/sounds/jump.wav", diff --git a/examples/pixeladventure/embedded_assets/pkg.generated.mbti b/examples/pixeladventure/embedded_assets/pkg.generated.mbti index 1d82f926..87728553 100644 --- a/examples/pixeladventure/embedded_assets/pkg.generated.mbti +++ b/examples/pixeladventure/embedded_assets/pkg.generated.mbti @@ -74,7 +74,6 @@ pub struct PixeladventureFixture { enemies : EnemiesFixture terrain : TerrainFixture background : BackgroundFixture - arrowkey_png : Bytes main_characters : MainCharactersFixture } diff --git a/page/README.md b/page/README.md index 5a1a5988..4140dead 100644 --- a/page/README.md +++ b/page/README.md @@ -1,7 +1,8 @@ # Selene Pages -This directory contains the site's landing page. Example pages and assets live -in `examples/`. +This directory is the complete GitHub Pages site. Example pages, screenshots, +and other static images live in `examples/`; game assets are embedded in the +compiled JavaScript. ## Build @@ -10,8 +11,13 @@ Run these commands from the repository root: ```bash moon update moon build --target js --release -python3 -m http.server 8000 +for game in cards pixeladventure survivors; do + cp "_build/js/release/build/Milky2018/selene-examples-web/$game/web/web.js" "page/examples/$game/web.js" +done +python3 -m http.server --directory page 8000 ``` -Open `http://localhost:8000/examples/index.html`. The Pages workflow copies the -landing page, examples, and compiled JavaScript into the deployment directory. +Open `http://localhost:8000/` or `http://localhost:8000/examples/`. +Each game page loads its adjacent `web.js`, which is ignored by Git. +The Pages workflow uses the same build and copy commands, then publishes this +directory directly. diff --git a/examples/cards/index.html b/page/examples/cards/index.html similarity index 97% rename from examples/cards/index.html rename to page/examples/cards/index.html index 3ccd34a8..ac7f7f99 100644 --- a/examples/cards/index.html +++ b/page/examples/cards/index.html @@ -146,7 +146,7 @@ } }); - + diff --git a/examples/cards/screenshot.png b/page/examples/cards/screenshot.png similarity index 100% rename from examples/cards/screenshot.png rename to page/examples/cards/screenshot.png diff --git a/examples/index.html b/page/examples/index.html similarity index 100% rename from examples/index.html rename to page/examples/index.html diff --git a/examples/pixeladventure/assets/pixeladventure/arrowkey.png b/page/examples/pixeladventure/arrowkey.png similarity index 100% rename from examples/pixeladventure/assets/pixeladventure/arrowkey.png rename to page/examples/pixeladventure/arrowkey.png diff --git a/examples/pixeladventure/index.html b/page/examples/pixeladventure/index.html similarity index 94% rename from examples/pixeladventure/index.html rename to page/examples/pixeladventure/index.html index 777bede1..0b8bc569 100644 --- a/examples/pixeladventure/index.html +++ b/page/examples/pixeladventure/index.html @@ -147,7 +147,7 @@ } }); - + @@ -161,7 +161,7 @@

Pixel Adventure

- Arrow Keys + Arrow Keys
← Back to Games diff --git a/examples/pixeladventure/screenshot.png b/page/examples/pixeladventure/screenshot.png similarity index 100% rename from examples/pixeladventure/screenshot.png rename to page/examples/pixeladventure/screenshot.png diff --git a/examples/survivors/index.html b/page/examples/survivors/index.html similarity index 97% rename from examples/survivors/index.html rename to page/examples/survivors/index.html index 2f7f0bc7..fe45a7e4 100644 --- a/examples/survivors/index.html +++ b/page/examples/survivors/index.html @@ -146,7 +146,7 @@ } }); - + diff --git a/examples/survivors/screenshot.png b/page/examples/survivors/screenshot.png similarity index 100% rename from examples/survivors/screenshot.png rename to page/examples/survivors/screenshot.png