upgrade to bevy 0.12

Author: CleanCut

CHANGELOG.md

@@ -19,12 +19,12 @@
   - `LShift` -> `ShiftLeft`
   - `LWin` -> `SuperLeft`
   - `RWin` -> `SuperRight`
-  
+
 
 ### Improved
 
-- Update bevy from 0.8 to 0.11
-- Update bevy_prototype_lyon from 0.6 to 0.9
+- Update bevy from 0.8 to 0.12
+- Update bevy_prototype_lyon from 0.6 to 0.10
 - Update ron from 0.7 to 0.8
 - Fixed some inconsistent parameter names in examples
 - Some examples' audio was turned down lower

Cargo.toml

@@ -21,7 +21,7 @@ exclude = [
 ]
 
 [dependencies]
-bevy = { version = "0.11.3", default-features = false, features = [
+bevy = { version = "0.12.1", default-features = false, features = [
     "bevy_audio",
     "bevy_gilrs",
     "bevy_gltf",
@@ -34,7 +34,7 @@ bevy = { version = "0.11.3", default-features = false, features = [
     "x11",
     "vorbis",
 ] }
-bevy_prototype_lyon = "0.9.0"
+bevy_prototype_lyon = "0.10.0"
 ron = "0.8"
 serde = { version = "1.0", features = [ "derive" ] }
 

src/audio.rs

@@ -242,9 +242,8 @@ pub fn queue_managed_audio_system(
     mut game_state: ResMut<Engine>,
 ) {
     for (sfx, volume) in game_state.audio_manager.sfx_queue.drain(..) {
-        let sfx_path = format!("audio/{}", sfx);
         commands.spawn(AudioBundle {
-            source: asset_server.load(sfx_path.as_str()),
+            source: asset_server.load(format!("audio/{}", sfx)),
             settings: PlaybackSettings {
                 mode: PlaybackMode::Despawn,
                 volume: Volume::new_relative(volume),
@@ -261,10 +260,9 @@ pub fn queue_managed_audio_system(
         }
         // start the new music...if we have some
         if let Some((music, volume)) = item {
-            let music_path = format!("audio/{}", music);
             let entity = commands
                 .spawn(AudioBundle {
-                    source: asset_server.load(music_path.as_str()),
+                    source: asset_server.load(format!("audio/{}", music)),
                     settings: PlaybackSettings {
                         volume: Volume::new_relative(volume),
                         mode: PlaybackMode::Loop,

src/game.rs

@@ -170,7 +170,7 @@ fn add_collider_lines(commands: &mut Commands, sprite: &mut Sprite) {
             .spawn((
                 ShapeBundle {
                     path: GeometryBuilder::new().add(&line).build(),
-                    transform,
+                    spatial: SpatialBundle::from_transform(transform),
                     ..Default::default()
                 },
                 Stroke::new(Color::WHITE, 1.0 / transform.scale.x),
@@ -220,7 +220,7 @@ pub fn add_texts(commands: &mut Commands, asset_server: &Res<AssetServer>, engin
                 text: BevyText::from_section(
                     text_string,
                     TextStyle {
-                        font: asset_server.load(font_path.as_str()),
+                        font: asset_server.load(font_path),
                         font_size,
                         color: Color::WHITE,
                     },
@@ -307,6 +307,8 @@ impl<S: Resource + Send + Sync + 'static> Game<S> {
     pub fn run(&mut self, initial_game_state: S) {
         self.app.insert_resource::<S>(initial_game_state);
         self.app
+            // TODO: Remove this to use the new, darker default color once the videos have been remastered
+            .insert_resource(ClearColor(Color::rgb(0.4, 0.4, 0.4)))
             // Built-ins
             .add_plugins(
                 DefaultPlugins
@@ -386,7 +388,7 @@ fn game_logic_sync<S: Resource + Send + Sync + 'static>(
 
     // Copy all collision events over to the engine to give to users
     engine.collision_events.clear();
-    for collision_event in collision_events.iter() {
+    for collision_event in collision_events.read() {
         engine.collision_events.push(collision_event.clone());
     }
 
@@ -478,7 +480,7 @@ fn game_logic_sync<S: Resource + Send + Sync + 'static>(
             if text.font_size != bevy_text_component.sections[0].style.font_size {
                 bevy_text_component.sections[0].style.font_size = text.font_size;
             }
-            let font = asset_server.load(text.font.as_str());
+            let font = asset_server.load(text.font.clone());
             if bevy_text_component.sections[0].style.font != font {
                 bevy_text_component.sections[0].style.font = font;
             }

src/keyboard.rs

@@ -24,7 +24,7 @@ fn sync_keyboard_events(
     engine.keyboard_events.clear();
 
     // Populate this frame's events
-    for event in keyboard_input_events.iter() {
+    for event in keyboard_input_events.read() {
         engine.keyboard_events.push(event.clone());
     }
 }

src/mouse.rs

@@ -191,23 +191,23 @@ fn sync_mouse_events(
     game_state.mouse_wheel_events.clear();
 
     // Populate this frame's events
-    for ev in mouse_button_events.iter() {
+    for ev in mouse_button_events.read() {
         game_state.mouse_button_events.push(ev.clone());
     }
-    for ev in cursor_moved_events.iter() {
+    for ev in cursor_moved_events.read() {
         let mut new_event = ev.clone();
         // Convert from screen space to game space
         // TODO: Check to see if this needs to be adjusted for different DPIs
         new_event.position.x -= game_state.window_dimensions.x * 0.5;
         new_event.position.y = -new_event.position.y + (game_state.window_dimensions.y * 0.5);
         game_state.mouse_location_events.push(new_event);
     }
-    for ev in mouse_motion_events.iter() {
+    for ev in mouse_motion_events.read() {
         let mut ev2 = ev.clone();
         ev2.delta.y *= -1.0;
         game_state.mouse_motion_events.push(ev2.clone());
     }
-    for ev in mouse_wheel_events.iter() {
+    for ev in mouse_wheel_events.read() {
         game_state.mouse_wheel_events.push(ev.clone());
     }
 }
@@ -223,7 +223,7 @@ fn sync_mouse_state(
 ) {
     // Sync the current mouse location, which will be the last cursor_moved event that occurred.
     // Only changes when we get a new event, otherwise we preserve the last location.
-    if let Some(event) = cursor_moved_events.iter().last() {
+    if let Some(event) = cursor_moved_events.read().last() {
         // Convert from bevy's window space to our game space
         let mut location = event.position.clone();
         location.x -= game_state.window_dimensions.x * 0.5;
@@ -232,7 +232,7 @@ fn sync_mouse_state(
     }
     // Sync the relative mouse motion. This is the cumulative relative motion during the last frame.
     mouse_state.motion = Vec2::ZERO;
-    for ev in mouse_motion_events.iter() {
+    for ev in mouse_motion_events.read() {
         // Convert motion to game space direction (positive y is up, not down)
         // TODO: Check to see if this needs to be adjusted for different DPIs
         let mut ev2 = ev.clone();
@@ -243,7 +243,7 @@ fn sync_mouse_state(
     mouse_state.wheel = MouseWheelState::default();
     let mut cumulative_x = 0.0;
     let mut cumulative_y = 0.0;
-    for ev in mouse_wheel_events.iter() {
+    for ev in mouse_wheel_events.read() {
         cumulative_x += ev.x;
         cumulative_y += ev.y;
     }