From e7ec5f74f0705a401e545a954be6cd3c9182c1ac Mon Sep 17 00:00:00 2001
From: "dmitry.lukichev" <dmlukichev@gmail.com>
Date: Tue, 12 Nov 2024 22:30:54 +0100
Subject: [PATCH 1/3] Update to bevy 0.15

---
 .gitignore                     |  1 +
 CHANGELOG.md                   |  4 +++
 Cargo.toml                     |  6 ++--
 README.md                      |  7 ++--
 examples/advanced.rs           | 31 ++++++++----------
 examples/animate.rs            | 41 +++++++++++-------------
 examples/basic.rs              | 35 +++++++++-----------
 examples/egui.rs               | 35 +++++++++-----------
 examples/follow_target.rs      | 37 ++++++++++------------
 examples/keyboard_controls.rs  | 57 +++++++++++++++------------------
 examples/multiple_viewports.rs | 51 +++++++++++++-----------------
 examples/multiple_windows.rs   | 45 +++++++++++---------------
 examples/orthographic.rs       | 56 +++++++++++++-------------------
 examples/render_to_texture.rs  | 58 +++++++++++++++-------------------
 src/lib.rs                     |  8 ++---
 src/touch.rs                   |  8 ++---
 16 files changed, 211 insertions(+), 269 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4fffb2f..c41a2b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
+.idea
 /target
 /Cargo.lock
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90729b2..4eec5d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.21
+
+- Update to Bevy 0.15
+
 ## 0.20
 
 - Change `zoom_lower_limit` from `Option<f32>` to `f32`, defaulting to `0.05`, and remove the hard coded lower zoom limit of `0.05`.
diff --git a/Cargo.toml b/Cargo.toml
index 806442f..e8891c7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_panorbit_camera"
-version = "0.20.0"
+version = "0.21.0-rc.3"
 authors = ["Plonq"]
 edition = "2021"
 description = "A basic pan and orbit camera in Bevy"
@@ -15,13 +15,13 @@ readme = "README.md"
 bevy_egui = ["dep:bevy_egui"]
 
 [dependencies]
