Updated bracket-bevy to Bevy 0.11.0

.gitignore

@@ -5,3 +5,4 @@ Cargo.lock
 **/wasm_help/staging
 .vscode/launch.json
 manual/book/*
+dependency_order.md

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "bracket-lib"
-version = "0.8.2"
+version = "0.8.7"
 authors = ["Herbert Wolverson <[email protected]>"]
-edition = "2018"
+edition = "2021"
 publish = true
 description = "Meta-crate holding the entirety of bracket-lib (and exposing it). Use this for the full roguelike toolkit experience."
 homepage = "https://github.com/thebracket/bracket-lib"
@@ -23,9 +23,11 @@ exclude = [
     "screenshots"
 ]
 resolver = "2" # Enables the new Cargo resolution engine
+incremental = false # Causing issues with Windows builds
 
 [features]
 default = [ "opengl" ]
+bevy = ["bracket-geometry/bevy"]
 specs = [ "bracket-geometry/specs" ]
 serde = [ "bracket-color/serde", "bracket-geometry/serde", "bracket-random/serde" ]
 threaded = [ "bracket-pathfinding/threaded" ]
@@ -35,13 +37,13 @@ crossterm = [ "bracket-terminal/cross_term" ]
 webgpu = [ "bracket-terminal/webgpu" ]
 
 [dependencies]
-bracket-algorithm-traits = { path = "./bracket-algorithm-traits", version = "~0.8.2" }
-bracket-color = { path = "./bracket-color", version = "~0.8.2", features = [ "palette" ] }
-bracket-geometry = { path = "./bracket-geometry", version = "~0.8.2" }
-bracket-noise = { path = "./bracket-noise", version = "~0.8.2" }
-bracket-pathfinding = { path = "./bracket-pathfinding", version = "~0.8.2" }
-bracket-random = { path = "./bracket-random", version = "~0.8.2", features = [ "parsing" ] }
-bracket-terminal = { path = "./bracket-terminal", version = "~0.8.2", default-features = false }
+bracket-algorithm-traits = { path = "./bracket-algorithm-traits", version = "~0.8" }
+bracket-color = { path = "./bracket-color", version = "~0.8", features = [ "palette" ] }
+bracket-geometry = { path = "./bracket-geometry", version = "~0.8" }
+bracket-noise = { path = "./bracket-noise", version = "~0.8" }
+bracket-pathfinding = { path = "./bracket-pathfinding", version = "~0.8" }
+bracket-random = { path = "./bracket-random", version = "~0.8", features = [ "parsing" ] }
+bracket-terminal = { path = "./bracket-terminal", version = "~0.8", default-features = false }
 
 [workspace]
 members = [
@@ -55,16 +57,5 @@ members = [
     "rltk",
     "bracket-rex",
     "bracket-embedding",
-    "bracket-bevy"
+    "bracket-bevy",
 ]
-
-# Comment this out for releases
-#[patch.crates-io]
-#bracket-algorithm-traits = { path = "bracket-algorithm-traits/" }
-#bracket-color = { path = "bracket-color/" }
-#bracket-geometry = { path = "bracket-geometry/" }
-#bracket-noise = { path = "bracket-noise/" }
-#bracket-pathfinding = { path = "bracket-pathfinding/" }
-#bracket-random = { path = "bracket-random/" }
-#bracket-terminal = { path = "bracket-terminal/" }
-#rltk = { path = "rltk/" }

README.md

@@ -30,7 +30,7 @@ In your `Cargo.toml` file, include:
 
 ```toml
 [dependencies]
-bracket-lib = "0.7"
+bracket-lib = "~0.8"
 ```
 
 ## Feature Flags

bracket-algorithm-traits/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "bracket-algorithm-traits"
-version = "0.8.2"
+version = "0.8.7"
 authors = ["Herbert Wolverson <[email protected]>"]
-edition = "2018"
+edition = "2021"
 publish = true
 description = "Traits required for the bracket-* crates. Adapt your maps to the traits with Algorithm2D, Algorithm3D and BaseMap."
 homepage = "https://github.com/thebracket/bracket-lib"
@@ -15,5 +15,5 @@ license = "MIT"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bracket-geometry = { path = "../bracket-geometry", version = "~0.8.2" }
+bracket-geometry = { path = "../bracket-geometry", version = "~0.8" }
 smallvec = "~1"

bracket-bevy/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bracket-bevy"
-version = "0.9.0"
+version = "0.11.0"
 edition = "2021"
 authors = ["Herbert Wolverson <[email protected]>"]
 publish = true
@@ -13,13 +13,14 @@ categories = ["game-engines", "graphics"]
 license = "MIT"
 
 [dependencies]
-bevy = "0.8"
+
+bevy = "0.11.0"
 parking_lot = "0.12"
 lazy_static = "1.4"
 bracket-random = { path = "../bracket-random" }
 bracket-color = { path = "../bracket-color", features = [ "bevy" ] }
-bracket-geometry = { path = "../bracket-geometry", version = "~0.8.3" }
+bracket-geometry = { path = "../bracket-geometry", version = "~0.8", features = [ "bevy" ] }
 
 [dev-dependencies]
-bracket-pathfinding = { path = "../bracket-pathfinding", version = "~0.8.4" }
-bracket-noise = { path = "../bracket-noise", version = "~0.8.2" }
+bracket-pathfinding = { path = "../bracket-pathfinding", version = "~0.8" }
+bracket-noise = { path = "../bracket-noise", version = "~0.8" }

bracket-bevy/examples/bevy_a_star_mouse.rs

@@ -23,6 +23,7 @@ enum Mode {
     Moving,
 }
 
+#[derive(Resource)]
 struct State {
     map: Vec<TileType>,
     player_position: usize,

bracket-bevy/examples/bevy_alpha.rs

@@ -34,8 +34,8 @@ fn tick(ctx: Res<BracketContext>, mut state: Local<State>) {
     ctx.set_active_console(0);
     ctx.cls();
     state.totc.print_sub_rect(
-        Rect::with_size(0, 0, 79, 49),
-        Rect::with_exact(0, 0, 79, 49),
+        bracket_bevy::prelude::Rect::with_size(0, 0, 79, 49),
+        bracket_bevy::prelude::Rect::with_exact(0, 0, 79, 49),
         0,
         &ctx,
     );

bracket-bevy/examples/bevy_colorfont.rs

@@ -24,8 +24,8 @@ impl Default for TickResource {
 fn tick(ctx: Res<BracketContext>, tale_of_two_cities: Local<TickResource>) {
     ctx.cls();
     tale_of_two_cities.0.print_sub_rect(
-        Rect::with_size(0, 0, 79, 25),
-        Rect::with_exact(0, 0, 79, 25),
+        bracket_bevy::prelude::Rect::with_size(0, 0, 79, 25),
+        bracket_bevy::prelude::Rect::with_exact(0, 0, 79, 25),
         0,
         &ctx,
     );

bracket-bevy/examples/bevy_hello_terminal.rs

@@ -17,6 +17,7 @@ fn main() {
         .run();
 }
 
+#[derive(Resource)]
 struct State {
     y: i32,
     going_down: bool,

bracket-bevy/examples/bevy_roguelike_tutorial_4/main.rs

@@ -25,7 +25,7 @@ fn setup(mut commands: Commands, rng: Res<RandomNumbers>) {
     let (player_x, player_y) = rooms[0].center();
     commands.insert_resource(map);
     commands
-        .spawn()
+        .spawn_empty()
         .insert(Position {
             x: player_x,
             y: player_y,
@@ -40,7 +40,7 @@ fn setup(mut commands: Commands, rng: Res<RandomNumbers>) {
 
 fn tick(
     ctx: Res<BracketContext>,
-    map: Res<Vec<TileType>>,
+    map: Res<Map>,
     keyboard: Res<Input<KeyCode>>,
     mut queries: ParamSet<(
         Query<&mut Position, With<Player>>,
@@ -54,13 +54,13 @@ fn tick(
         let mut player_query = queries.p0();
         let mut pos = player_query.single_mut();
         let destination_idx = xy_idx(pos.x + delta.0, pos.y + delta.1);
-        if map[destination_idx] != TileType::Wall {
+        if map.0[destination_idx] != TileType::Wall {
             pos.x = min(79, max(0, pos.x + delta.0));
             pos.y = min(49, max(0, pos.y + delta.1));
         }
     }
 
-    draw_map(&map, &ctx);
+    draw_map(&map.0, &ctx);
     for (pos, render) in queries.p1().iter() {
         ctx.set(pos.x, pos.y, render.fg, render.bg, render.glyph);
     }

bracket-bevy/examples/bevy_roguelike_tutorial_4/map.rs

@@ -1,4 +1,5 @@
 use crate::rect::Rect;
+use bevy::prelude::Resource;
 use bracket_bevy::{
     prelude::{to_cp437, RGB},
     BracketContext, RandomNumbers,
@@ -11,6 +12,9 @@ pub enum TileType {
     Floor,
 }
 
+#[derive(Resource)]
+pub struct Map(pub Vec<TileType>);
+
 pub fn xy_idx(x: i32, y: i32) -> usize {
     (y as usize * 80) + x as usize
 }
@@ -70,7 +74,7 @@ fn apply_vertical_tunnel(map: &mut [TileType], y1: i32, y2: i32, x: i32) {
 
 /// Makes a new map using the algorithm from http://rogueliketutorials.com/tutorials/tcod/part-3/
 /// This gives a handful of random rooms and corridors joining them together.
-pub fn new_map_rooms_and_corridors(rng: &RandomNumbers) -> (Vec<Rect>, Vec<TileType>) {
+pub fn new_map_rooms_and_corridors(rng: &RandomNumbers) -> (Vec<Rect>, Map) {
     let mut map = vec![TileType::Wall; 80 * 50];
 
     let mut rooms: Vec<Rect> = Vec::new();
@@ -109,7 +113,7 @@ pub fn new_map_rooms_and_corridors(rng: &RandomNumbers) -> (Vec<Rect>, Vec<TileT
         }
     }
 
-    (rooms, map)
+    (rooms, Map(map))
 }
 
 pub fn draw_map(map: &[TileType], ctx: &BracketContext) {

bracket-bevy/examples/bevy_tiles.rs

@@ -11,6 +11,7 @@ enum TileType {
     Floor,
 }
 
+#[derive(Resource)]
 struct State {
     map: Vec<TileType>,
     player_position: usize,

bracket-bevy/examples/bevy_two_layers_two_fonts.rs

@@ -18,6 +18,7 @@ fn main() {
         .run();
 }
 
+#[derive(Resource)]
 struct Bouncer(i32);
 
 fn tick(ctx: Res<BracketContext>, mut bouncer: ResMut<Bouncer>) {

bracket-bevy/examples/bevy_walking.rs

@@ -16,6 +16,7 @@ enum TileType {
     Floor,
 }
 
+#[derive(Resource)]
 struct State {
     map: Vec<TileType>,
     visited: Vec<bool>,

bracket-bevy/src/builder/bterm_builder.rs

@@ -3,11 +3,13 @@ use crate::{
         apply_all_batches, default_gutter_size, replace_meshes, update_mouse_position,
         update_timing, window_resize, ScreenScaler,
     },
-    load_terminals, update_consoles, RandomNumbers, TerminalBuilderFont, TerminalLayer, fix_images,
+    fix_images, load_terminals, update_consoles, RandomNumbers, TerminalBuilderFont, TerminalLayer,
 };
 use bevy::{
     diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin},
-    prelude::{CoreStage, Plugin, SystemStage},
+
+    prelude::{Plugin, Resource, Msaa, Startup, PostUpdate, PreUpdate, First},
+
     utils::HashMap,
 };
 use bracket_color::prelude::RGBA;
@@ -19,7 +21,7 @@ pub enum TerminalScalingMode {
     ResizeTerminals,
 }
 
-#[derive(Clone)]
+#[derive(Clone, Resource)]
 pub struct BTermBuilder {
     pub(crate) fonts: Vec<TerminalBuilderFont>,
     pub(crate) layers: Vec<TerminalLayer>,
@@ -176,37 +178,32 @@ impl BTermBuilder {
 
 impl Plugin for BTermBuilder {
     fn build(&self, app: &mut bevy::prelude::App) {
-        app.insert_resource(bevy::prelude::Msaa { samples: 1 });
-        if self.with_diagnostics {
-            app.add_plugin(FrameTimeDiagnosticsPlugin);
+        app.insert_resource(Msaa::Off);
+
+        if self.with_diagnostics {    
+            app.add_plugins(FrameTimeDiagnosticsPlugin);
         }
         if self.log_diagnostics {
-            app.add_plugin(LogDiagnosticsPlugin::default());
+            app.add_plugins(LogDiagnosticsPlugin::default());
         }
         app.insert_resource(self.clone());
         app.insert_resource(ScreenScaler::new(self.gutter));
-        app.add_startup_system(load_terminals);
+        app.add_systems(Startup, load_terminals);
         if self.with_diagnostics {
-            app.add_stage_before(
-                CoreStage::Update,
-                "bracket_term_diagnostics",
-                SystemStage::single_threaded(),
-            );
-            app.add_system(update_timing);
-            app.add_system(update_mouse_position);
+            app.add_systems(First, update_timing);
+            app.add_systems(PreUpdate,update_mouse_position);
         }
-        app.add_stage_after(
-            CoreStage::Update,
-            "bracket_term_update",
-            SystemStage::single_threaded(),
-        );
-        if self.auto_apply_batches {
-            app.add_system(apply_all_batches);
+
+        if self.auto_apply_batches {   
+            app.add_systems(PostUpdate, apply_all_batches);
         }
-        app.add_system(update_consoles);
-        app.add_system(replace_meshes);
-        app.add_system(window_resize);
-        app.add_system(fix_images);
+
+        //update_schedule_label
+        app.add_systems(PostUpdate, update_consoles);
+        app.add_systems(PostUpdate, replace_meshes);
+        app.add_systems(PostUpdate, window_resize);
+        app.add_systems(PostUpdate,fix_images);
+
         if self.with_random_number_generator {
             app.insert_resource(RandomNumbers::new());
         }

bracket-bevy/src/builder/image_fixer.rs

@@ -1,19 +1,22 @@
-use bevy::{prelude::*, render::{texture::ImageSampler, render_resource::SamplerDescriptor}};
+use bevy::{
+    prelude::*,
+    render::{render_resource::SamplerDescriptor, texture::ImageSampler},
+};
 
-pub(crate) struct ImagesToLoad (pub(crate) Vec<HandleUntyped>);
+#[derive(Resource)]
+pub(crate) struct ImagesToLoad(pub(crate) Vec<HandleUntyped>);
 
-pub(crate) fn fix_images(
-    mut fonts: ResMut<ImagesToLoad>,
-    mut images: ResMut<Assets<Image>>,    
-) {
+pub(crate) fn fix_images(mut fonts: ResMut<ImagesToLoad>, mut images: ResMut<Assets<Image>>) {
     if fonts.0.is_empty() {
         return;
     }
 
     for (handle, img) in images.iter_mut() {
         let mut to_remove = Vec::new();
-        if let Some(i) = fonts.0.iter().enumerate().find(|(_i, h)| h.id == handle) {
-            img.sampler_descriptor = ImageSampler::Descriptor(SamplerDescriptor{
+
+        if let Some(i) = fonts.0.iter().enumerate().find(|(_i, h)| h.id() == handle) {
+            img.sampler_descriptor = ImageSampler::Descriptor(SamplerDescriptor {
+
                 label: Some("LeaveItAlone"),
                 address_mode_u: bevy::render::render_resource::AddressMode::ClampToEdge,
                 address_mode_v: bevy::render::render_resource::AddressMode::ClampToEdge,
@@ -25,6 +28,8 @@ pub(crate) fn fix_images(
             });
             to_remove.push(i.0);
         }
-        to_remove.iter().for_each(|i| { fonts.0.remove(*i); });
+        to_remove.iter().for_each(|i| {
+            fonts.0.remove(*i);
+        });
     }
-}
+}

bracket-bevy/src/builder/loader_system.rs

@@ -3,7 +3,9 @@ use crate::{
     TerminalLayer,
 };
 use bevy::{
-    prelude::{AssetServer, Assets, Camera2dBundle, Commands, Component, Mesh, Res, ResMut, HandleUntyped},
+    prelude::{
+        AssetServer, Assets, Camera2dBundle, Commands, Component, HandleUntyped, Mesh, Res, ResMut,
+    },
     sprite::ColorMaterial,
 };
 
@@ -21,7 +23,7 @@ pub(crate) fn load_terminals(
 ) {
     if context.with_ortho_camera {
         commands
-            .spawn_bundle(Camera2dBundle::default())
+            .spawn(Camera2dBundle::default())
             .insert(BracketCamera);
     }