Update bevy feature to 0.11 defaults minus audio and android (resolves …

…#75)
NiklasEi · Oct 13, 2023 · c07ef46 · c07ef46
1 parent 3550602
commit c07ef46
Show file tree

Hide file tree

Showing 5 changed files with 108 additions and 111 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -29,10 +29,13 @@ dev = [
     "bevy/bevy_dylib",
 ]
 
+# All of Bevy's default features exept for the audio related ones, since they clash with bevy_kira_audio
+#   and android_shared_stdcxx, since that is covered in `mobile`
 [dependencies]
 bevy = { version = "0.11", default-features = false, features = [
     "animation",
     "bevy_asset",
+    "bevy_gilrs",
     "bevy_scene",
     "bevy_winit",
     "bevy_core_pipeline",
@@ -42,14 +45,16 @@ bevy = { version = "0.11", default-features = false, features = [
     "bevy_sprite",
     "bevy_text",
     "bevy_ui",
+    "multi-threaded",
     "png",
     "hdr",
+    "ktx2",
     "zstd",
     "x11",
-    "ktx2",
-    "filesystem_watcher",
+    "bevy_gizmos",
     "tonemapping_luts",
-    "webgl2"
+    "default_font",
+    "webgl2",
 ] }
 bevy_kira_audio = { version = "0.16" }
 bevy_asset_loader = { version = "0.17" }

diff --git a/assets/fonts/FiraSans-Bold.ttf b/assets/fonts/FiraSans-Bold.ttf
diff --git a/src/loading.rs b/src/loading.rs
@@ -13,7 +13,6 @@ impl Plugin for LoadingPlugin {
         app.add_loading_state(
             LoadingState::new(GameState::Loading).continue_to_state(GameState::Menu),
         )
-        .add_collection_to_loading_state::<_, FontAssets>(GameState::Loading)
         .add_collection_to_loading_state::<_, AudioAssets>(GameState::Loading)
         .add_collection_to_loading_state::<_, TextureAssets>(GameState::Loading);
     }
@@ -22,12 +21,6 @@ impl Plugin for LoadingPlugin {
 // the following asset collections will be loaded during the State `GameState::Loading`
 // when done loading, they will be inserted as resources (see <https://github.com/NiklasEi/bevy_asset_loader>)
 
-#[derive(AssetCollection, Resource)]
-pub struct FontAssets {
-    #[asset(path = "fonts/FiraSans-Bold.ttf")]
-    pub fira_sans: Handle<Font>,
-}
-
 #[derive(AssetCollection, Resource)]
 pub struct AudioAssets {
     #[asset(path = "audio/flying.ogg")]