-bevy = { version = "0.14", default-features = false, features = [
+bevy = { version = "0.15.0-rc.3", default-features = false, features = [
     "bevy_render",
 ] }
 bevy_egui = { version = "0.30", optional = true, default-features = false }
 
 [dev-dependencies]
-bevy = { version = "0.14" }
+bevy = { version = "0.15.0-rc.3" }
 float-cmp = "0.9.0"
 bevy_egui = { version = "0.30", default-features = false, features = [
     "render",
diff --git a/README.md b/README.md
index b8a6b0e..c9896a1 100644
--- a/README.md
+++ b/README.md
@@ -49,10 +49,8 @@ Add `PanOrbitCamera` to a camera:
 
 ```rust ignore
 commands.spawn((
-    Camera3dBundle {
-        transform: Transform::from_translation(Vec3::new(0.0, 1.5, 5.0)),
-        ..default()
-    },
+    Camera3d::default(),
+    Transform::from_translation(Vec3::new(0.0, 1.5, 5.0)),
     PanOrbitCamera::default(),
 ));
 ```
@@ -71,6 +69,7 @@ all the possible configuration options.
 
 | bevy | bevy_panorbit_camera |
 |------|----------------------|
+| 0.15 | 0.21                 |
 | 0.14 | 0.19-0.20            |
 | 0.13 | 0.14-0.18            |
 | 0.12 | 0.9-0.13             |
diff --git a/examples/advanced.rs b/examples/advanced.rs
index 65c9a17..1dbf8a6 100644
--- a/examples/advanced.rs
+++ b/examples/advanced.rs
@@ -25,32 +25,29 @@ fn setup(
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
     // Ground
-    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::new(1.0, 1.0, 1.0)),
-        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::new(1.0, 1.0, 1.0))),
+        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((
         // Note we're setting the initial position below with yaw, pitch, and radius, hence
         // we don't set transform on the camera.
-        Camera3dBundle::default(),
+        Camera3d::default(),
         PanOrbitCamera {
             // Set focal point (what the camera should look at)
             focus: Vec3::new(0.0, 1.0, 0.0),
diff --git a/examples/animate.rs b/examples/animate.rs
index 192d9e1..e14b56c 100644
--- a/examples/animate.rs
+++ b/examples/animate.rs
@@ -19,33 +19,28 @@ fn setup(
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
     // Ground
-    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::new(1.0, 1.0, 1.0)),
-        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::new(1.0, 1.0, 1.0))),
+        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_translation(Vec3::new(0.0, 1.5, 5.0)),
-            ..default()
-        },
+        Camera3d::default(),
+        Transform::from_translation(Vec3::new(0.0, 1.5, 5.0)),
         PanOrbitCamera {
             // Disable smoothing, since the animation takes care of that
             orbit_smoothness: 0.0,
@@ -60,10 +55,10 @@ fn setup(
 fn animate(time: Res<Time>, mut pan_orbit_query: Query<&mut PanOrbitCamera>) {
     for mut pan_orbit in pan_orbit_query.iter_mut() {
         // Must set target values, not yaw/pitch directly
-        pan_orbit.target_yaw += 15f32.to_radians() * time.delta_seconds();
-        pan_orbit.target_pitch = time.elapsed_seconds_wrapped().sin() * TAU * 0.1;
+        pan_orbit.target_yaw += 15f32.to_radians() * time.delta_secs();
+        pan_orbit.target_pitch = time.elapsed_secs_wrapped().sin() * TAU * 0.1;
         pan_orbit.radius =
-            Some((((time.elapsed_seconds_wrapped() * 2.0).cos() + 1.0) * 0.5) * 2.0 + 4.0);
+            Some((((time.elapsed_secs_wrapped() * 2.0).cos() + 1.0) * 0.5) * 2.0 + 4.0);
 
         // Force camera to update its transform
         pan_orbit.force_update = true;
diff --git a/examples/basic.rs b/examples/basic.rs
index d8598b7..e899ee5 100644
--- a/examples/basic.rs
+++ b/examples/basic.rs
@@ -17,33 +17,28 @@ fn setup(
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
     // Ground
-    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::new(1.0, 1.0, 1.0)),
-        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::new(1.0, 1.0, 1.0))),
+        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_translation(Vec3::new(0.0, 1.5, 5.0)),
-            ..default()
-        },
+        Camera3d::default(),
+        Transform::from_translation(Vec3::new(0.0, 1.5, 5.0)),
         PanOrbitCamera::default(),
     ));
 }
diff --git a/examples/egui.rs b/examples/egui.rs
index 38e6aa5..d911050 100644
--- a/examples/egui.rs
+++ b/examples/egui.rs
@@ -22,33 +22,28 @@ fn setup(
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
     // Ground
-    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::new(1.0, 1.0, 1.0)),
-        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::new(1.0, 1.0, 1.0))),
+        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_translation(Vec3::new(0.0, 1.5, 5.0)),
-            ..default()
-        },
+        Camera3d::default(),
+        Transform::from_translation(Vec3::new(0.0, 1.5, 5.0)),
         PanOrbitCamera::default(),
     ));
 }
diff --git a/examples/follow_target.rs b/examples/follow_target.rs
index 036c8b9..519195c 100644
--- a/examples/follow_target.rs
+++ b/examples/follow_target.rs
@@ -22,35 +22,30 @@ fn setup(
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
     // Ground
-    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::new(1.0, 1.0, 1.0)),
-            material: materials.add(Color::srgb(0.8, 0.7, 0.6)),
-            transform: Transform::from_xyz(0.0, 0.5, 0.0),
-            ..default()
-        })
+        .spawn((
+            Mesh3d(meshes.add(Cuboid::new(1.0, 1.0, 1.0))),
+            MeshMaterial3d(materials.add(Color::srgb(0.8, 0.7, 0.6))),
+            Transform::from_xyz(0.0, 0.5, 0.0),
+        ))
         .insert(Cube);
     // 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_translation(Vec3::new(0.0, 1.5, 5.0)),
