Merge pull request #95 from thombruce/chore/bevy-0.12

Chore/bevy 0.12

Cargo.toml

@@ -6,25 +6,28 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = "0.11.3"
-bevy-inspector-egui = "0.20.0"
-bevy-ui-navigation = "0.32.0"
-bevy_asset_loader = { version = "0.17.0", features = ["2d"] }
-bevy_common_assets = { version = "0.7.0", features = ["ron"] }
-bevy_fluent = "0.7.0"
-bevy_rapier2d = "0.22.0"
-bevy_spatial = "0.6.0"
-bevy_tiling_background = { git = "https://github.com/rparrett/bevy_tiling_background.git", branch = "tex-typo" }
+bevy = "0.12.0"
+bevy-inspector-egui = "0.21.0"
+bevy-ui-navigation = "0.33.0"
+bevy_asset_loader = { version = "0.18.0", features = ["2d"] }
+bevy_common_assets = { version = "0.8.0", features = ["ron"] }
+bevy_fluent = "0.8.0"
+bevy_rapier2d = "0.23.0"
+bevy_spatial = "0.7.0"
 fluent_content = "0.0.5"
 image = "0.24.7"
-leafwing-input-manager = "0.10.0"
+leafwing-input-manager = "0.11.1"
 rand = "0.8.5"
 regex = "1.10.2"
 ron = "0.8.1"
 serde = "1.0.190"
 unic-langid = { version = "0.9.1", features = ["macros"] }
 winit = "0.28.7"
 
+# Override dependencies to patched versions
+[patch.crates-io]
+bevy_fluent = { git = "https://github.com/kgv/bevy_fluent.git", branch = "main" } # Temporary Bevy 0.12 patch; TODO: Update
+
 # Enable a small amount of optimization in debug mode
 [profile.dev]
 opt-level = 1

src/core/effects/blink.rs

