diff --git a/.github/workflows/itch.yml b/.github/workflows/itch.yml index 7b9a067..ac6e469 100644 --- a/.github/workflows/itch.yml +++ b/.github/workflows/itch.yml @@ -31,21 +31,21 @@ jobs: - name: Rust Cache # cache the rust build artefacts uses: Swatinem/rust-cache@v2 - name: Download and install Trunk binary - working-directory: crates/rpack + working-directory: crates/rpack_egui run: wget -qO- https://github.com/thedodd/trunk/releases/latest/download/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf- - name: Update file - working-directory: crates/rpack + working-directory: crates/rpack_egui run: sed -i '15d' index.html - name: Build - working-directory: crates/rpack + working-directory: crates/rpack_egui run: ./trunk build --release - name: Update result file - working-directory: crates/rpack + working-directory: crates/rpack_egui run: sed -i 's|/rpack|./rpack|g' dist/index.html - name: Itch.io - Publish uses: KikimoraGames/itch-publish@v0.0.3 with: - gameData: ./crates/rpack/dist + gameData: ./crates/rpack_egui/dist itchUsername: mevlyshkin itchGameId: rpack buildChannel: wasm diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 2ac5f19..5ae6c0a 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -31,10 +31,10 @@ jobs: - name: Rust Cache # cache the rust build artefacts uses: Swatinem/rust-cache@v2 - name: Download and install Trunk binary - working-directory: crates/rpack + working-directory: crates/rpack_egui run: wget -qO- https://github.com/thedodd/trunk/releases/latest/download/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf- - name: Build # build - working-directory: crates/rpack + working-directory: crates/rpack_egui # "${GITHUB_REPOSITORY#*/}" evaluates into the name of the repository # using --public-url something will allow trunk to modify all the href paths like from favicon.ico to repo_name/favicon.ico . # this is necessary for github pages where the site is deployed to username.github.io/repo_name and all files must be requested @@ -44,7 +44,7 @@ jobs: - name: Deploy uses: JamesIves/github-pages-deploy-action@v4 with: - folder: crates/rpack/dist + folder: crates/rpack_egui/dist # this option will not maintain any history of your previous pages deployment # set to false if you want all page build to be committed to your gh-pages branch history single-commit: true diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 0f22db7..b84a6fe 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -68,8 +68,8 @@ jobs: target: wasm32-unknown-unknown override: true - name: Download and install Trunk binary - working-directory: crates/rpack + working-directory: crates/rpack_egui run: wget -qO- https://github.com/thedodd/trunk/releases/latest/download/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf- - name: Build - working-directory: crates/rpack + working-directory: crates/rpack_egui run: ./trunk build diff --git a/.gitignore b/.gitignore index b95f35c..0b0d039 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ /target /crates/*/target -/crates/rpack/dist +/crates/rpack_egui/dist /dist skyline-packer-output.png result.png diff --git a/Cargo.toml b/Cargo.toml index ad77eb5..149d668 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ resolver = "2" members = [ "crates/bevy_rpack", - "crates/rpack", + "crates/rpack_egui", "crates/rpack_cli", ] diff --git a/README.md b/README.md index 9a5de85..1315c5e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # rpack [![Build Status](https://github.com/Leinnan/rpack/workflows/CI/badge.svg)](https://github.com/Leinnan/rpack/actions?workflow=CI) +[![Crates.io](https://img.shields.io/crates/v/rpack_egui)](https://crates.io/crates/rpack_egui) +[![Documentation](https://docs.rs/rpack_egui/badge.svg)](https://docs.rs/rpack_egui) + Create tilemaps in seconds! This repository contains few projects that together make a fully functional solution for generating tilemaps alongside integration to the Bevy game engine. @@ -13,12 +16,15 @@ To open it in browser click one of the icons below: A both desktop and web frontend for generating tilemaps. Just drag and drop images into the program and generate tilemaps. -Source code is available in `crates/rpack` directory of the repo. +Source code is available in `crates/rpack_egui` directory of the repo. ![rpack_ebVVrMf3wm](https://github.com/user-attachments/assets/bb015348-3c1f-46be-9312-963b4f39f9c0) ## Bevy rPack +[![Crates.io](https://img.shields.io/crates/v/bevy_rpack)](https://crates.io/crates/bevy_rpack) +[![Documentation](https://docs.rs/bevy_rpack/badge.svg)](https://docs.rs/bevy_rpack) + A Bevy plugin with support for the `rpack.json` atlases. More info available at [crates/bevy_rpack](https://github.com/Leinnan/rpack/tree/master/crates/bevy_rpack). @@ -27,6 +33,9 @@ Repository contains example how to use plugin in Bevy. ## rPack CLI +[![Crates.io](https://img.shields.io/crates/v/rpack_cli)](https://crates.io/crates/rpack_cli) +[![Documentation](https://docs.rs/rpack_cli/badge.svg)](https://docs.rs/rpack_cli) + Command line interface for generating tilemaps. ```sh diff --git a/crates/rpack/.cargo/config.toml b/crates/rpack_egui/.cargo/config.toml similarity index 100% rename from crates/rpack/.cargo/config.toml rename to crates/rpack_egui/.cargo/config.toml diff --git a/crates/rpack/Cargo.toml b/crates/rpack_egui/Cargo.toml similarity index 98% rename from crates/rpack/Cargo.toml rename to crates/rpack_egui/Cargo.toml index 6bfa03c..2587181 100644 --- a/crates/rpack/Cargo.toml +++ b/crates/rpack_egui/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "rpack" +name = "rpack_egui" version = "0.1.0" description = "GUI application for generating rpack atlases" authors = ["Piotr Siuszko "] diff --git a/crates/rpack/Trunk.toml b/crates/rpack_egui/Trunk.toml similarity index 100% rename from crates/rpack/Trunk.toml rename to crates/rpack_egui/Trunk.toml diff --git a/crates/rpack/assets/favicon.ico b/crates/rpack_egui/assets/favicon.ico similarity index 100% rename from crates/rpack/assets/favicon.ico rename to crates/rpack_egui/assets/favicon.ico diff --git a/crates/rpack/assets/icon-1024.png b/crates/rpack_egui/assets/icon-1024.png similarity index 100% rename from crates/rpack/assets/icon-1024.png rename to crates/rpack_egui/assets/icon-1024.png diff --git a/crates/rpack/assets/icon-256.png b/crates/rpack_egui/assets/icon-256.png similarity index 100% rename from crates/rpack/assets/icon-256.png rename to crates/rpack_egui/assets/icon-256.png diff --git a/crates/rpack/assets/icon_ios_touch_192.png b/crates/rpack_egui/assets/icon_ios_touch_192.png similarity index 100% rename from crates/rpack/assets/icon_ios_touch_192.png rename to crates/rpack_egui/assets/icon_ios_touch_192.png diff --git a/crates/rpack/assets/manifest.json b/crates/rpack_egui/assets/manifest.json similarity index 100% rename from crates/rpack/assets/manifest.json rename to crates/rpack_egui/assets/manifest.json diff --git a/crates/rpack/assets/maskable_icon_x512.png b/crates/rpack_egui/assets/maskable_icon_x512.png similarity index 100% rename from crates/rpack/assets/maskable_icon_x512.png rename to crates/rpack_egui/assets/maskable_icon_x512.png diff --git a/crates/rpack/assets/sw.js b/crates/rpack_egui/assets/sw.js similarity index 100% rename from crates/rpack/assets/sw.js rename to crates/rpack_egui/assets/sw.js diff --git a/crates/rpack/build.rs b/crates/rpack_egui/build.rs similarity index 100% rename from crates/rpack/build.rs rename to crates/rpack_egui/build.rs diff --git a/crates/rpack/check.sh b/crates/rpack_egui/check.sh similarity index 100% rename from crates/rpack/check.sh rename to crates/rpack_egui/check.sh diff --git a/crates/rpack/index.html b/crates/rpack_egui/index.html similarity index 100% rename from crates/rpack/index.html rename to crates/rpack_egui/index.html diff --git a/crates/rpack/rust-toolchain b/crates/rpack_egui/rust-toolchain similarity index 100% rename from crates/rpack/rust-toolchain rename to crates/rpack_egui/rust-toolchain diff --git a/crates/rpack/src/app.rs b/crates/rpack_egui/src/app.rs similarity index 100% rename from crates/rpack/src/app.rs rename to crates/rpack_egui/src/app.rs diff --git a/crates/rpack/src/fonts.rs b/crates/rpack_egui/src/fonts.rs similarity index 100% rename from crates/rpack/src/fonts.rs rename to crates/rpack_egui/src/fonts.rs diff --git a/crates/rpack/src/helpers.rs b/crates/rpack_egui/src/helpers.rs similarity index 100% rename from crates/rpack/src/helpers.rs rename to crates/rpack_egui/src/helpers.rs diff --git a/crates/rpack/src/lib.rs b/crates/rpack_egui/src/lib.rs similarity index 100% rename from crates/rpack/src/lib.rs rename to crates/rpack_egui/src/lib.rs diff --git a/crates/rpack/src/main.rs b/crates/rpack_egui/src/main.rs similarity index 93% rename from crates/rpack/src/main.rs rename to crates/rpack_egui/src/main.rs index fe0437c..f63aedb 100644 --- a/crates/rpack/src/main.rs +++ b/crates/rpack_egui/src/main.rs @@ -15,7 +15,7 @@ fn main() -> eframe::Result<()> { eframe::run_native( "rPack", native_options, - Box::new(|cc| Ok(Box::new(rpack::Application::new(cc)))), + Box::new(|cc| Ok(Box::new(rpack_egui::Application::new(cc)))), ) } @@ -40,7 +40,7 @@ fn main() { .start( canvas, web_options, - Box::new(|cc| Ok(Box::new(rpack::Application::new(cc)))), + Box::new(|cc| Ok(Box::new(rpack_egui::Application::new(cc)))), ) .await; diff --git a/crates/rpack/static/JetBrainsMono-SemiBold.ttf b/crates/rpack_egui/static/JetBrainsMono-SemiBold.ttf similarity index 100% rename from crates/rpack/static/JetBrainsMono-SemiBold.ttf rename to crates/rpack_egui/static/JetBrainsMono-SemiBold.ttf diff --git a/crates/rpack/static/JetBrainsMonoNL-Regular.ttf b/crates/rpack_egui/static/JetBrainsMonoNL-Regular.ttf similarity index 100% rename from crates/rpack/static/JetBrainsMonoNL-Regular.ttf rename to crates/rpack_egui/static/JetBrainsMonoNL-Regular.ttf