-            ..default()
-        },
+        Camera3d::default(),
+        Transform::from_translation(Vec3::new(0.0, 1.5, 5.0)),
         PanOrbitCamera {
             // Panning the camera changes the focus, and so you most likely want to disable
             // panning when setting the focus manually
@@ -72,7 +67,7 @@ fn animate_cube(
 ) {
     if let Ok(mut cube_tfm) = cube_q.get_single_mut() {
         // Rotate 20 degrees a second, wrapping around to 0 after a full rotation
-        *angle += 20f32.to_radians() * time.delta_seconds() % TAU;
+        *angle += 20f32.to_radians() * time.delta_secs() % TAU;
         // Convert angle to position
         let pos = Vec3::new(angle.sin() * 1.5, 0.5, angle.cos() * 1.5);
         cube_tfm.translation = pos;
diff --git a/examples/keyboard_controls.rs b/examples/keyboard_controls.rs
index 2125f5c..9edb1eb 100644
--- a/examples/keyboard_controls.rs
+++ b/examples/keyboard_controls.rs
@@ -24,33 +24,28 @@ fn setup(
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
     // Ground
-    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::new(1.0, 1.0, 1.0)),
-        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::new(1.0, 1.0, 1.0))),
+        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_translation(Vec3::new(0.0, 1.5, 5.0)),
-            ..default()
-        },
+        Camera3d::default(),
+        Transform::from_translation(Vec3::new(0.0, 1.5, 5.0)),
         PanOrbitCamera::default(),
     ));
 }
