Update to Bevy 0.15

Author: ptsd

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy_spectator"
 description = "A spectator camera plugin for Bevy"
-version = "0.6.0"
+version = "0.7.0"
 edition = "2021"
 authors = ["JonahPlusPlus <[email protected]>"]
 license = "MIT OR Apache-2.0"
@@ -11,15 +11,16 @@ repository = "https://github.com/JonahPlusPlus/bevy_spectator"
 exclude = ["/examples/"]
 
 [dependencies]
-bevy = { version = "0.14", default-features = false }
+bevy = { version = "0.15", default-features = false, features = ["bevy_window"] }
 
 [dev-dependencies]
-bevy = { version = "0.14", default-features = false, features = [
+bevy = { version = "0.15", default-features = false, features = [
   "bevy_asset",
   "bevy_core_pipeline",
   "bevy_pbr",
   "bevy_render",
   "bevy_sprite",
+  "bevy_window",
   "x11",
   "ktx2",
   "zstd",
@@ -33,3 +34,7 @@ init = []          # Enables automatically choosing a camera
 [[example]]
 name = "3d_scene"
 path = "examples/3d_scene.rs"
+
+[[example]]
+name = "2d_scene"
+path = "examples/2d_scene.rs"

README.md

@@ -47,6 +47,7 @@ fn setup(mut commands: Commands) {
 
 | bevy | bevy_spectator |
 |------|----------------|
+| 0.15 | 0.7            |
 | 0.14 | 0.6            |
 | 0.13 | 0.5            |
 | 0.12 | 0.4            |

examples/2d_scene.rs

@@ -17,12 +17,15 @@ fn main() {
 }
 
 fn setup(mut commands: Commands) {
-    commands.spawn((Camera2dBundle::default(), Spectator));
-    commands.spawn(SpriteBundle {
-        transform: Transform {
-            scale: Vec3::new(10.0, 10.0, 1.0),
-            ..default()
-        },
-        ..default()
-    });
+    // Sprite
+    commands.spawn((
+        Sprite::default(),
+        Transform::default().with_scale(Vec3::new(10.0, 10.0, 1.0)),
+    ));
+
+    // Camera
+    commands.spawn((
+        Camera2d::default(),
+        Spectator,
+    ));
 }

examples/3d_scene.rs

@@ -22,33 +22,31 @@ fn setup(
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
     // plane
-    commands.spawn(PbrBundle {
-        mesh: meshes.add(Plane3d::default().mesh().size(5.0, 5.0)),
-        material: materials.add(Color::srgb(0.3, 0.5, 0.3)),
-        ..default()
-    });
+    commands.spawn((
+        Mesh3d(meshes.add(Plane3d::default().mesh().size(5.0, 5.0))),
+        MeshMaterial3d(materials.add(Color::srgb(0.3, 0.5, 0.3)))
+    ));
+
     // cube
-    commands.spawn(PbrBundle {
-        mesh: meshes.add(Cuboid::default()),
-        material: materials.add(Color::srgb(0.8, 0.7, 0.6)),
-        transform: Transform::from_xyz(0.0, 0.5, 0.0),
-        ..default()
-    });
+    commands.spawn((
+        Mesh3d(meshes.add(Cuboid::default())),
+        MeshMaterial3d(materials.add(Color::srgb(0.8, 0.7, 0.6))),
+        Transform::from_xyz(0.0, 0.5, 0.0),
+    ));
+
     // light
-    commands.spawn(PointLightBundle {
-        point_light: PointLight {
+    commands.spawn((
+        PointLight {
             shadows_enabled: true,
             ..default()
         },
-        transform: Transform::from_xyz(4.0, 8.0, 4.0),
-        ..default()
-    });
+        Transform::from_xyz(4.0, 8.0, 4.0),
+    ));
+
     // camera
     commands.spawn((
-        Camera3dBundle {
-            transform: Transform::from_xyz(-3.0, 1.5, 3.0).looking_at(Vec3::ZERO, Vec3::Y),
-            ..default()
-        },
+        Camera3d::default(),
+        Transform::from_xyz(-3.0, 1.5, 3.0).looking_at(Vec3::ZERO, Vec3::Y),
         Spectator,
     ));
 }

src/lib.rs

@@ -108,8 +108,8 @@ fn spectator_update(
                 true => CursorGrabMode::Confined,
                 false => CursorGrabMode::None,
             };
-            window.cursor.grab_mode = grab_mode;
-            window.cursor.visible = !focused;
+            window.cursor_options.grab_mode = grab_mode;
+            window.cursor_options.visible = !focused;
         }
     };
 
@@ -208,7 +208,7 @@ fn spectator_update(
 
             let result = forward * delta_axial + right * delta_lateral + up * delta_vertical;
 
-            camera_transform.translation += result * time.delta_seconds();
+            camera_transform.translation += result * time.delta_secs();
         }
     }