Merge pull request #54 from CleanCut/bevy-0.8

Update to bevy-0.8 and bevy_prototype_lyon 0.6

Author: CleanCut

CHANGELOG.md

@@ -1,6 +1,11 @@
 <!-- next-header -->
 ## [Unreleased] - ReleaseDate
 
+## Improved
+
+- Updated to `bevy 0.8` and `bevy_prototype_lyon 0.6` under the hood, which resolves the occasional stuttering problem.
+
+
 ## [5.1.0] - 2022-06-18
 
 ### Improved

Cargo.toml

@@ -21,7 +21,7 @@ exclude = [
 ]
 
 [dependencies]
-bevy = { version = "0.7.0", default-features = false, features = [
+bevy = { version = "0.8.0", default-features = false, features = [
     "bevy_audio",
     "bevy_gilrs",
     "bevy_gltf",
@@ -33,7 +33,7 @@ bevy = { version = "0.7.0", default-features = false, features = [
     "x11",
     "vorbis",
 ] }
-bevy_prototype_lyon = "0.5"
+bevy_prototype_lyon = "0.6"
 ron = "0.7"
 serde = { version = "1.0", features = [ "derive" ] }
 

examples/keyboard_events.rs

@@ -29,7 +29,7 @@ fn logic(game_state: &mut Engine, _: &mut ()) {
         if let KeyboardInput {
             scan_code: _,
             key_code: Some(key_code),
-            state: ElementState::Pressed,
+            state: ButtonState::Pressed,
         } = keyboard_event
         {
             // Handle various keypresses. The extra keys are for the Dvorak keyboard layout. ;-)

examples/level_creator.rs

@@ -100,7 +100,7 @@ fn logic(engine: &mut Engine, game_state: &mut GameState) {
             state,
         } = keyboard_event
         {
-            if *state == ElementState::Pressed {
+            if *state == ButtonState::Pressed {
                 match key_code {
                     KeyCode::Z | KeyCode::Semicolon => {
                         print_level = true;
@@ -184,7 +184,7 @@ fn logic(engine: &mut Engine, game_state: &mut GameState) {
         }
         // Handle rotation via mouse clicks
         for mouse_button_input in &engine.mouse_button_events {
-            if mouse_button_input.state != ElementState::Pressed {
+            if mouse_button_input.state != ButtonState::Pressed {
                 break;
             }
             let rotate_amount = if game_state.shift_pressed {

examples/mouse_events.rs

@@ -42,7 +42,7 @@ fn logic(engine: &mut Engine, _: &mut ()) {
     if let Some(sprite) = engine.sprites.get_mut("Race Car") {
         // Use mouse button events to rotate. Every click rotates the sprite by a fixed amount
         for mouse_button_input in &engine.mouse_button_events {
-            if mouse_button_input.state != ElementState::Pressed {
+            if mouse_button_input.state != ButtonState::Pressed {
                 break;
             }
             match mouse_button_input.button {

examples/music_sampler.rs

@@ -24,7 +24,7 @@ fn logic(engine: &mut Engine, game_state: &mut GameState) {
     let mut should_play_new_song = false;
     // Play a new song because a key was pressed
     for ev in engine.keyboard_events.drain(..) {
-        if ev.state != ElementState::Pressed {
+        if ev.state != ButtonState::Pressed {
             continue;
         }
         game_state.music_index = (game_state.music_index + 1) % MusicPreset::variant_iter().count();

src/game.rs

@@ -1,14 +1,15 @@
 use bevy::{
     app::AppExit,
-    core::Time,
-    input::system::exit_on_esc_system,
     prelude::{
-        debug, App, AssetServer, Color, Commands, Component, DefaultPlugins, Entity, EventReader,
-        EventWriter, HorizontalAlign, OrthographicCameraBundle, ParallelSystemDescriptorCoercion,
+        debug, App, AssetServer, Camera2dBundle, Color, Commands, Component, DefaultPlugins,
+        Entity, EventReader, EventWriter, HorizontalAlign, ParallelSystemDescriptorCoercion,
         ParamSet, Query, Res, ResMut, SpriteBundle, Text as BevyText, Text2dBundle, TextAlignment,
         TextStyle, Transform, Vec2, VerticalAlign, Windows,
     },
+    render::texture::ImageSettings,
+    time::Time,
     utils::HashMap,
+    window::close_on_esc,
 };
 use bevy_prototype_lyon::prelude::*;
 use std::{
@@ -209,18 +210,18 @@ pub fn add_texts(commands: &mut Commands, asset_server: &Res<AssetServer>, engin
         let text_string = text.value.clone();
         let font_path = text.font.clone();
         commands.spawn().insert(text).insert_bundle(Text2dBundle {
-            text: BevyText::with_section(
+            text: BevyText::from_section(
                 text_string,
                 TextStyle {
                     font: asset_server.load(font_path.as_str()),
                     font_size,
                     color: Color::WHITE,
                 },
-                TextAlignment {
-                    vertical: VerticalAlign::Center,
-                    horizontal: HorizontalAlign::Center,
-                },
-            ),
+            )
+            .with_alignment(TextAlignment {
+                vertical: VerticalAlign::Center,
+                horizontal: HorizontalAlign::Center,
+            }),
             transform,
             ..Default::default()
         });
@@ -230,12 +231,13 @@ pub fn add_texts(commands: &mut Commands, asset_server: &Res<AssetServer>, engin
 /// system - update current window dimensions in the engine, because people resize windows
 #[doc(hidden)]
 pub fn update_window_dimensions(windows: Res<Windows>, mut engine: ResMut<Engine>) {
-    // Unwrap: If we can't access the primary window...there's no point to running Rusty Engine
-    let window = windows.get_primary().unwrap();
-    let screen_dimensions = Vec2::new(window.width(), window.height());
-    if screen_dimensions != engine.window_dimensions {
-        engine.window_dimensions = screen_dimensions;
-        debug!("Set window dimensions: {}", engine.window_dimensions);
+    // It's possible to not have window dimensions for the first frame or two
+    if let Some(window) = windows.get_primary() {
+        let screen_dimensions = Vec2::new(window.width(), window.height());
+        if screen_dimensions != engine.window_dimensions {
+            engine.window_dimensions = screen_dimensions;
+            debug!("Set window dimensions: {}", engine.window_dimensions);
+        }
     }
 }
 
@@ -296,11 +298,12 @@ impl<S: Send + Sync + 'static> Game<S> {
     pub fn run(&mut self, initial_game_state: S) {
         self.app
             .insert_resource::<WindowDescriptor>(self.window_descriptor.clone())
+            .insert_resource(ImageSettings::default_nearest())
             .insert_resource::<S>(initial_game_state);
         self.app
             // Built-ins
             .add_plugins(DefaultPlugins)
-            .add_system(exit_on_esc_system)
+            .add_system(close_on_esc)
             // External Plugins
             .add_plugin(ShapePlugin) // bevy_prototype_lyon, for displaying sprite colliders
             // Rusty Engine Plugins
@@ -319,7 +322,7 @@ impl<S: Send + Sync + 'static> Game<S> {
         self.app
             .world
             .spawn()
-            .insert_bundle(OrthographicCameraBundle::new_2d());
+            .insert_bundle(Camera2dBundle::default());
         let engine = std::mem::take(&mut self.engine);
         self.app.insert_resource(engine);
         let logic_functions = std::mem::take(&mut self.logic_functions);

src/mouse.rs

@@ -7,7 +7,7 @@ use bevy::{prelude::*, utils::HashSet};
 pub use bevy::{
     input::{
         mouse::{MouseButton, MouseButtonInput, MouseMotion, MouseWheel},
-        ElementState,
+        ButtonState,
     },
     window::CursorMoved,
 };

tutorial/src/110-keyboard-events.md

@@ -11,7 +11,7 @@ for keyboard_event in game_state.keyboard_events.drain(..) {
     if let KeyboardInput {
         scan_code: _,
         key_code: Some(key_code),
-        state: ElementState::Pressed,
+        state: ButtonState::Pressed,
     } = keyboard_event
     {
         match key_code {

tutorial/src/120-mouse-events.md

@@ -11,7 +11,7 @@ You usually want to use [mouse state](115-mouse-state.md) for mouse buttons, whi
 
 ```rust,ignored
 for mouse_button_input in &engine.mouse_button_events {
-    if mouse_button_input.state != ElementState::Pressed {
+    if mouse_button_input.state != ButtonState::Pressed {
         break;
     }
     match mouse_button_input.button {