@@ -62,7 +57,7 @@ fn keyboard_controls(
 ) {
     for (mut pan_orbit, mut transform) in pan_orbit_query.iter_mut() {
         if key_input.pressed(KeyCode::ControlLeft) {
-            // Jump focus point 1m using Ctrl+Shift + Arrows
+            // Jump to focus point 1m using Ctrl+Shift + Arrows
             if key_input.pressed(KeyCode::ShiftLeft) {
                 if key_input.just_pressed(KeyCode::ArrowRight) {
                     pan_orbit.target_focus += Vec3::X;
@@ -96,16 +91,16 @@ fn keyboard_controls(
         else if key_input.pressed(KeyCode::ShiftLeft) {
             let mut delta_translation = Vec3::ZERO;
             if key_input.pressed(KeyCode::ArrowRight) {
-                delta_translation += transform.rotation * Vec3::X * time.delta_seconds();
+                delta_translation += transform.rotation * Vec3::X * time.delta_secs();
             }
             if key_input.pressed(KeyCode::ArrowLeft) {
-                delta_translation += transform.rotation * Vec3::NEG_X * time.delta_seconds();
+                delta_translation += transform.rotation * Vec3::NEG_X * time.delta_secs();
             }
             if key_input.pressed(KeyCode::ArrowUp) {
-                delta_translation += transform.rotation * Vec3::Y * time.delta_seconds();
+                delta_translation += transform.rotation * Vec3::Y * time.delta_secs();
             }
             if key_input.pressed(KeyCode::ArrowDown) {
-                delta_translation += transform.rotation * Vec3::NEG_Y * time.delta_seconds();
+                delta_translation += transform.rotation * Vec3::NEG_Y * time.delta_secs();
             }
             transform.translation += delta_translation;
             pan_orbit.target_focus += delta_translation;
@@ -113,24 +108,24 @@ fn keyboard_controls(
         // Smooth rotation using arrow keys without modifier
         else {
             if key_input.pressed(KeyCode::ArrowRight) {
-                pan_orbit.target_yaw += 50f32.to_radians() * time.delta_seconds();
+                pan_orbit.target_yaw += 50f32.to_radians() * time.delta_secs();
             }
             if key_input.pressed(KeyCode::ArrowLeft) {
-                pan_orbit.target_yaw -= 50f32.to_radians() * time.delta_seconds();
+                pan_orbit.target_yaw -= 50f32.to_radians() * time.delta_secs();
             }
             if key_input.pressed(KeyCode::ArrowUp) {
-                pan_orbit.target_pitch += 50f32.to_radians() * time.delta_seconds();
+                pan_orbit.target_pitch += 50f32.to_radians() * time.delta_secs();
             }
             if key_input.pressed(KeyCode::ArrowDown) {
-                pan_orbit.target_pitch -= 50f32.to_radians() * time.delta_seconds();
+                pan_orbit.target_pitch -= 50f32.to_radians() * time.delta_secs();
             }
 
             // Zoom with Z and X
             if key_input.pressed(KeyCode::KeyZ) {
-                pan_orbit.target_radius -= 5.0 * time.delta_seconds();
+                pan_orbit.target_radius -= 5.0 * time.delta_secs();
             }
             if key_input.pressed(KeyCode::KeyX) {
-                pan_orbit.target_radius += 5.0 * time.delta_seconds();
+                pan_orbit.target_radius += 5.0 * time.delta_secs();
             }
         }
 
diff --git a/examples/multiple_viewports.rs b/examples/multiple_viewports.rs
index 08716af..d51f457 100644
--- a/examples/multiple_viewports.rs
+++ b/examples/multiple_viewports.rs
@@ -20,46 +20,39 @@ fn setup(
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
     // Ground
-    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::new(1.0, 1.0, 1.0)),
-        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::new(1.0, 1.0, 1.0))),
+        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),
+    ));
     // Main Camera
     commands.spawn((
-        Camera3dBundle {
-            transform: Transform::from_translation(Vec3::new(0.0, 0.5, 5.0)),
-            ..default()
-        },
+        Camera3d::default(),
+        Transform::from_translation(Vec3::new(0.0, 0.5, 5.0)),
         PanOrbitCamera::default(),
     ));
     // Minimap Camera
     commands.spawn((
-        Camera3dBundle {
-            transform: Transform::from_translation(Vec3::new(1.0, 1.5, 4.0)),
-            camera: Camera {
-                // Renders the minimap camera after the main camera, so it is rendered on top
-                order: 1,
-                // Don't clear on the second camera because the first camera already cleared the window
-                clear_color: ClearColorConfig::None,
-                ..default()
-            },
+        Camera3d::default(),
+        Transform::from_translation(Vec3::new(1.0, 1.5, 4.0)),
+        Camera {
+            // Renders the minimap camera after the main camera, so it is rendered on top
+            order: 1,
+            // Don't clear on the second camera because the first camera already cleared the window
+            clear_color: ClearColorConfig::None,
             ..default()
         },
         PanOrbitCamera::default(),
diff --git a/examples/multiple_windows.rs b/examples/multiple_windows.rs
index af1fa9e..a2c275b 100644
--- a/examples/multiple_windows.rs
+++ b/examples/multiple_windows.rs
@@ -19,33 +19,28 @@ fn setup(
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
     // Ground
-    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::new(1.0, 1.0, 1.0)),
-        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::new(1.0, 1.0, 1.0))),
+        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_translation(Vec3::new(0.0, 1.5, 5.0)),
-            ..default()
-        },
+        Camera3d::default(),
+        Transform::from_translation(Vec3::new(0.0, 1.5, 5.0)),
         PanOrbitCamera::default(),
     ));
 
@@ -59,12 +54,10 @@ fn setup(
 
     // second window camera
     commands.spawn((
-        Camera3dBundle {
-            transform: Transform::from_translation(Vec3::new(5.0, 1.5, 7.0)),
-            camera: Camera {
-                target: RenderTarget::Window(WindowRef::Entity(second_window)),
-                ..default()
-            },
+        Camera3d::default(),
+        Transform::from_translation(Vec3::new(5.0, 1.5, 7.0)),
+        Camera {
+            target: RenderTarget::Window(WindowRef::Entity(second_window)),
             ..default()
         },
         PanOrbitCamera::default(),
diff --git a/examples/orthographic.rs b/examples/orthographic.rs
index 1010d75..65ed38b 100644
--- a/examples/orthographic.rs
+++ b/examples/orthographic.rs
@@ -19,48 +19,36 @@ fn setup(
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
     // help
-    commands.spawn(TextBundle {
-        text: Text {
-            sections: vec![TextSection {
-                value: "Press R to switch projection".to_string(),
-                ..Default::default()
-            }],
-            ..Default::default()
-        },
-        ..default()
-    });
+    commands.spawn(
+        Text::new("Press R to switch projection".to_string())
+    );
     // Ground
-    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::new(1.0, 1.0, 1.0)),
-        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::new(1.0, 1.0, 1.0))),
+        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_translation(Vec3::new(0.0, 1.5, 6.0)),
-            projection: Projection::Orthographic(OrthographicProjection {
-                scaling_mode: ScalingMode::FixedVertical(1.0),
-                ..default()
-            }),
-            ..default()
-        },
+        Camera3d::default(),
+        Transform::from_translation(Vec3::new(0.0, 1.5, 6.0)),
+        Projection::from(OrthographicProjection {
+            scaling_mode: ScalingMode::FixedVertical { viewport_height: 1.0 },
+            ..OrthographicProjection::default_3d()
+        }),
         PanOrbitCamera::default(),
     ));
 }
