refactor: multiple changes and fixes 🌻

fix: now tilemaps work on web
change: add back embeded assets
this was some troubleshooting session...

.github/workflows/release.yaml

@@ -119,7 +119,6 @@ jobs:
           mkdir linux
           cp target/x86_64-unknown-linux-gnu/release/${{ env.binary }} linux/
           strip linux/${{ env.binary }}
-          cp -r assets linux/
 
       - name: Package as a zip
         working-directory: ./linux
@@ -168,7 +167,6 @@ jobs:
         run: |
           mkdir windows
           cp target/x86_64-pc-windows-msvc/release/${{ env.binary }}.exe windows/
-          cp -r assets windows/
 
       - name: Package as a zip
         run: |
@@ -232,7 +230,6 @@ jobs:
           mkdir -p ${{ env.binary }}.app/Contents/MacOS
           cp target/release/${{ env.binary }} ${{ env.binary }}.app/Contents/MacOS/
           strip ${{ env.binary }}.app/Contents/MacOS/${{ env.binary }}
-          cp -r assets ${{ env.binary }}.app/Contents/MacOS/
           hdiutil create -fs HFS+ -volname "${{ env.binary }}" -srcfolder ${{ env.binary }}.app ${{ env.binary }}.dmg
 
       - name: Upload binaries to artifacts

Cargo.toml

@@ -26,6 +26,7 @@ bevy = { version = "0.12", default-features = false, features = [
     "tonemapping_luts", "default_font", "webgl2",
 ]} 
 bevy_asset_loader = { version = "0.18", features = [ "progress_tracking" ] } # Better asset loader
+bevy_embedded_assets = { version = "0.9" } # Embed assets in binary
 bevy_kira_audio = { version =  "0.18" } # Improved audio library
 iyes_progress = { version = "0.10", features = [ "assets" ] } # Track loading and game state
 bevy-inspector-egui = { version = "0.21" } # Inspector

README.md

@@ -2,4 +2,4 @@
 
 a game for the bevy jam 4
 
-_work in progress_
+TODO: _write readme_

build/wasm/index.html

@@ -7,7 +7,6 @@
 
   <title>Charon</title>
 
-  <link data-trunk rel="copy-dir" href="../../assets"/>
   <link data-trunk rel="inline" href="style.css"/>
   <link data-trunk rel="rust" href="../../Cargo.toml"/>
 </head>

src/audio.rs

@@ -1,6 +1,8 @@
 use bevy::prelude::*;
 use bevy_kira_audio::prelude::AudioPlugin as KiraAudioPlugin;
 
+// TODO: Add sound to the game
+
 // ······
 // Plugin
 // ······

src/config.rs

@@ -3,7 +3,7 @@ use std::path::Path;
 use bevy::prelude::*;
 use serde::{Deserialize, Serialize};
 
-use crate::{input::Bind, GameState};
+use crate::input::Bind;
 
 pub use bevy_persistent::prelude::*;
 
@@ -18,7 +18,7 @@ pub struct ConfigPlugin;
 
 impl Plugin for ConfigPlugin {
     fn build(&self, app: &mut App) {
-        app.add_systems(OnEnter(GameState::Loading), init_persistence);
+        app.add_systems(Startup, init_persistence);
     }
 }
 

src/game.rs

@@ -0,0 +1,47 @@
+use bevy::{prelude::*, render::view::RenderLayers};
+
+use crate::GameState;
+
+// TODO: Spawn entities, follow pathfinding
+// TODO: Collisions between entities (traffic)
+// TODO: Multiple spawn points
+
+pub struct CharonPlugin;
+
+impl Plugin for CharonPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_systems(
+            OnEnter(GameState::Play),
+            (init_game.run_if(run_once()), resume_game),
+        )
+        .add_systems(OnExit(GameState::Play), pause_game);
+    }
+}
+
+// ··········
+// Components
+// ··········
+
+#[derive(Component)]
+pub struct GameCam;
+
+// ·······
+// Systems
+// ·······
+
+pub fn init_game(mut cmd: Commands) {
+    // Camera
+    cmd.spawn((Camera2dBundle::default(), RenderLayers::layer(0), GameCam));
+}
+
+pub fn resume_game(mut cam: Query<&mut Camera, With<GameCam>>) {
+    for mut cam in cam.iter_mut() {
+        cam.is_active = true;
+    }
+}
+
+pub fn pause_game(mut cam: Query<&mut Camera, With<GameCam>>) {
+    for mut cam in cam.iter_mut() {
+        cam.is_active = false;
+    }
+}

