resolve merge conflict

Author: CleanCut

CHANGELOG.md

@@ -1,6 +1,16 @@
 <!-- next-header -->
 ## [Unreleased] - ReleaseDate
 
+### BREAKING CHANGES
+
+- `Game` is now generic over the user-provided game state struct, so the `init!` macro from the short-lived `3.0.0` version has been removed!
+
+### Other Changes
+
+- Upgraded to Bevy 0.6 in the back end
+- `Text` rotation and scale now works! 🎉
+- TODO: bevy_prototype_debug_lines hasn't had a release, and the `main` branch sorta works, but the lines now appear _under_ sprites instead of over them, which is not ideal. We _must_ have a release upstream and would _love_ a fix upstream. If there isn't an upstream release, we'll need to find another line-drawing solution before release.
+
 ## [3.0.0] - 2021-12-30
 
 ### BREAKING CHANGES

Cargo.toml

@@ -9,30 +9,39 @@ readme = "README.md"
 keywords = [ "game", "engine", "graphics", "audio", "rusty" ]
 categories = [ "game-engines" ]
 license = "MIT OR Apache-2.0"
+exclude = [
+    "/assets",
+    "/.github",
+    "/scenarios",
+    "/tutorial",
+    "/script",
+    "release.toml",
+    "RELEASE.md",
+    ".gitignore",
+]
 
 [dependencies]
-#bevy = { git = "https://github.com/bevyengine/bevy", rev = "47004dfcb415a049e4c6e68fdf56c26de72f51a1" }
-#bevy = { git = "https://github.com/bevyengine/bevy", branch = "main" }
-bevy = { version = "0.5", default-features = false, features = [
+bevy = { version = "0.6.0", default-features = false, features = [
     #"bevy_audio"
     "bevy_dynamic_plugin",
     "bevy_gilrs",
     "bevy_gltf",
-    "bevy_wgpu",
     "bevy_winit",
     "render",
     "png",
     "hdr",
     "mp3",
     "x11",
 ] }
-bevy_kira_audio = { version = "0.6.0", features = [
+bevy_kira_audio = { version = "0.8", features = [
     "flac",
     "mp3",
     "ogg",
     "wav",
 ] }
-bevy_prototype_debug_lines = "0.3"
+#bevy_prototype_debug_lines = "0.3"
+#bevy_prototype_debug_lines = { version = "0.4.0", path = "../bevy_debug_lines" }
+bevy_prototype_debug_lines = { git = "https://github.com/Toqozz/bevy_debug_lines", branch = "bevy-main" }
 lazy_static = "1.4"
 log = "0.4"
 ron = "0.7"

README.md

@@ -70,9 +70,6 @@ Write your game!
      health: i32,
  }
 
- // Initialize the engine with your custom struct
- rusty_engine::init!(GameState);
-
  fn main() {
      // Create a game
      let mut game = Game::new();

examples/collider_creator.rs

@@ -1,8 +1,8 @@
 //! To run this code, clone the rusty_engine repository and run the command:
-//! 
-//!     cargo run --release --example collider_creator -- path/to/some_image.png
-//! 
-//!  ...where path/to/some_image.png is relative to assets/sprite/
+//!
+//!     cargo run --release --example collider_creator path/to/some_image.png
+//!
+//!  ...where that image is somewhere under assets/sprite
 
 use std::path::PathBuf;
 
@@ -20,15 +20,13 @@ impl Default for GameState {
     }
 }
 
-rusty_engine::init!(GameState);
-
 fn main() {
     // We need an image file to work with, so the user must pass in the path of an image
     let args = std::env::args().skip(1).collect::<Vec<_>>();
     if args.len() != 1 {
         println!(
             "Please pass in the path of an image inside the `assets/sprite` directory! For example:\n\
-            cargo run --release --example collider_creator -- racing/car_green.png"
+            cargo run --release --example collider_creator assets/sprite/racing/car_green.png"
         );
         std::process::exit(1);
     }
@@ -43,7 +41,7 @@ fn main() {
             .unwrap()
             .to_path_buf();
     }
-    if !(PathBuf::from("assets").join(&path)).exists() {
+    if !(PathBuf::from("assets/sprite").join(&path)).exists() {
         println!("Couldn't find the file {}", path.to_string_lossy());
         std::process::exit(1);
     }

examples/collision.rs

@@ -4,8 +4,6 @@
 
 use rusty_engine::prelude::*;
 
-rusty_engine::init!();
-
 const ROTATION_SPEED: f32 = 3.0;
 
 fn main() {

examples/game_state.rs

@@ -15,9 +15,6 @@ struct MyCustomGameStateStuff {
     turning: bool,
 }
 
-// Pass your custom struct to the init macro
-rusty_engine::init!(MyCustomGameStateStuff);
-
 fn main() {
     let mut game = Game::new();
     let _ = game.add_sprite("Race Car", SpritePreset::RacingCarGreen);

examples/keyboard_events.rs

@@ -4,8 +4,6 @@
 
 use rusty_engine::prelude::*;
 
-rusty_engine::init!();
-
 fn main() {
     let mut game = Game::new();
 

examples/keyboard_state.rs

@@ -6,8 +6,6 @@ use std::f32::consts::PI;
 
 use rusty_engine::prelude::*;
 
-rusty_engine::init!();
-
 fn main() {
     let mut game = Game::new();
 

examples/layer.rs

@@ -4,8 +4,6 @@
 
 use rusty_engine::prelude::*;
 
-rusty_engine::init!();
-
 fn main() {
     let mut game = Game::new();
 

examples/level_creator.rs

@@ -24,8 +24,6 @@ impl Default for GameState {
     }
 }
 
-rusty_engine::init!(GameState);
-
 const MAX_LAYER: f32 = 900.0;
 
 fn main() {
@@ -122,7 +120,7 @@ fn logic(engine_state: &mut EngineState, game_state: &mut GameState) -> bool {
     // Print out the level?
     if print_level {
         println!(
-            "---------------\n\nuse rusty_engine::prelude::*;\n\nstruct GameState {{}}\n\nrusty_engine::init!(GameState);\n\nfn main() {{\n    let mut game = Game::new();\n"
+            "---------------\n\nuse rusty_engine::prelude::*;\n\nstruct GameState {{}}\n\nfn main() {{\n    let mut game = Game::new();\n"
         );
         for sprite in engine_state.sprites.values() {
             if sprite.label == game_state.current_label {
@@ -208,7 +206,15 @@ fn logic(engine_state: &mut EngineState, game_state: &mut GameState) -> bool {
             .enumerate()
             .find(|(_, preset)| preset.filepath() == old_sprite.filepath)
             .unwrap();
-        let new_idx = (idx + 1) % SpritePreset::variant_iter().count();
+        let new_idx = if next_preset {
+            (idx + 1) % SpritePreset::variant_iter().count()
+        } else {
+            if idx == 0 {
+                SpritePreset::variant_iter().count() - 1
+            } else {
+                idx - 1
+            }
+        };
         let new_preset = SpritePreset::variant_iter().nth(new_idx).unwrap();
 
         let new_label = game_state.next_sprite_num.to_string();