Bevy 0.15

Cargo.toml

@@ -12,10 +12,10 @@ repository = "https://github.com/SET001/bevy_scroller"
 version = "0.4.0"
 
 [dependencies]
-bevy = { version = "0.13.2", default-features = false, features = [
+bevy = { version = "0.15", default-features = false, features = [
   "bevy_sprite",
 ] }
-bevy_editor_pls = { version = "0.8.1", optional = true }
+bevy_editor_pls = { version = "0.9.0", optional = true }
 fast_poisson = { version = "1.0.0", features = [
   "single_precision",
 ], optional = true }
@@ -26,7 +26,7 @@ dev = ["bevy/bevy_gizmos", "bevy/dynamic_linking", "dep:bevy_editor_pls"]
 poisson = ["dep:fast_poisson"]
 
 [dev-dependencies]
-iyes_perf_ui = {version="0.2.3"}
+iyes_perf_ui = {version="0.4.0"}
 rstest = "0.18.2"
 
 [profile.dev]
@@ -39,4 +39,7 @@ opt-level = 3
 [[example]]
 name = "poisson"
 required-features = ["poisson"]
-path = "examples/poisson/rs"
+path = "examples/poisson.rs"
+
+[patch.crates-io]
+bevy_editor_pls = { git = "https://github.com/zhaop/bevy_editor_pls.git", branch = "bevy-0.14", optional = true }

README.md

@@ -135,6 +135,7 @@ You can also add `dev` feature to add wireframes and `bevy_editor_pls` to exampl
 
 | bevy | bevy_scroller |
 |-|-
+| 0.14.0 | 0.4.* |
 | 0.13.0 | 0.3.* |
 | 0.12.0 | 0.2.* |
 | 0.11.0 | 0.1.* |

examples/mirrors.rs

@@ -11,7 +11,7 @@ fn main() {
 
 pub fn start(world: &mut World) {
   let mirrors = world.register_system(spawn_mirrors);
-  let scroller_entity = world.run_system_once(spawn_scroller);
+  let scroller_entity = world.run_system_once(spawn_scroller).unwrap();
   world
     .entity_mut(scroller_entity)
     .insert(OnScrollerInit(mirrors));
@@ -70,39 +70,30 @@ fn spawn_mirrors(
   let window = windows.get_single().expect("no primary window");
   let sprite_size = Vec2::new(128., 128.);
   commands.spawn((
-    SpriteBundle {
-      texture: scroller.texture_handle.clone(),
-      transform: Transform {
-        translation: Vec3::new(0., (window.height() - sprite_size.y) / 2., 10.),
-        rotation: Quat::from_rotation_y(PI) * Quat::from_rotation_z(PI),
-        ..default()
-      },
+    Sprite::from_image(scroller.texture_handle.clone()),
+    Transform {
+      translation: Vec3::new(0., (window.height() - sprite_size.y) / 2., 10.),
+      rotation: Quat::from_rotation_y(PI) * Quat::from_rotation_z(PI),
       ..default()
     },
     Name::new("Scroller mirror top"),
   ));
 
   commands.spawn((
-    SpriteBundle {
-      texture: scroller.texture_handle.clone(),
-      transform: Transform {
-        translation: Vec3::new((window.width() - sprite_size.x) / 2., 0., 00.),
-        rotation: Quat::from_rotation_z(PI / 2.),
-        ..default()
-      },
+    Sprite::from_image(scroller.texture_handle.clone()),
+    Transform {
+      translation: Vec3::new((window.width() - sprite_size.x) / 2., 0., 00.),
+      rotation: Quat::from_rotation_z(PI / 2.),
       ..default()
     },
     Name::new("Scroller mirror right"),
   ));
 
   commands.spawn((
-    SpriteBundle {
-      texture: scroller.texture_handle.clone(),
-      transform: Transform {
-        translation: Vec3::new((sprite_size.x - window.width()) / 2., 0., 0.),
-        rotation: Quat::from_rotation_y(PI) * Quat::from_rotation_z(PI / 2.),
-        ..default()
-      },
+    Sprite::from_image(scroller.texture_handle.clone()),
+    Transform {
+      translation: Vec3::new((sprite_size.x - window.width()) / 2., 0., 0.),
+      rotation: Quat::from_rotation_y(PI) * Quat::from_rotation_z(PI / 2.),
       ..default()
     },
     Name::new("Scroller mirror left"),

examples/parallax.rs

@@ -41,15 +41,16 @@ fn start(
   ];
 
   sizes.into_iter().enumerate().for_each(|(i, size)| {
+    let scroller_size = Vec2::new(primary_window.width(), item_height);
+    info!("setting up initial size: {scroller_size}");
     commands.spawn((
       ScrollerSize {
-        size: Vec2::new(primary_window.width(), item_height),
+        size: scroller_size,
       },
       ScrollerBundle {
         scroller: Scroller {
           speed: scroller_speed_min + i as f32 * scroller_speed_step,
           direction: direction.clone(),
-          render_layer: Some(1),
           ..default()
         },
         generator: SingleSpriteGenerator {

examples/poisson.rs

@@ -1,9 +1,7 @@
 mod shared;
 
 use bevy::{prelude::*, window::PrimaryWindow};
-use bevy_scroller::{
-  PoissonSpriteGenerator, Scroller, ScrollerBundle, ScrollerPlugin, ScrollerSize,
-};
+use bevy_scroller::{PoissonSpriteGenerator, Scroller, ScrollerBundle, ScrollerSize};
 use shared::get_app;
 
 fn main() {

examples/random_sequence.rs

@@ -28,7 +28,6 @@ pub fn start(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>
     ScrollerBundle {
       scroller: Scroller {
         speed: 5.,
-        render_layer: Some(1),
         ..default()
       },
       generator: RandomSequenceSpriteGenerator { items },

examples/sequence.rs

@@ -35,11 +35,11 @@ pub fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
 pub fn wait_for_load(
   scroller_images: Res<ScrollerImages>,
   asset_server: Res<AssetServer>,
-  mut next_state: ResMut<NextState<AppStates>>,
+  mut app_state: ResMut<NextState<AppStates>>,
 ) {
   if let Some(state) = asset_server.get_load_state(&scroller_images.0) {
-    if state == LoadState::Loaded {
-      *next_state = NextState(Some(AppStates::Run));
+    if state.is_loaded() {
+      app_state.set(AppStates::Run);
     }
   }
 }
@@ -54,7 +54,7 @@ pub fn run(
     .map(|i| {
       let path = format!("gems/{i}.png");
       let handle = asset_server.get_handle(path.clone()).unwrap();
-      let image = images.get(handle).unwrap();
+      let image = images.get(&handle).unwrap();
       SpriteScrollerItem {
         path,
         size: image.size().as_vec2(),

examples/shared/mod.rs

@@ -1,17 +1,18 @@
-use bevy::prelude::*;
-use bevy_scroller::ScrollerPlugin;
-use iyes_perf_ui::*;
+use bevy::{prelude::*, window::WindowResized};
+use bevy_scroller::{ScrollerPlugin, ScrollerSize};
+use iyes_perf_ui::prelude::*;
 
 pub fn get_app(title: String) -> App {
   let mut app = App::new();
   app
     .add_plugins((
       DefaultPlugins.set(WindowPlugin {
         primary_window: Some(Window {
-          // present_mode: bevy::window::PresentMode::AutoNoVsync,
+          present_mode: bevy::window::PresentMode::AutoNoVsync,
           title: format!("BEVY_SCROLLER example: {}", title),
           ..default()
         }),
+
         ..default()
       }),
       ScrollerPlugin,
@@ -20,7 +21,8 @@ pub fn get_app(title: String) -> App {
     .add_plugins(bevy::diagnostic::EntityCountDiagnosticsPlugin)
     .add_plugins(bevy::diagnostic::SystemInformationDiagnosticsPlugin)
     .add_plugins(PerfUiPlugin)
-    .add_systems(Startup, default_start);
+    .add_systems(Startup, default_start)
+    .add_systems(Update, on_resize);
   #[cfg(feature = "dev")]
   {
     use bevy_editor_pls::EditorPlugin;
@@ -30,5 +32,18 @@ pub fn get_app(title: String) -> App {
 }
 
 fn default_start(mut commands: Commands) {
-  commands.spawn(PerfUiCompleteBundle::default());
+  commands.spawn(PerfUiDefaultEntries::default());
+}
+
+fn on_resize(
+  mut resize_reader: EventReader<WindowResized>,
+  mut scroller_size: Query<&mut ScrollerSize>,
+) {
+  for e in resize_reader.read() {
+    debug!("window resized: {:.1} x {:.1}", e.width, e.height);
+    for mut ss in scroller_size.iter_mut() {
+      ss.size.x = e.width;
+      ss.size.y = e.height;
+    }
+  }
 }

examples/single.rs

@@ -1,22 +1,21 @@
 mod shared;
 
-use bevy::{prelude::*, window::PrimaryWindow};
+use bevy::prelude::*;
 use bevy_scroller::{Scroller, ScrollerBundle, ScrollerSize, SingleSpriteGenerator};
 use shared::*;
 
 fn main() {
   get_app("single".into()).add_systems(Startup, start).run();
 }
 
-pub fn start(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) {
-  let primary_window = windows.get_single().expect("no primary window");
+pub fn start(mut commands: Commands) {
   let sprite_size = Vec2::new(300., 300.);
 
-  commands.spawn(Camera2dBundle::default());
+  commands.spawn(Camera2d);
 
   commands.spawn((
     ScrollerSize {
-      size: Vec2::new(primary_window.width(), sprite_size.y),
+      size: Vec2::new(600., 400.),
     },
     ScrollerBundle {
       scroller: Scroller {

examples/sprite_sheet.rs

@@ -21,7 +21,7 @@ fn startup(
 
   let texture = asset_server.load("sprite_sheet.png");
   let layout = texture_atlas_layouts.add(TextureAtlasLayout::from_grid(
-    Vec2::splat(64.),
+    UVec2::splat(64),
     10,
     10,
     None,
@@ -36,7 +36,6 @@ fn startup(
     ScrollerBundle {
       scroller: Scroller {
         speed: 1.,
-        render_layer: Some(1),
         ..default()
       },
       generator: SequenceSpriteSheetGenerator {

src/generators/generator.rs

@@ -28,7 +28,7 @@ where
       let mut to_generate = vec![];
       while length > 0. && generations <= GENERATIONS_LIMIT {
         let item = generator.gen_item();
-        debug!("generated item is: {:?}", item);
+        trace!("generated item is: {:?}", item);
         length -= item.size().x;
         generations += 1;
         to_generate.push((entity, scroller.clone(), Box::new(item)));

src/generators/poisson.rs

@@ -75,11 +75,10 @@ pub fn poisson_generator(
       .with_children(|parent| {
         for subitem in item.sprites.iter() {
           let image_handle = asset_server.load(subitem.path.clone());
-          parent.spawn(SpriteBundle {
-            texture: image_handle,
-            transform: Transform::from_translation(subitem.position.extend(0.)),
-            ..default()
-          });
+          parent.spawn((
+            Sprite::from_image(image_handle),
+            Transform::from_translation(subitem.position.extend(0.)),
+          ));
         }
       });
   }

src/generators/sprite.rs

@@ -79,11 +79,7 @@ pub fn sprite_spawner(
         size: item.size(),
         parent: entity,
       },
-      SpriteBundle {
-        texture: handle,
-        visibility: Visibility::Hidden,
-        ..default()
-      },
+      Sprite::from_image(handle),
     ));
   });
 }

src/generators/sprite_sheet.rs

@@ -45,17 +45,15 @@ pub fn spritesheet_spawner(
         size: item.size(),
         parent: entity,
       },
-      SpriteSheetBundle {
-        visibility: Visibility::Hidden,
-        sprite: Sprite::default(),
-        atlas: TextureAtlas {
+      Sprite {
+        texture_atlas: Some(TextureAtlas {
           layout: generator.layout.clone(),
           index: item.sprite as usize,
-        },
-        texture: generator.texture.clone(),
-        transform: Transform::from_scale(Vec3::splat(2.0)),
-        ..default()
+        }),
+        image: generator.texture.clone(),
+        ..Default::default()
       },
+      Transform::from_scale(Vec3::splat(2.0)),
     ));
   })
 }

src/plugin.rs

@@ -30,6 +30,7 @@ impl Plugin for ScrollerPlugin {
         (
           init,
           on_items_added,
+          on_scroller_resize,
           delete_items,
           update,
           #[cfg(feature = "dev")]