diff --git a/examples/render_to_texture.rs b/examples/render_to_texture.rs
index 3db9c8c..aa91a0a 100644
--- a/examples/render_to_texture.rs
+++ b/examples/render_to_texture.rs
@@ -87,39 +87,34 @@ fn setup(
 
     // The cube that will be rendered to the texture.
     commands.spawn((
-        PbrBundle {
-            mesh: cube_handle,
-            material: cube_material_handle,
-            transform: Transform::from_translation(Vec3::new(0.0, 0.0, 1.0)),
-            ..default()
-        },
+        Mesh3d(cube_handle),
+        MeshMaterial3d(cube_material_handle),
+        Transform::from_translation(Vec3::new(0.0, 0.0, 1.0)),
         FirstPassCube,
         first_pass_layer.clone(),
     ));
 
     // Light
     // NOTE: Currently lights are shared between passes - see https://github.com/bevyengine/bevy/issues/3462
-    commands.spawn(PointLightBundle {
-        transform: Transform::from_translation(Vec3::new(0.0, 0.0, 10.0)),
-        ..default()
-    });
+    commands.spawn((
+       PointLight::default(),
+        Transform::from_translation(Vec3::new(0.0, 0.0, 10.0)),
+    ));
 
     // The camera for the first pass cube that will be rendered to the texture. This is the camera
     // that is controlled by PanOrbitCamera.
     let pan_orbit_id = commands
         .spawn((
-            Camera3dBundle {
-                camera: Camera {
-                    // render before the "main pass" camera
-                    clear_color: ClearColorConfig::Custom(Color::WHITE),
-                    order: -1,
-                    target: RenderTarget::Image(image_handle.clone()),
-                    ..default()
-                },
-                transform: Transform::from_translation(Vec3::new(0.0, 0.0, 15.0))
-                    .looking_at(Vec3::ZERO, Vec3::Y),
+            Camera3d::default(),
+            Camera {
+                // render before the "main pass" camera
+                clear_color: ClearColorConfig::Custom(Color::WHITE),
+                order: -1,
+                target: RenderTarget::Image(image_handle.clone()),
                 ..default()
             },
+            Transform::from_translation(Vec3::new(0.0, 0.0, 15.0))
+                .looking_at(Vec3::ZERO, Vec3::Y),
             PanOrbitCamera::default(),
             first_pass_layer,
         ))
@@ -138,21 +133,18 @@ fn setup(
 
     // Main pass cube, with material containing the rendered first pass texture.
     commands.spawn((
-        PbrBundle {
-            mesh: cube_handle,
-            material: material_handle,
-            transform: Transform::from_xyz(0.0, 0.0, 1.5)
-                .with_rotation(Quat::from_rotation_x(-PI / 5.0)),
-            ..default()
-        },
+        Mesh3d(cube_handle),
+        MeshMaterial3d(material_handle),
+        Transform::from_xyz(0.0, 0.0, 1.5)
+            .with_rotation(Quat::from_rotation_x(-PI / 5.0)),
         MainPassCube,
     ));
 
     // The main pass camera.
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(0.0, 0.0, 15.0).looking_at(Vec3::ZERO, Vec3::Y),
-        ..default()
-    });
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(0.0, 0.0, 15.0).looking_at(Vec3::ZERO, Vec3::Y),
+    ));
 
     // Set up manual override of PanOrbitCamera. Note that this must run after PanOrbitCameraPlugin
     // is added, otherwise ActiveCameraData will be overwritten.
