diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5851f19..86db61e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -21,17 +21,13 @@ jobs: uses: dtolnay/rust-toolchain@stable - name: Install dependencies run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev - - name: Install cargo-nextest - run: cargo install cargo-nextest - name: Populate target directory from cache uses: Leafwing-Studios/cargo-cache@v2 with: sweep-cache: true - name: Run tests run: | - cargo nextest run --locked --workspace --no-default-features --all-targets - # Run doctests separately since nextest doesn't support them - cargo test --doc --locked --workspace --no-default-features + cargo test --locked --workspace --no-default-features # Run clippy lints. clippy: name: Clippy diff --git a/Cargo.lock b/Cargo.lock index 3f5cf89..a3d251d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3129,7 +3129,7 @@ dependencies = [ [[package]] name = "maze-ascension" -version = "1.0.1" +version = "1.0.2" dependencies = [ "anyhow", "bevy", diff --git a/Cargo.toml b/Cargo.toml index f5d2266..3ef7be1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "maze-ascension" authors = ["Kristofers Solo "] -version = "1.0.1" +version = "1.0.2" edition = "2021" [dependencies] diff --git a/src/maze/assets.rs b/src/maze/assets.rs index 15350eb..006586a 100644 --- a/src/maze/assets.rs +++ b/src/maze/assets.rs @@ -37,8 +37,8 @@ pub struct MazeAssets { impl MazeAssets { /// Creates a new instance of MazeAssets with all necessary meshes and materials. pub fn new( - meshes: &mut ResMut>, - materials: &mut ResMut>, + meshes: &mut Assets, + materials: &mut Assets, global_config: &GlobalMazeConfig, ) -> Self { let custom_materials = RosePineDawn::iter() diff --git a/src/player/mod.rs b/src/player/mod.rs index 90a4592..05a0917 100644 --- a/src/player/mod.rs +++ b/src/player/mod.rs @@ -1,4 +1,4 @@ -mod assets; +pub mod assets; pub mod commands; pub mod components; mod systems; diff --git a/src/screens/loading.rs b/src/screens/loading.rs index 7460a5f..f96d866 100644 --- a/src/screens/loading.rs +++ b/src/screens/loading.rs @@ -4,6 +4,8 @@ use bevy::prelude::*; use crate::{ + hint::assets::HintAssets, + player::assets::PlayerAssets, screens::Screen, theme::{interaction::InteractionAssets, prelude::*}, }; @@ -33,6 +35,10 @@ fn continue_to_title_screen(mut next_screen: ResMut>) { next_screen.set(Screen::Title); } -const fn all_assets_loaded(interaction_assets: Option>) -> bool { - interaction_assets.is_some() +const fn all_assets_loaded( + player_assets: Option>, + interaction_assets: Option>, + hints_assets: Option>, +) -> bool { + player_assets.is_some() && interaction_assets.is_some() && hints_assets.is_some() } diff --git a/web/index.html b/web/index.html index e3b8f2d..6c018f9 100644 --- a/web/index.html +++ b/web/index.html @@ -1,38 +1,36 @@ - - - - - Maze Ascension: The Labyrinth of Echoes - - - - - - -
-
- -
- Javascript and canvas support is required + + + + + + Maze Ascension: The Labyrinth of Echoes + + + + + + + +
+
+
- - + Javascript and canvas support is required +
+ + + diff --git a/web/style.css b/web/style.css index 752a756..541b8cd 100644 --- a/web/style.css +++ b/web/style.css @@ -1,56 +1,56 @@ :root { - /* Consider adjusting this color to match your splash screen! */ - --loading-screen-bg-color: #282828; + /* Consider adjusting this color to match your splash screen! */ + --loading-screen-bg-color: #282828; } * { - margin: 0; - padding: 0; - border: 0; + margin: 0; + padding: 0; + border: 0; } html, body { - width: 100%; - height: 100%; + width: 100%; + height: 100%; } .center { - width: 100%; - height: 100%; - display: flex; - justify-content: center; - align-items: center; - flex-direction: column; + width: 100%; + height: 100%; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; } #loading-screen { - background-color: var(--loading-screen-bg-color); + background-color: var(--loading-screen-bg-color); } .spinner { - width: 128px; - height: 128px; - border: 64px solid transparent; - border-bottom-color: #ececec; - border-right-color: #b2b2b2; - border-top-color: #787878; - border-radius: 50%; - box-sizing: border-box; - animation: spin 1.2s linear infinite; + width: 128px; + height: 128px; + border: 64px solid transparent; + border-bottom-color: #ececec; + border-right-color: #b2b2b2; + border-top-color: #787878; + border-radius: 50%; + box-sizing: border-box; + animation: spin 1.2s linear infinite; } @keyframes spin { - 0% { - transform: rotate(0deg); - } + 0% { + transform: rotate(0deg); + } - 100% { - transform: rotate(360deg); - } + 100% { + transform: rotate(360deg); + } } #bevy { - /* Hide Bevy app before it loads */ - height: 0; + /* Hide Bevy app before it loads */ + height: 0; }