Merge pull request #185 from Schmarni-Dev/move_hand_debug_gizmos

move hand debug gizmos into bevy_mod_xr

Cargo.lock

@@ -896,7 +896,6 @@ dependencies = [
  "ash",
  "bevy",
  "bevy_mod_xr",
- "bevy_xr_utils",
  "jni 0.20.0",
  "ndk-context",
  "openxr",
@@ -930,6 +929,7 @@ version = "0.2.1"
 dependencies = [
  "bevy",
  "bevy_mod_openxr",
+ "bevy_mod_xr",
  "bevy_xr_utils",
  "reqwest",
  "zip",

crates/bevy_openxr/Cargo.toml

@@ -14,7 +14,6 @@ d3d12 = ["wgpu/dx12", "wgpu-hal/dx12", "dep:winapi"]
 passthrough = []
 
 [dev-dependencies]
-bevy_xr_utils.workspace = true
 bevy = { workspace = true, default-features = true }
 
 [target.'cfg(target_os = "android")'.dependencies]

crates/bevy_openxr/examples/3d_scene.rs

@@ -19,7 +19,7 @@ fn main() -> AppExit {
             ]),
             ..default()
         })
-        .add_plugins(bevy_xr_utils::hand_gizmos::HandGizmosPlugin)
+        .add_plugins(bevy_mod_xr::hand_debug_gizmos::HandGizmosPlugin)
         .add_systems(Startup, setup)
         .insert_resource(ClearColor(Color::NONE))
         .run()

crates/bevy_openxr/examples/android/Cargo.toml

@@ -9,6 +9,7 @@ publish = false
 [dependencies]
 bevy_mod_openxr.workspace = true
 bevy_xr_utils.workspace = true
+bevy_mod_xr.workspace = true
 bevy = { workspace = true, default-features = false, features = [
     # Bevy 0.15 made GameActivity the default which breaks Quest builds
     # To use NativeActivity instead of GameActivity all of the features have to be listed manually

crates/bevy_openxr/examples/android/src/lib.rs

@@ -15,7 +15,7 @@ fn main() {
             },
             ..default()
         }))
-        .add_plugins(bevy_xr_utils::hand_gizmos::HandGizmosPlugin)
+        .add_plugins(bevy_mod_xr::hand_debug_gizmos::HandGizmosPlugin)
         .add_systems(Startup, setup)
         .add_systems(Update, modify_msaa)
         .insert_resource(AmbientLight {

crates/bevy_openxr/examples/raw_actions.rs

@@ -16,9 +16,10 @@ use bevy_mod_xr::{
 };
 use openxr::Posef;
 
-fn main() {
+fn main() -> AppExit {
     let mut app = App::new();
     app.add_plugins(add_xr_plugins(DefaultPlugins));
+    app.add_plugins(bevy_mod_xr::hand_debug_gizmos::HandGizmosPlugin);
     app.add_systems(XrSessionCreated, spawn_hands);
     app.add_systems(XrSessionCreated, attach_set);
     app.add_systems(
@@ -31,7 +32,7 @@ fn main() {
     app.add_systems(Startup, create_actions.run_if(session_available));
     app.add_systems(Startup, setup);
 
-    app.run();
+    app.run()
 }
 
 fn attach_set(actions: Res<ControllerActions>, mut attach: EventWriter<OxrAttachActionSet>) {

crates/bevy_openxr/src/openxr/types.rs

@@ -1,7 +1,7 @@
 use std::borrow::Cow;
 
 use crate::error::OxrError;
-use crate::graphics::{GraphicsExt, GraphicsType, GraphicsWrap};
+use crate::graphics::GraphicsExt;
 
 pub use crate::openxr::exts::OxrExtensions;
 

crates/bevy_xr/src/hand_debug_gizmos.rs

@@ -1,7 +1,7 @@
+use crate::hands::{HandBone, XrHandBoneRadius};
+use crate::spaces::XrSpaceLocationFlags;
 use bevy::color::palettes::css;
 use bevy::{prelude::*, transform::TransformSystem};
-use bevy_mod_xr::hands::{HandBone, XrHandBoneRadius};
-use bevy_mod_xr::spaces::XrSpaceLocationFlags;
 pub struct HandGizmosPlugin;
 impl Plugin for HandGizmosPlugin {
     fn build(&self, app: &mut App) {

crates/bevy_xr/src/lib.rs

@@ -4,3 +4,4 @@ pub mod hands;
 pub mod session;
 pub mod types;
 pub mod spaces;
+pub mod hand_debug_gizmos;

crates/bevy_xr_utils/examples/tracking_utils.rs

@@ -4,12 +4,14 @@ use bevy::prelude::*;
 use bevy_mod_openxr::{action_binding::OxrSendActionBindings, add_xr_plugins};
 use bevy_mod_xr::session::{XrSessionCreated, XrTracker};
 use bevy_xr_utils::tracking_utils::{
-    suggest_action_bindings, TrackingUtilitiesPlugin, XrTrackedLeftGrip, XrTrackedLocalFloor, XrTrackedRightGrip, XrTrackedStage, XrTrackedView
+    suggest_action_bindings, TrackingUtilitiesPlugin, XrTrackedLeftGrip, XrTrackedLocalFloor,
+    XrTrackedRightGrip, XrTrackedStage, XrTrackedView,
 };
 
 fn main() {
     let mut app = App::new();
     app.add_plugins(add_xr_plugins(DefaultPlugins));
+    app.add_plugins(bevy_mod_xr::hand_debug_gizmos::HandGizmosPlugin);
     app.add_systems(Startup, setup);
 
     //things?

crates/bevy_xr_utils/examples/transform_utils.rs

@@ -8,10 +8,10 @@ use bevy_xr_utils::xr_utils_actions::{
     XRUtilsActionsPlugin, XRUtilsBinding,
 };
 
-fn main() {
+fn main() -> AppExit {
     App::new()
         .add_plugins(add_xr_plugins(DefaultPlugins))
-        .add_plugins(bevy_xr_utils::hand_gizmos::HandGizmosPlugin)
+        .add_plugins(bevy_mod_xr::hand_debug_gizmos::HandGizmosPlugin)
         .add_plugins(transform_utils::TransformUtilitiesPlugin)
         .add_systems(Startup, setup)
         .add_plugins(XRUtilsActionsPlugin)
@@ -31,7 +31,7 @@ fn main() {
             brightness: 500.0,
             ..AmbientLight::default()
         })
-        .run();
+        .run()
 }
 
 /// set up a simple 3D scene

crates/bevy_xr_utils/src/lib.rs

@@ -1,4 +1,3 @@
-pub mod hand_gizmos;
 #[cfg(not(target_family = "wasm"))]
 pub mod tracking_utils;
 #[cfg(not(target_family = "wasm"))]