clean up

Cargo.toml

@@ -25,8 +25,6 @@ bevy_mod_xr = { git = "https://github.com/awtterpip/bevy_oxr", optional = true }
 bevy_vrm = "0.0.12"
 bevy_xr_utils = { git = "https://github.com/awtterpip/bevy_oxr", optional = true }
 paste = "1.0.15"
-bevy_mod_picking = "0.20.1"
-bevy_transform_gizmo = "0.12.0"
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
 bevy_mod_openxr = { git = "https://github.com/awtterpip/bevy_oxr", optional = true }

examples/player.rs

@@ -3,9 +3,6 @@ use bevy::prelude::*;
 use bevy_vr_controller::{
     animation::defaults::default_character_animations, player::PlayerSettings, VrControllerPlugin,
 };
-use bevy_xr_utils::{
-    tracking_utils::TrackingUtilitiesPlugin, xr_utils_actions::XRUtilsActionsPlugin,
-};
 
 fn main() {
     let mut app = App::new();

src/animation/load.rs

@@ -1,10 +1,10 @@
+use bevy::{gltf::GltfNode, prelude::*, utils::HashMap};
+use bevy_vrm::{animations::vrm::VRM_ANIMATION_TARGETS, BoneName};
+
 use super::{
     mixamo::{MIXAMO_ANIMATION_TARGETS, MIXAMO_BONE_NAMES},
     AnimationName,
 };
-use crate::ik::RunHumanoidIk;
-use bevy::{gltf::GltfNode, prelude::*, utils::HashMap};
-use bevy_vrm::{animations::vrm::VRM_ANIMATION_TARGETS, BoneName};
 
 #[derive(Component, Clone)]
 pub struct AvatarAnimationClips(pub HashMap<AnimationName, AvatarAnimation>);
@@ -25,7 +25,7 @@ pub(crate) fn load_animation_nodes(
     mut gltfs: ResMut<Assets<Gltf>>,
     mut graphs: ResMut<Assets<AnimationGraph>>,
     nodes: Res<Assets<GltfNode>>,
-    run_humanoid_ik: Res<RunHumanoidIk>,
+    #[cfg(feature = "xr")] run_humanoid_ik: Res<crate::ik::RunHumanoidIk>,
 ) {
     for (entity, animations) in avatars.iter() {
         let mut graph = AnimationGraph::default();
@@ -58,6 +58,7 @@ pub(crate) fn load_animation_nodes(
                     continue;
                 }
 
+                #[cfg(feature = "xr")]
                 if run_humanoid_ik.0 {
                     match name {
                         BoneName::LeftShoulder

src/animation/weights.rs

@@ -1,7 +1,6 @@
 use bevy::{animation::ActiveAnimation, prelude::*, utils::HashMap};
 
 use super::{AnimationName, AvatarAnimationNodes};
-use crate::ik::RunHumanoidIk;
 use crate::{
     player::{PlayerAvatar, PlayerBody},
     velocity::AverageVelocity,

src/ik/mod.rs

@@ -0,0 +1,29 @@
+use bevy::{prelude::*, transform::systems::propagate_transforms};
+
+mod systems;
+
+pub struct HumanoidIKPlugin;
+
+impl Plugin for HumanoidIKPlugin {
+    fn build(&self, app: &mut App) {
+        app.init_resource::<RunHumanoidIk>().add_systems(
+            Update,
+            (
+                systems::setup_ik_system,
+                systems::modify_ik_state,
+                (
+                    propagate_transforms,
+                    systems::reset_rotations,
+                    propagate_transforms,
+                    systems::humanoid_ik_system,
+                )
+                    .chain()
+                    .after(crate::animation::weights::play_avatar_animations)
+                    .run_if(resource_equals::<RunHumanoidIk>(RunHumanoidIk(true))),
+            ),
+        );
+    }
+}
+
+#[derive(Resource, Default, PartialEq, Eq)]
+pub struct RunHumanoidIk(pub bool);