@@ -178,7 +170,7 @@ fn setup(
 /// Rotates the outer cube (main pass)
 fn cube_rotator_system(time: Res<Time>, mut query: Query<&mut Transform, With<MainPassCube>>) {
     for mut transform in &mut query {
-        transform.rotate_x(1.0 * time.delta_seconds());
-        transform.rotate_y(0.7 * time.delta_seconds());
+        transform.rotate_x(1.0 * time.delta_secs());
+        transform.rotate_y(0.7 * time.delta_secs());
     }
 }
diff --git a/src/lib.rs b/src/lib.rs
index 02ef8f5..e8680ee 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -620,25 +620,25 @@ fn pan_orbit_camera(
                     yaw,
                     pan_orbit.target_yaw,
                     pan_orbit.orbit_smoothness,
-                    time.delta_seconds(),
+                    time.delta_secs(),
                 );
                 let new_pitch = util::lerp_and_snap_f32(
                     pitch,
                     pan_orbit.target_pitch,
                     pan_orbit.orbit_smoothness,
-                    time.delta_seconds(),
+                    time.delta_secs(),
                 );
                 let new_radius = util::lerp_and_snap_f32(
                     radius,
                     pan_orbit.target_radius,
                     pan_orbit.zoom_smoothness,
-                    time.delta_seconds(),
+                    time.delta_secs(),
                 );
                 let new_focus = util::lerp_and_snap_vec3(
                     pan_orbit.focus,
                     pan_orbit.target_focus,
                     pan_orbit.pan_smoothness,
-                    time.delta_seconds(),
+                    time.delta_secs(),
                 );
 
                 util::update_orbit_transform(
diff --git a/src/touch.rs b/src/touch.rs
index 92e14cd..1004b13 100644
--- a/src/touch.rs
+++ b/src/touch.rs
@@ -100,10 +100,10 @@ impl TouchTracker {
                 // Rotate
                 let prev_vec = prev2_pos - prev1_pos;
                 let curr_vec = curr2_pos - curr1_pos;
-                let prev_angle_negy = prev_vec.angle_between(Vec2::NEG_Y);
-                let curr_angle_negy = curr_vec.angle_between(Vec2::NEG_Y);
-                let prev_angle_posy = prev_vec.angle_between(Vec2::Y);
-                let curr_angle_posy = curr_vec.angle_between(Vec2::Y);
+                let prev_angle_negy = prev_vec.angle_to(Vec2::NEG_Y);
+                let curr_angle_negy = curr_vec.angle_to(Vec2::NEG_Y);
+                let prev_angle_posy = prev_vec.angle_to(Vec2::Y);
+                let curr_angle_posy = curr_vec.angle_to(Vec2::Y);
                 let rotate_angle_negy = curr_angle_negy - prev_angle_negy;
                 let rotate_angle_posy = curr_angle_posy - prev_angle_posy;
                 // The angle between -1deg and +1deg is 358deg according to Vec2::angle_between,

From a2b516f45910034386f7739f064075ee33edf236 Mon Sep 17 00:00:00 2001
From: "dmitry.lukichev" <dmlukichev@gmail.com>
Date: Wed, 13 Nov 2024 13:36:49 +0100
Subject: [PATCH 2/3] Fix formatting problems

---
 .gitignore                    | 1 -
 examples/orthographic.rs      | 8 ++++----
 examples/render_to_texture.rs | 8 +++-----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index c41a2b9..4fffb2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-.idea
 /target
 /Cargo.lock
diff --git a/examples/orthographic.rs b/examples/orthographic.rs
index 65ed38b..6f65080 100644
--- a/examples/orthographic.rs
+++ b/examples/orthographic.rs
@@ -19,9 +19,7 @@ fn setup(
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
     // help
-    commands.spawn(
-        Text::new("Press R to switch projection".to_string())
-    );
+    commands.spawn(Text::new("Press R to switch projection".to_string()));
     // Ground
     commands.spawn((
         Mesh3d(meshes.add(Plane3d::default().mesh().size(5.0, 5.0))),
@@ -46,7 +44,9 @@ fn setup(
         Camera3d::default(),
         Transform::from_translation(Vec3::new(0.0, 1.5, 6.0)),
         Projection::from(OrthographicProjection {
-            scaling_mode: ScalingMode::FixedVertical { viewport_height: 1.0 },
+            scaling_mode: ScalingMode::FixedVertical {
+                viewport_height: 1.0,
+            },
             ..OrthographicProjection::default_3d()
         }),
         PanOrbitCamera::default(),
diff --git a/examples/render_to_texture.rs b/examples/render_to_texture.rs
index aa91a0a..45a37f5 100644
--- a/examples/render_to_texture.rs
+++ b/examples/render_to_texture.rs
@@ -97,7 +97,7 @@ fn setup(
     // Light
     // NOTE: Currently lights are shared between passes - see https://github.com/bevyengine/bevy/issues/3462
     commands.spawn((
-       PointLight::default(),
+        PointLight::default(),
         Transform::from_translation(Vec3::new(0.0, 0.0, 10.0)),
     ));
 
@@ -113,8 +113,7 @@ fn setup(
                 target: RenderTarget::Image(image_handle.clone()),
                 ..default()
             },
-            Transform::from_translation(Vec3::new(0.0, 0.0, 15.0))
-                .looking_at(Vec3::ZERO, Vec3::Y),
+            Transform::from_translation(Vec3::new(0.0, 0.0, 15.0)).looking_at(Vec3::ZERO, Vec3::Y),
             PanOrbitCamera::default(),
             first_pass_layer,
         ))
@@ -135,8 +134,7 @@ fn setup(
     commands.spawn((
         Mesh3d(cube_handle),
         MeshMaterial3d(material_handle),
-        Transform::from_xyz(0.0, 0.0, 1.5)
-            .with_rotation(Quat::from_rotation_x(-PI / 5.0)),
+        Transform::from_xyz(0.0, 0.0, 1.5).with_rotation(Quat::from_rotation_x(-PI / 5.0)),
         MainPassCube,
     ));
 

From 7a8101786c694d16f7034d8bc5c65304ba352a4c Mon Sep 17 00:00:00 2001
From: "dmitry.lukichev" <dmlukichev@gmail.com>
Date: Mon, 2 Dec 2024 17:24:14 +0100
Subject: [PATCH 3/3] Update deps versions, revert changelog changes

---
 CHANGELOG.md |  4 ----
 Cargo.toml   | 10 +++++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4eec5d0..90729b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 0.21
-
-- Update to Bevy 0.15
-
 ## 0.20
 
 - Change `zoom_lower_limit` from `Option<f32>` to `f32`, defaulting to `0.05`, and remove the hard coded lower zoom limit of `0.05`.
diff --git a/Cargo.toml b/Cargo.toml
index e8891c7..20618fb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_panorbit_camera"
-version = "0.21.0-rc.3"
+version = "0.20.0"
 authors = ["Plonq"]
 edition = "2021"
 description = "A basic pan and orbit camera in Bevy"
@@ -15,15 +15,15 @@ readme = "README.md"
 bevy_egui = ["dep:bevy_egui"]
 
 [dependencies]
-bevy = { version = "0.15.0-rc.3", default-features = false, features = [
+bevy = { version = "0.15.0", default-features = false, features = [
     "bevy_render",
 ] }
-bevy_egui = { version = "0.30", optional = true, default-features = false }
+bevy_egui = { version = "0.31.0", optional = true, default-features = false }
 
 [dev-dependencies]
-bevy = { version = "0.15.0-rc.3" }
+bevy = { version = "0.15.0" }
 float-cmp = "0.9.0"
-bevy_egui = { version = "0.30", default-features = false, features = [
+bevy_egui = { version = "0.31.0", default-features = false, features = [
     "render",
     "default_fonts",
 ] }