src/input.rs

@@ -24,12 +24,9 @@ impl Plugin for InputPlugin {
             .add_systems(
                 PreUpdate,
                 (
-                    (
-                        handle_input_keyboard,
-                        handle_input_mouse,
-                        handle_input_gamepad,
-                    )
-                        .run_if(resource_exists::<Persistent<Keybinds>>()),
+                    handle_input_keyboard,
+                    handle_input_mouse,
+                    handle_input_gamepad,
                     handle_mouse_moved,
                 ),
             )

src/lib.rs

@@ -1,15 +1,14 @@
-pub mod audio;
-pub mod config;
+mod audio;
+mod config;
 mod debug;
-pub mod input;
-pub mod load;
+mod game;
+mod input;
+mod load;
 mod menu;
-pub mod tilemap;
-pub mod ui;
+mod tilemap;
+mod ui;
 
-use bevy::{prelude::*, sprite::MaterialMesh2dBundle};
-use bevy_persistent::Persistent;
-use config::GameOptions;
+use bevy::prelude::*;
 
 // Game state
 #[derive(States, Debug, Default, Clone, Eq, PartialEq, Hash)]
@@ -33,34 +32,13 @@ impl Plugin for GamePlugin {
             input::InputPlugin,
             audio::AudioPlugin,
             tilemap::TilePlugin,
+            game::CharonPlugin,
         ));
 
         #[cfg(debug_assertions)]
         {
             app.add_plugins(debug::DebugPlugin);
             debug::save_schedule(app);
         }
-
-        app.add_systems(OnEnter(GameState::Play), init_game.run_if(run_once()));
     }
 }
-
-// TODO: Move this somewhere where it makes sense
-
-#[derive(Component)]
-pub struct GameCamera;
-
-fn init_game(
-    mut cmd: Commands,
-    opts: Res<Persistent<GameOptions>>,
-    mut meshes: ResMut<Assets<Mesh>>,
-    mut materials: ResMut<Assets<ColorMaterial>>,
-) {
-    // Background
-    cmd.spawn(MaterialMesh2dBundle {
-        mesh: meshes.add(Mesh::from(shape::Quad::default())).into(),
-        transform: Transform::from_xyz(0., 0., -10.).with_scale(Vec3::new(1080., 720., 1.)),
-        material: materials.add(ColorMaterial::from(opts.color.dark)),
-        ..default()
-    });
-}

src/load.rs

@@ -8,7 +8,7 @@ use bevy_persistent::Persistent;
 use iyes_progress::prelude::*;
 
 #[cfg(debug_assertions)]
-pub const SPLASH_TIME: f32 = 2.;
+pub const SPLASH_TIME: f32 = 0.1;
 #[cfg(not(debug_assertions))]
 pub const SPLASH_TIME: f32 = 2.;
 
