feat: bevy 0.16 (#112)

Author: mosure

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bevy_panorbit_camera"
-version = "0.25.0"
+version = "0.26.0"
 authors = ["Plonq"]
 edition = "2021"
 description = "A basic pan and orbit camera in Bevy"
@@ -15,17 +15,17 @@ readme = "README.md"
 bevy_egui = ["dep:bevy_egui"]
 
 [dependencies]
-bevy = { version = "0.15", default-features = false, features = [
+bevy = { version = "0.16", default-features = false, features = [
     "bevy_core_pipeline",
     "bevy_render",
     "bevy_window",
 ] }
-bevy_egui = { version = "0.33", optional = true, default-features = false }
+bevy_egui = { version = "0.34", optional = true, default-features = false }
 
 [dev-dependencies]
-bevy = { version = "0.15" }
+bevy = { version = "0.16" }
 float-cmp = "0.10.0"
-bevy_egui = { version = "0.33", default-features = false, features = [
+bevy_egui = { version = "0.34", default-features = false, features = [
     "render",
     "default_fonts",
 ] }

README.md

@@ -68,6 +68,7 @@ all the possible configuration options.
 
 | bevy | bevy_panorbit_camera |
 |------|----------------------|
+| 0.16 | 0.26                 |
 | 0.15 | 0.21-0.25            |
 | 0.14 | 0.19-0.20            |
 | 0.13 | 0.14-0.18            |

examples/follow_target.rs

@@ -64,7 +64,7 @@ fn animate_cube(
     mut cube_q: Query<&mut Transform, With<Cube>>,
     mut angle: Local<f32>,
 ) {
-    if let Ok(mut cube_tfm) = cube_q.get_single_mut() {
+    if let Ok(mut cube_tfm) = cube_q.single_mut() {
         // Rotate 20 degrees a second, wrapping around to 0 after a full rotation
         *angle += 20f32.to_radians() * time.delta_secs() % TAU;
         // Convert angle to position
@@ -75,8 +75,8 @@ fn animate_cube(
 
 /// Set the camera's focus to the cube's position
 fn cam_follow(mut pan_orbit_q: Query<&mut PanOrbitCamera>, cube_q: Query<&Transform, With<Cube>>) {
-    if let Ok(mut pan_orbit) = pan_orbit_q.get_single_mut() {
-        if let Ok(cube_tfm) = cube_q.get_single() {
+    if let Ok(mut pan_orbit) = pan_orbit_q.single_mut() {
+        if let Ok(cube_tfm) = cube_q.single() {
             pan_orbit.target_focus = cube_tfm.translation;
             // Whenever changing properties manually like this, it's necessary to force
             // PanOrbitCamera to update this frame (by default it only updates when there are

examples/multiple_viewports.rs

@@ -68,7 +68,7 @@ fn set_camera_viewports(
 ) {
     for resize_event in resize_events.read() {
         let window = windows.get(resize_event.window).unwrap();
-        let mut right_camera = right_camera.single_mut();
+        let mut right_camera = right_camera.single_mut().unwrap();
         let size = window.resolution.physical_width() / 5;
         right_camera.viewport = Some(Viewport {
             physical_position: UVec2::new(window.resolution.physical_width() - size, 0),

examples/orthographic.rs

@@ -58,7 +58,7 @@ fn switch_projection(
     mut camera_query: Query<(&mut PanOrbitCamera, &mut Projection)>,
 ) {
     if key_input.just_pressed(KeyCode::KeyR) {
-        let Ok((mut camera, mut projection)) = camera_query.get_single_mut() else {
+        let Ok((mut camera, mut projection)) = camera_query.single_mut() else {
             return;
         };
         std::mem::swap(&mut *next_projection, &mut *projection);

examples/render_to_texture.rs

@@ -12,7 +12,7 @@ use bevy::window::PrimaryWindow;
 use bevy::{
     prelude::*,
     render::{
-        camera::RenderTarget,
+        camera::{ImageRenderTarget, RenderTarget},
         render_resource::{
             Extent3d, TextureDescriptor, TextureDimension, TextureFormat, TextureUsages,
         },
@@ -109,7 +109,7 @@ fn setup(
                 // render before the "main pass" camera
                 clear_color: ClearColorConfig::Custom(Color::WHITE),
                 order: -1,
-                target: RenderTarget::Image(image_handle.clone()),
+                target: RenderTarget::Image(ImageRenderTarget::from(image_handle.clone())),
                 ..default()
             },
             Transform::from_translation(Vec3::new(0.0, 0.0, 15.0)).looking_at(Vec3::ZERO, Vec3::Y),
@@ -148,7 +148,7 @@ fn setup(
     // Note: you probably want to update the `viewport_size` and `window_size` whenever they change,
     // I haven't done this here for simplicity.
     let primary_window = windows
-        .get_single()
+        .single()
         .expect("There is only ever one primary window");
     active_cam.set_if_neq(ActiveCameraData {
         // Set the entity to the entity ID of the camera you want to control. In this case, it's

src/lib.rs

@@ -429,7 +429,7 @@ fn active_viewport_data(
                 // First check if cursor is in the same window as this camera
                 if let RenderTarget::Window(win_ref) = camera.target {
                     let Some(window) = (match win_ref {
-                        WindowRef::Primary => primary_windows.get_single().ok(),
+                        WindowRef::Primary => primary_windows.single().ok(),
                         WindowRef::Entity(entity) => other_windows.get(entity).ok(),
                     }) else {
                         // Window does not exist - maybe it was closed and the camera not cleaned up
@@ -665,6 +665,7 @@ fn pan_orbit_camera(
                     Projection::Orthographic(ref p) => {
                         pan *= Vec2::new(p.area.width(), p.area.height()) / vp_size;
                     }
+                    Projection::Custom(_) => todo!(),
                 }
                 // Translate by local axes
                 let right = transform.rotation * pan_orbit.axis[0] * -pan.x;