@@ -6,12 +6,12 @@ pub struct DrawBlinkTimer(pub Timer);
 pub(crate) fn menu_blink_system(
     mut commands: Commands,
     time: Res<Time>,
-    mut query: Query<(Entity, &mut DrawBlinkTimer, &ComputedVisibility)>,
+    mut query: Query<(Entity, &mut DrawBlinkTimer, &InheritedVisibility)>,
 ) {
     for (entity, mut timer, visibility) in query.iter_mut() {
         timer.0.tick(time.delta());
         if timer.0.finished() {
-            let new_visibility = if visibility.is_visible() {
+            let new_visibility = if visibility.get() {
                 Visibility::Hidden
             } else {
                 Visibility::Visible

src/core/resources/assets.rs

@@ -56,9 +56,6 @@ pub struct SpriteAssets {
     #[asset(path = "space/celestials/neptune.png")]
     pub neptune: Handle<TextureAtlas>,
 
-    #[asset(path = "space/backgrounds/custom.png")]
-    pub background: Handle<Image>,
-
     #[asset(path = "space/meteors/meteorGrey_med1.png")]
     pub meteor: Handle<Image>,
 }

src/i18n/mod.rs

@@ -1,7 +1,7 @@
-use bevy::asset::LoadState;
+use bevy::asset::{LoadState, LoadedFolder};
 use bevy::prelude::*;
 use bevy_fluent::prelude::*;
-use bevy_fluent::{AssetServerExt, BundleAsset, LocalizationBuilder};
+use bevy_fluent::LocalizationBuilder;
 
 use crate::systems::states::GameState;
 
@@ -25,16 +25,15 @@ pub struct I18n(pub Localization);
 pub(crate) fn load_translations(
     localization_builder: LocalizationBuilder,
     asset_server: Res<AssetServer>,
-    mut handles: Local<Option<Vec<Handle<BundleAsset>>>>,
+    mut handle: Local<Option<Handle<LoadedFolder>>>,
     mut i18n: ResMut<I18n>,
     mut next_state: ResMut<NextState<GameState>>,
 ) {
-    let handles =
-        handles.get_or_insert_with(|| asset_server.load_glob("locales/**/main.ftl.ron").unwrap());
+    let handle = &*handle.get_or_insert_with(|| asset_server.load_folder("locales"));
 
-    let load_state = asset_server.get_group_load_state(handles.iter().map(Handle::id));
-    if let LoadState::Loaded = load_state {
-        i18n.0 = localization_builder.build(&*handles);
+    let load_state = asset_server.get_load_state(handle);
+    if let Some(LoadState::Loaded) = load_state {
+        i18n.0 = localization_builder.build(handle);
         next_state.set(GameState::StartMenu);
     }
 }

src/shaders/mod.rs

@@ -1,2 +1,2 @@
-pub mod chromatic_aberration;
-pub mod pixelate;
+// pub mod chromatic_aberration;
+// pub mod pixelate;

src/ships/bullet.rs

@@ -30,7 +30,7 @@ pub(crate) fn spawn_bullet(
     handles: Res<SpriteAssets>,
     audios: Res<AudioAssets>,
 ) {
-    for spawn_event in bullet_spawn_events.iter() {
+    for spawn_event in bullet_spawn_events.read() {
         // Change this random factor to alter accuracy (larger is less accurate).
         const SPREAD: f32 = 0.05;
         let random_factor: f32 = rand::thread_rng().gen_range(-SPREAD..SPREAD);

src/ships/ship.rs

@@ -53,7 +53,7 @@ pub(crate) fn ship_damage(
     mut bullet_ship_contact_events: EventReader<BulletShipContactEvent>,
     mut ship_health: Query<&mut Health, With<Ship>>,
 ) {
-    for event in bullet_ship_contact_events.iter() {
+    for event in bullet_ship_contact_events.read() {
         commands.entity(event.bullet).despawn();
 
         if let Ok(mut health) = ship_health.get_mut(event.ship) {

src/systems/events/mod.rs

@@ -37,7 +37,7 @@ pub(crate) fn contact_system(
     query: Query<(Has<Ship>, Has<Bullet>)>,
     bullet_spawner: Query<&SpawnedBy, With<Bullet>>,
 ) {
-    for event in collision_events.iter() {
+    for event in collision_events.read() {
         if let CollisionEvent::Started(e1, e2, _flags) = event {
             let (e1_is_ship, e1_is_bullet) = query.get(*e1).unwrap();
             let (e2_is_ship, e2_is_bullet) = query.get(*e2).unwrap();

src/systems/mod.rs

@@ -50,9 +50,9 @@ impl Plugin for SystemsPlugin {
 
         // OnEnter
         // - Any
-        for state in GameState::variants() {
+        for state in GameState::IN_ANY_STATE {
             app.add_systems(
-                OnEnter(state),
+                OnEnter(*state),
                 states::transitions::state_enter_despawn::<GameState>,
             );
         }

src/systems/states/mod.rs

@@ -16,6 +16,15 @@ pub enum GameState {
     Paused,
 }
 impl GameState {
+    pub const IN_ANY_STATE: &[GameState; 7] = &[
+        GameState::Loading,
+        GameState::LoadingTranslations,
+        GameState::StartMenu,
+        GameState::Credits,
+        GameState::GameCreate,
+        GameState::Active,
+        GameState::Paused,
+    ];
     pub const IN_MENU_STATE: &[GameState; 2] = &[GameState::StartMenu, GameState::Credits];
     pub const IN_GAME_STATE: &[GameState; 3] =
         &[GameState::GameCreate, GameState::Active, GameState::Paused];

src/ui/camera.rs

@@ -1,10 +1,10 @@
 use bevy::prelude::*;
 
-#[allow(unused_imports)]
-use crate::shaders::{
-    chromatic_aberration::{ChromaticAberrationPlugin, ChromaticAberrationSettings},
-    pixelate::{PixelatePlugin, PixelateSettings},
-};
+// #[allow(unused_imports)]
+// use crate::shaders::{
+//     chromatic_aberration::{ChromaticAberrationPlugin, ChromaticAberrationSettings},
+//     pixelate::{PixelatePlugin, PixelateSettings},
+// };
 
 use crate::ships::player::Player;
 
@@ -32,14 +32,14 @@ pub(crate) fn spawn_camera(mut commands: Commands) {
             },
             ..default()
         },
-        PixelateSettings {
-            block_size: 3.25,
-            ..default()
-        },
-        ChromaticAberrationSettings {
-            intensity: 0.001,
-            ..default()
-        },
+        // PixelateSettings {
+        //     block_size: 3.25,
+        //     ..default()
+        // },
+        // ChromaticAberrationSettings {
+        //     intensity: 0.001,
+        //     ..default()
+        // },
         Name::new("Main Camera"),
     ));
 }

src/ui/damage.rs

@@ -18,7 +18,7 @@ pub(crate) fn ui_spawn_damage(
     camera_query: Query<(&Camera, &GlobalTransform)>,
     ui: Res<UiAssets>,
 ) {
-    for event in bullet_ship_contact_events.iter() {
+    for event in bullet_ship_contact_events.read() {
         if let Ok(transform) = ship_transform.get(event.ship) {
             // Use camera.world_to_viewport() and camera GlobalTransform to translate
             // a world position into UI coordinates

src/ui/hud/indicator.rs

@@ -57,7 +57,7 @@ pub(crate) fn spawn_indicators(
 pub(crate) fn indicators_system(
     mut query: Query<(&mut Transform, &mut Style, &Indicator, &mut BackgroundColor)>,
     player_query: Query<&Transform, (With<Player>, Without<Indicator>)>,
-    entity_query: Query<(&Transform, &ComputedVisibility, &Indicated), Without<Indicator>>,
+    entity_query: Query<(&Transform, &ViewVisibility, &Indicated), Without<Indicator>>,
     bounds_query: Query<&Node, (With<Bounds>, Without<Indicator>)>,
 ) {
     if let Ok(player_transform) = player_query.get_single() {
@@ -69,7 +69,7 @@ pub(crate) fn indicators_system(
             if let Ok((entity_transform, entity_visibility, indicated)) =
                 entity_query.get(indicator.entity)
             {
-                if entity_visibility.is_visible() {
+                if entity_visibility.get() {
                     indicator_style.display = Display::None;
                     continue;
                 }
@@ -135,7 +135,7 @@ pub(crate) fn indicators_system(
 pub(crate) fn despawn_indicators_system(
     mut commands: Commands,
     mut query: Query<(Entity, &Indicator)>,
-    entity_query: Query<(&Transform, &ComputedVisibility), (With<Indicated>, Without<Indicator>)>,
+    entity_query: Query<Entity, (With<Indicated>, Without<Indicator>)>,
 ) {
     for (entity, indicator) in &mut query {
         if let Err(_) = entity_query.get(indicator.entity) {

src/ui/menus/credits.rs

@@ -17,7 +17,7 @@ impl Plugin for CreditsPlugin {
     }
 }
 
-#[derive(serde::Deserialize, TypeUuid, TypePath)]
+#[derive(serde::Deserialize, TypeUuid, TypePath, Asset)]
 #[uuid = "6763db47-17ca-4530-b604-94492c3a4c58"]
 pub struct Credits(Vec<CreditSection>);
 

src/world/astronomy/starfield.rs

@@ -1,31 +1,41 @@
-use bevy::{prelude::*, render::view::NoFrustumCulling};
-use bevy_tiling_background::{
-    BackgroundImageBundle, BackgroundMaterial, SetImageRepeatingExt, TilingBackgroundPlugin,
+use bevy::{
+    prelude::*,
+    render::{
+        texture::{ImageAddressMode, ImageLoaderSettings, ImageSampler, ImageSamplerDescriptor},
+        view::NoFrustumCulling,
+    },
 };
 
-use crate::core::resources::assets::SpriteAssets;
+/// The setup function
+pub(crate) fn spawn_starfield(mut commands: Commands, assets: Res<AssetServer>) {
+    let sampler_desc = ImageSamplerDescriptor {
+        address_mode_u: ImageAddressMode::Repeat,
+        address_mode_v: ImageAddressMode::Repeat,
+        ..Default::default()
+    };
 
-pub struct StarfieldPlugin;
-impl Plugin for StarfieldPlugin {
-    fn build(&self, app: &mut App) {
-        app.add_plugins(TilingBackgroundPlugin::<BackgroundMaterial>::default());
-    }
-}
+    let settings = move |s: &mut ImageLoaderSettings| {
+        s.sampler = ImageSampler::Descriptor(sampler_desc.clone());
+    };
 
-/// The setup function
-pub(crate) fn spawn_starfield(
-    mut commands: Commands,
-    sprites: Res<SpriteAssets>,
-    mut materials: ResMut<Assets<BackgroundMaterial>>,
-) {
-    let image = sprites.background.clone();
-    // Queue a command to set the image to be repeating once the image is loaded.
-    commands.set_image_repeating(image.clone());
+    let image = assets.load_with_settings("space/backgrounds/custom.png", settings);
 
+    // TODO: The Starfield no longer moves parallax to the foreground.
+    //       Find a way to reimplement this behaviour.
     commands.spawn((
-        BackgroundImageBundle::from_image(image, materials.as_mut())
-            .at_z_layer(-0.1)
-            .with_movement_scale(0.1),
+        SpriteBundle {
+            texture: image,
+            sprite: Sprite {
+                // TODO: Scale for a galaxy (change image, make procedural, etc.)
+                rect: Some(Rect::new(-1_000_000., -1_000_000., 1_000_000., 1_000_000.)),
+                ..default()
+            },
+            transform: Transform {
+                translation: Vec3::new(0., 0., -899.),
+                ..default()
+            },
+            ..default()
+        },
         NoFrustumCulling,
         Name::new("Background"),
     ));

src/world/mod.rs

@@ -3,11 +3,11 @@ use bevy::prelude::*;
 pub mod astronomy;
 pub mod spatial;
 
-use self::{astronomy::starfield::StarfieldPlugin, spatial::SpatialPlugin};
+use self::spatial::SpatialPlugin;
 
 pub struct WorldPlugin;
 impl Plugin for WorldPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugins((StarfieldPlugin, SpatialPlugin));
+        app.add_plugins(SpatialPlugin);
     }
 }