@@ -26,14 +26,11 @@ impl Plugin for LoadPlugin {
             .add_plugins((ProgressPlugin::new(GameState::Loading)
                 .continue_to(GameState::Menu)
                 .track_assets(),))
+            .add_systems(OnEnter(GameState::Loading), init_splash)
             .add_systems(OnExit(GameState::Loading), clear_loading)
             .add_systems(
                 Update,
-                (
-                    init_splash,
-                    check_splash_finished.track_progress(),
-                    check_progress,
-                )
+                (check_splash_finished.track_progress(), check_progress)
                     .run_if(in_state(GameState::Loading))
                     .after(LoadingStateSet(GameState::Loading)),
             );
@@ -88,17 +85,20 @@ fn init_splash(
     if let Ok(node) = node.get_single() {
         if let Some(mut node) = cmd.get_entity(node) {
             node.with_children(|parent| {
-                parent.spawn((ImageBundle {
-                    image: UiImage {
-                        texture: assets.bevy_icon.clone(),
-                        ..default()
-                    },
-                    style: Style {
-                        width: Val::Px(128.),
+                parent.spawn((
+                    ImageBundle {
+                        image: UiImage {
+                            texture: assets.bevy_icon.clone(),
+                            ..default()
+                        },
+                        style: Style {
+                            width: Val::Px(128.),
+                            ..default()
+                        },
                         ..default()
                     },
-                    ..default()
-                },));
+                    UI_LAYER,
+                ));
             });
 
             *has_init = true;
@@ -148,29 +148,35 @@ fn check_progress(
                 if let Some(mut entity) = cmd.get_entity(node) {
                     entity.with_children(|parent| {
                         // Loading text
-                        parent.spawn((TextBundle {
-                            text: Text::from_section(
-                                "Loading",
-                                TextStyle {
-                                    font: assets.font.clone(),
-                                    font_size: 48.,
-                                    color: opts.color.mid,
-                                },
-                            ),
-                            ..default()
-                        },));
+                        parent.spawn((
+                            TextBundle {
+                                text: Text::from_section(
+                                    "Loading",
+                                    TextStyle {
+                                        font: assets.font.clone(),
+                                        font_size: 48.,
+                                        color: opts.color.mid,
+                                    },
+                                ),
+                                ..default()
+                            },
+                            UI_LAYER,
+                        ));
 
                         // Progress bar
                         parent
-                            .spawn((NodeBundle {
-                                style: Style {
-                                    width: Val::Percent(70.),
-                                    height: Val::Px(32.),
+                            .spawn((
+                                NodeBundle {
+                                    style: Style {
+                                        width: Val::Percent(70.),
+                                        height: Val::Px(32.),
+                                        ..default()
+                                    },
+                                    background_color: opts.color.dark.into(),
                                     ..default()
                                 },
-                                background_color: opts.color.dark.into(),
-                                ..default()
-                            },))
+                                UI_LAYER,
+                            ))
                             .with_children(|parent| {
                                 parent.spawn((
                                     NodeBundle {
@@ -185,6 +191,7 @@ fn check_progress(
                                         background_color: opts.color.light.into(),
                                         ..default()
                                     },
+                                    UI_LAYER,
                                     ProgressBar,
                                 ));
                             });

src/main.rs

@@ -1,10 +1,14 @@
 use bevy::{asset::AssetMetaCheck, prelude::*, window::WindowResolution};
+use bevy_embedded_assets::{EmbeddedAssetPlugin, PluginMode};
 use charon::GamePlugin;
 
 fn main() {
     App::new()
         .insert_resource(AssetMetaCheck::Never)
         .add_plugins((
+            EmbeddedAssetPlugin {
+                mode: PluginMode::ReplaceDefault,
+            },
             DefaultPlugins.set(WindowPlugin {
                 primary_window: Some(Window {
                     title: "Charon".to_string(),

src/menu.rs

@@ -90,15 +90,10 @@ enum MenuButton {
 // Systems
 // ·······
 
-fn init_menu(
-    mut cmd: Commands,
-    style: Res<UIStyle>,
-    mut node: Query<(Entity, &mut BackgroundColor), With<UiNode>>,
-    opts: Res<Persistent<GameOptions>>,
-) {
-    if let Ok((node, mut bg)) = node.get_single_mut() {
+fn init_menu(mut cmd: Commands, style: Res<UIStyle>, mut node: Query<Entity, With<UiNode>>) {
+    // Main menu layout
+    if let Ok(node) = node.get_single_mut() {
         cmd.insert_resource(MenuStarting);
-        *bg = opts.color.dark.into();
         layout_main(cmd, node, &style);
     }
 }