Clean up

src/graphics/mod.rs

@@ -12,6 +12,7 @@ use crate::resources::{
 
 use openxr as xr;
 
+#[allow(clippy::type_complexity)]
 pub fn initialize_xr_graphics(
  window: Option<RawHandleWrapper>,
 ) -> anyhow::Result<(

src/graphics/vulkan.rs

@@ -18,6 +18,7 @@ use crate::resources::{
 };
 use crate::VIEW_TYPE;
 
+#[allow(clippy::type_complexity)]
 pub fn initialize_xr_graphics(
  window: Option<RawHandleWrapper>,
 ) -> anyhow::Result<(
@@ -352,7 +353,7 @@ pub fn initialize_xr_graphics(
  None,
  )
  };
- 
+
  unsafe {
  wgpu_device.create_texture_from_hal::<V>(
  wgpu_hal_texture,

src/lib.rs

@@ -31,7 +31,7 @@ pub const RIGHT_XR_TEXTURE_HANDLE: ManualTextureViewHandle = ManualTextureViewHa
 /// Adds OpenXR support to an App
 #[derive(Default)]
 pub struct OpenXrPlugin;
-
+#[allow(clippy::type_complexity)]
 #[derive(Resource)]
 pub struct FutureXrResources(
  pub Arc<

src/xr_input/debug_gizmos.rs

@@ -29,6 +29,7 @@ impl Plugin for OpenXrDebugRenderer {
  }
 }
 
+#[allow(clippy::type_complexity, clippy::too_many_arguments)]
 pub fn draw_gizmos(
  mut gizmos: Gizmos,
  oculus_controller: Res<OculusController>,

src/xr_input/hand.rs

@@ -545,7 +545,7 @@ impl HandState {
 }
 
 
-
+#[allow(clippy::type_complexity)]
 pub fn update_hand_bones_emulated(
  controller_transform: Transform,
  hand: Hand,
@@ -1035,6 +1035,7 @@ fn log_hand(hand_pose: [Posef; 26]) {
  );
 }
 
+#[allow(clippy::too_many_arguments, clippy::type_complexity)]
 pub fn update_hand_skeletons(
  tracking_root_query: Query<(&Transform, With<OpenXRTrackingRoot>)>,
  right_controller_query: Query<(&GlobalTransform, With<OpenXRRightController>)>,

src/xr_input/interactions.rs

@@ -20,34 +20,28 @@ pub struct XRSocketInteractor;
 #[derive(Component)]
 pub struct Touched(pub bool);
 
-#[derive(Component, Clone, Copy, PartialEq, PartialOrd, Debug)]
-#[derive(Default)]
+#[derive(Component, Clone, Copy, PartialEq, PartialOrd, Debug, Default)]
 pub enum XRInteractableState {
  #[default]
  Idle,
  Hover,
  Select,
 }
 
-
-
-#[derive(Component)]
-#[derive(Default)]
+#[derive(Component, Default)]
 pub enum XRInteractorState {
  #[default]
  Idle,
  Selecting,
 }
 
-#[derive(Component)]
-#[derive(Default)]
+#[derive(Component, Default)]
 pub enum XRSelection {
  #[default]
  Empty,
  Full(Entity),
 }
 
-
 #[derive(Component)]
 pub struct XRInteractable;
 
@@ -71,6 +65,7 @@ pub fn draw_socket_gizmos(
  }
 }
 
+#[allow(clippy::type_complexity)]
 pub fn draw_interaction_gizmos(
  mut gizmos: Gizmos,
  interactable_query: Query<
@@ -103,27 +98,24 @@ pub fn draw_interaction_gizmos(
  for (interactor_global_transform, interactor_state, direct, ray, aim) in interactor_query.iter()
  {
  let transform = interactor_global_transform.compute_transform();
- match direct {
- Some(_) => {
- let mut local = transform;
- local.scale = Vec3::splat(0.1);
- let quat = Quat::from_euler(
- bevy::prelude::EulerRot::XYZ,
- 45.0 * (PI / 180.0),
- 0.0,
- 45.0 * (PI / 180.0),
- );
- local.rotation = quat;
- let color = match interactor_state {
- XRInteractorState::Idle => Color::BLUE,
- XRInteractorState::Selecting => Color::PURPLE,
- };
- gizmos.cuboid(local, color);
- }
- None => (),
+ if direct.is_some() {
+ let mut local = transform;
+ local.scale = Vec3::splat(0.1);
+ let quat = Quat::from_euler(
+ bevy::prelude::EulerRot::XYZ,
+ 45.0 * (PI / 180.0),
+ 0.0,
+ 45.0 * (PI / 180.0),
+ );
+ local.rotation = quat;
+ let color = match interactor_state {
+ XRInteractorState::Idle => Color::BLUE,
+ XRInteractorState::Selecting => Color::PURPLE,
+ };
+ gizmos.cuboid(local, color);
  }
- match ray {
- Some(_) => match aim {
+ if ray.is_some() {
+ match aim {
  Some(aim) => {
  let color = match interactor_state {
  XRInteractorState::Idle => Color::BLUE,
@@ -136,8 +128,7 @@ pub fn draw_interaction_gizmos(
  );
  }
  None => todo!(),
- },
- None => (),
+ }
  }
  }
 }
@@ -149,6 +140,7 @@ pub struct InteractionEvent {
  pub interactable_state: XRInteractableState,
 }
 
+#[allow(clippy::type_complexity)]
 pub fn socket_interactions(
  interactable_query: Query<
  (&GlobalTransform, &mut XRInteractableState, Entity),
@@ -206,7 +198,7 @@ pub fn socket_interactions(
  }
  }
 }
-
+#[allow(clippy::type_complexity)]
 pub fn interactions(
  interactable_query: Query<
  (&GlobalTransform, Entity),
@@ -230,88 +222,82 @@ pub fn interactions(
  for (interactor_global_transform, interactor_state, interactor_entity, direct, ray, aim) in
  interactor_query.iter()
  {
- match direct {
- Some(_) => {
- //check for sphere overlaps
- let size = 0.1;
- if interactor_global_transform
- .compute_transform()
- .translation
- .distance_squared(
- xr_interactable_global_transform
- .compute_transform()
- .translation,
- )
- < (size * size) * 2.0
- {
- //check for selections first
- match interactor_state {
- XRInteractorState::Idle => {
- let event = InteractionEvent {
- interactor: interactor_entity,
- interactable: interactable_entity,
- interactable_state: XRInteractableState::Hover,
- };
- writer.send(event);
- }
- XRInteractorState::Selecting => {
- let event = InteractionEvent {
- interactor: interactor_entity,
- interactable: interactable_entity,
- interactable_state: XRInteractableState::Select,
- };
- writer.send(event);
- }
+ if direct.is_some() {
+ //check for sphere overlaps
+ let size = 0.1;
+ if interactor_global_transform
+ .compute_transform()
+ .translation
+ .distance_squared(
+ xr_interactable_global_transform
+ .compute_transform()
+ .translation,
+ )
+ < (size * size) * 2.0
+ {
+ //check for selections first
+ match interactor_state {
+ XRInteractorState::Idle => {
+ let event = InteractionEvent {
+ interactor: interactor_entity,
+ interactable: interactable_entity,
+ interactable_state: XRInteractableState::Hover,
+ };
+ writer.send(event);
+ }
+ XRInteractorState::Selecting => {
+ let event = InteractionEvent {
+ interactor: interactor_entity,
+ interactable: interactable_entity,
+ interactable_state: XRInteractableState::Select,
+ };
+ writer.send(event);
  }
  }
  }
- None => (),
  }
- match ray {
- Some(_) => {
- //check for ray-sphere intersection
- let sphere_transform = xr_interactable_global_transform.compute_transform();
- let center = sphere_transform.translation;
- let radius: f32 = 0.1;
- //I hate this but the aim pose needs the root for now
- let root = tracking_root_query.get_single().unwrap().0;
- match aim {
- Some(aim) => {
- let ray_origin =
- root.translation + root.rotation.mul_vec3(aim.0.translation);
- let ray_dir = root.rotation.mul_vec3(aim.0.forward());
+ if ray.is_some() {
+ //check for ray-sphere intersection
+ let sphere_transform = xr_interactable_global_transform.compute_transform();
+ let center = sphere_transform.translation;
+ let radius: f32 = 0.1;
+ //I hate this but the aim pose needs the root for now
+ let root = tracking_root_query.get_single().unwrap().0;
+ match aim {
+ Some(aim) => {
+ let ray_origin =
+ root.translation + root.rotation.mul_vec3(aim.0.translation);
+ let ray_dir = root.rotation.mul_vec3(aim.0.forward());
 
- if ray_sphere_intersection(
- center,
- radius,
- ray_origin,
- ray_dir.normalize_or_zero(),
- ) {
- //check for selections first
- match interactor_state {
- XRInteractorState::Idle => {
- let event = InteractionEvent {
- interactor: interactor_entity,
- interactable: interactable_entity,
- interactable_state: XRInteractableState::Hover,
- };
- writer.send(event);
- }
- XRInteractorState::Selecting => {
- let event = InteractionEvent {
- interactor: interactor_entity,
- interactable: interactable_entity,
- interactable_state: XRInteractableState::Select,
- };
- writer.send(event);
- }
+ if ray_sphere_intersection(
+ center,
+ radius,
+ ray_origin,
+ ray_dir.normalize_or_zero(),
+ ) {
+ //check for selections first
+ match interactor_state {
+ XRInteractorState::Idle => {
+ let event = InteractionEvent {
+ interactor: interactor_entity,
+ interactable: interactable_entity,
+ interactable_state: XRInteractableState::Hover,
+ };
+ writer.send(event);
+ }
+ XRInteractorState::Selecting => {
+ let event = InteractionEvent {
+ interactor: interactor_entity,
+ interactable: interactable_entity,
+ interactable_state: XRInteractableState::Select,
+ };
+ writer.send(event);
  }
  }
  }
- None => info!("no aim pose"),
  }
+ None => info!("no aim pose"),
  }
- None => (),
  }
  }
  }
@@ -330,20 +316,19 @@ pub fn update_interactable_states(
  }
  for event in events.read() {
  //lets change the state
- match interactable_query.get_mut(event.interactable) {
- Ok((_entity, mut entity_state, mut touched)) => {
- //since we have an event we were touched this frame, i hate this name
- *touched = Touched(true);
- if event.interactable_state > *entity_state {
- // info!(
- // "event.state: {:?}, interactable.state: {:?}",
- // event.interactable_state, entity_state
- // );
- // info!("event has a higher state");
- }
- *entity_state = event.interactable_state;
+ if let Ok((_entity, mut entity_state, mut touched)) =
+ interactable_query.get_mut(event.interactable)
+ {
+ //since we have an event we were touched this frame, i hate this name
+ *touched = Touched(true);
+ if event.interactable_state > *entity_state {
+ // info!(
+ // "event.state: {:?}, interactable.state: {:?}",
+ // event.interactable_state, entity_state
+ // );
+ // info!("event has a higher state");
  }
- Err(_) => {}
+ *entity_state = event.interactable_state;
  }
  }
  //lets go through all the untouched interactables and set them to idle

src/xr_input/prototype_locomotion.rs

@@ -55,7 +55,7 @@ impl Default for PrototypeLocomotionConfig {
  }
  }
 }
-#[allow(unused_assignments)]
+#[allow(unused_assignments, clippy::too_many_arguments)]
 pub fn proto_locomotion(
  time: Res<Time>,
  mut tracking_root_query: Query<(&mut Transform, With<OpenXRTrackingRoot>)>,
@@ -136,16 +136,13 @@ pub fn proto_locomotion(
  //apply rotation
  let v = views.lock().unwrap();
  let views = v.get(0);
- match views {
- Some(view) => {
- let mut hmd_translation = view.pose.position.to_vec3();
- hmd_translation.y = 0.0;
- let local = position.0.translation;
- let global = position.0.rotation.mul_vec3(hmd_translation) + local;
- gizmos.circle(global, Vec3::Y, 0.1, Color::GREEN);
- position.0.rotate_around(global, smoth_rot);
- }
- None => (),
+ if let Some(view) = views {
+ let mut hmd_translation = view.pose.position.to_vec3();
+ hmd_translation.y = 0.0;
+ let local = position.0.translation;
+ let global = position.0.rotation.mul_vec3(hmd_translation) + local;
+ gizmos.circle(global, Vec3::Y, 0.1, Color::GREEN);
+ position.0.rotate_around(global, smoth_rot);
  }
  }
  RotationType::Snap => {