chore: update to nalgebra 0.33 and parry 0.16 (#664)

2 files changed, 14 insertions, 10 deletions

diff --git a/src_testbed/physx_backend.rs b/src_testbed/physx_backend.rs
index 7070c81..71f8f9d 100644
--- a/src_testbed/physx_backend.rs
+++ b/src_testbed/physx_backend.rs
@@ -441,23 +441,23 @@ impl PhysxWorld {
                     px_frame2.as_ptr(),
                 );
 
-                let motion_x = if joint.1.data.limit_axes.contains(JointAxesMask::X) {
+                let motion_x = if joint.1.data.limit_axes.contains(JointAxesMask::LIN_X) {
                     physx_sys::PxD6Motion::Limited
-                } else if !joint.1.data.locked_axes.contains(JointAxesMask::X) {
+                } else if !joint.1.data.locked_axes.contains(JointAxesMask::LIN_X) {
                     physx_sys::PxD6Motion::Free
                 } else {
                     physx_sys::PxD6Motion::Locked
                 };
-                let motion_y = if joint.1.data.limit_axes.contains(JointAxesMask::Y) {
+                let motion_y = if joint.1.data.limit_axes.contains(JointAxesMask::LIN_Y) {
                     physx_sys::PxD6Motion::Limited
-                } else if !joint.1.data.locked_axes.contains(JointAxesMask::Y) {
+                } else if !joint.1.data.locked_axes.contains(JointAxesMask::LIN_Y) {
                     physx_sys::PxD6Motion::Free
                 } else {
                     physx_sys::PxD6Motion::Locked
                 };
-                let motion_z = if joint.1.data.limit_axes.contains(JointAxesMask::Z) {
+                let motion_z = if joint.1.data.limit_axes.contains(JointAxesMask::LIN_Z) {
                     physx_sys::PxD6Motion::Limited
-                } else if !joint.1.data.locked_axes.contains(JointAxesMask::Z) {
+                } else if !joint.1.data.locked_axes.contains(JointAxesMask::LIN_Z) {
                     physx_sys::PxD6Motion::Free
                 } else {
                     physx_sys::PxD6Motion::Locked
diff --git a/src_testbed/testbed.rs b/src_testbed/testbed.rs
index dc747ed..26d8d9d 100644
--- a/src_testbed/testbed.rs
+++ b/src_testbed/testbed.rs
@@ -75,7 +75,7 @@ fn usage(exe_name: &str) {
 }
 
 bitflags! {
-    #[derive(Default)]
+    #[derive(Copy, Clone, PartialEq, Eq, Debug, Default)]
     pub struct TestbedStateFlags: u32 {
         const NONE = 0;
         const SLEEP = 1 << 0;
@@ -92,6 +92,7 @@ bitflags! {
 }
 
 bitflags! {
+    #[derive(Copy, Clone, PartialEq, Eq, Debug)]
     pub struct TestbedActionFlags: u32 {
         const RESET_WORLD_GRAPHICS = 1 << 0;
         const EXAMPLE_CHANGED = 1 << 1;
@@ -1106,6 +1107,7 @@ fn egui_focus(mut ui_context: EguiContexts, mut cameras: Query<&mut OrbitCamera>
 use crate::mouse::{track_mouse_state, MainCamera, SceneMouse};
 use bevy::window::PrimaryWindow;
 
+#[allow(clippy::type_complexity)]
 fn update_testbed(
     mut commands: Commands,
     windows: Query<&Window, With<PrimaryWindow>>,
@@ -1121,9 +1123,11 @@ fn update_testbed(
     #[cfg(feature = "other-backends")] mut other_backends: NonSendMut<OtherBackends>,
     mut plugins: NonSendMut<Plugins>,
     mut ui_context: EguiContexts,
-    mut gfx_components: Query<&mut Transform>,
-    mut cameras: Query<(&Camera, &GlobalTransform, &mut OrbitCamera)>,
-    mut material_handles: Query<&mut Handle<BevyMaterial>>,
+    (mut gfx_components, mut cameras, mut material_handles): (
+        Query<&mut Transform>,
+        Query<(&Camera, &GlobalTransform, &mut OrbitCamera)>,
+        Query<&mut Handle<BevyMaterial>>,
+    ),
     keys: Res<ButtonInput<KeyCode>>,
 ) {
     let meshes = &mut *meshes;