head rot and pos separated from inputs

Author: dooly123

Basis/Packages/com.basis.mediapipe/Runtime/Application/BasisMediaPipeManagement.cs

@@ -51,7 +51,8 @@ private void LoadSettingsIntoConfig()
             CameraDeviceName = BasisMediaPipeSettings.Camera.RawValue;
             Config.EnableFace = BasisMediaPipeSettings.EnableFace.RawValue;
             Config.EnableHands = BasisMediaPipeSettings.EnableHands.RawValue;
-            Config.EnableHead = BasisMediaPipeSettings.EnableHead.RawValue;
+            Config.EnableHeadPosition = BasisMediaPipeSettings.EnableHeadPosition.RawValue;
+            Config.EnableHeadRotation = BasisMediaPipeSettings.EnableHeadRotation.RawValue;
             Config.EnableHandTracking = BasisMediaPipeSettings.EnableHandTracking.RawValue;
             Config.SwapHands = BasisMediaPipeSettings.SwapHands.RawValue;
             Config.MirrorHorizontally = BasisMediaPipeSettings.Mirror.RawValue;
@@ -219,12 +220,14 @@ private void ApplyResult(in BasisMediaPipeResult result)
                 _handConverter.Apply(in result);
             }
 
-            if (Config.EnableHead)
+            if (Config.EnableHeadPosition || Config.EnableHeadRotation)
             {
                 if (result.HasFace && BasisLocalBoneDriver.EyeControl != null && _headConverter.TryGetHeadOffset(in result, out Quaternion headOffset, out Vector3 headPositionOffset))
                 {
                     BasisLocalBoneControl eye = BasisLocalBoneDriver.EyeControl;
-                    EnsureTracker(BasisBoneTrackedRole.Head).FollowMovement.SetLocalPositionAndRotation(eye.OutGoingData.position + headPositionOffset, eye.OutGoingData.rotation * headOffset);
+                    Vector3 headPosition = Config.EnableHeadPosition ? eye.OutGoingData.position + headPositionOffset : eye.OutGoingData.position;
+                    Quaternion headRotation = Config.EnableHeadRotation ? eye.OutGoingData.rotation * headOffset : eye.OutGoingData.rotation;
+                    EnsureTracker(BasisBoneTrackedRole.Head).FollowMovement.SetLocalPositionAndRotation(headPosition, headRotation);
                 }
             }
             else

Basis/Packages/com.basis.mediapipe/Runtime/BasisMediaPipeConfig.cs

@@ -6,7 +6,8 @@ public struct BasisMediaPipeConfig
         public bool EnableFace;
         public bool EnableHands;
         public bool EnablePose;
-        public bool EnableHead;
+        public bool EnableHeadPosition;
+        public bool EnableHeadRotation;
         public bool EnableHandTracking;
         public bool SwapHands;
         public bool MirrorHorizontally;
@@ -19,7 +20,8 @@ public struct BasisMediaPipeConfig
             EnableFace = true,
             EnableHands = true,
             EnablePose = false,
-            EnableHead = false,
+            EnableHeadPosition = true,
+            EnableHeadRotation = true,
             EnableHandTracking = false,
             SwapHands = false,
             MirrorHorizontally = true,

Basis/Packages/com.basis.mediapipe/Runtime/Settings/BasisMediaPipeSettings.cs

@@ -20,8 +20,11 @@ public static class BasisMediaPipeSettings
         public static readonly BasisSettingsBinding<bool> Mirror =
             new BasisSettingsBinding<bool>("mediapipe_mirror", new BasisPlatformDefault<bool>(true));
 
-        public static readonly BasisSettingsBinding<bool> EnableHead =
-            new BasisSettingsBinding<bool>("mediapipe_head", new BasisPlatformDefault<bool>(false));
+        public static readonly BasisSettingsBinding<bool> EnableHeadPosition =
+            new BasisSettingsBinding<bool>("mediapipe_headposition", new BasisPlatformDefault<bool>(true));
+
+        public static readonly BasisSettingsBinding<bool> EnableHeadRotation =
+            new BasisSettingsBinding<bool>("mediapipe_headrotation", new BasisPlatformDefault<bool>(true));
 
         public static readonly BasisSettingsBinding<bool> EnableHandTracking =
             new BasisSettingsBinding<bool>("mediapipe_handtracking_v2", new BasisPlatformDefault<bool>(false));
@@ -91,7 +94,8 @@ public static void LoadAll()
             Camera.LoadBindingValue();
             EnableFace.LoadBindingValue();
             EnableHands.LoadBindingValue();
-            EnableHead.LoadBindingValue();
+            EnableHeadPosition.LoadBindingValue();
+            EnableHeadRotation.LoadBindingValue();
             EnableHandTracking.LoadBindingValue();
             EnableBody.LoadBindingValue();
             SwapHands.LoadBindingValue();

Basis/Packages/com.basis.mediapipe/Runtime/Settings/SettingsProviderMediaPipe.cs

@@ -120,7 +120,8 @@ void AddTuningToggle(string title, string description, BasisSettingsBinding<bool
 
             AddFeatureToggle("Face & Eyes", "Track facial expressions, blink and gaze.", BasisMediaPipeSettings.EnableFace);
             AddFeatureToggle("Hands & Fingers", "Track finger curl and splay.", BasisMediaPipeSettings.EnableHands);
-            AddFeatureToggle("Head Tracking", "Your avatar's head follows your real head. The camera stays on the mouse.", BasisMediaPipeSettings.EnableHead);
+            AddFeatureToggle("Head Rotation", "Your avatar's head turns, nods and tilts to follow your real head. The camera stays on the mouse.", BasisMediaPipeSettings.EnableHeadRotation);
+            AddFeatureToggle("Head Position", "Your avatar's head shifts to follow your real head movement.", BasisMediaPipeSettings.EnableHeadPosition);
             AddFeatureToggle("Hand Position (experimental)", "Move your avatar's hands to match your real hands (in addition to finger curl).", BasisMediaPipeSettings.EnableHandTracking);
             AddTuningToggle("Hand Rotation", "Off keeps a neutral wrist (position only) to avoid noisy webcam wrist rotation.", BasisMediaPipeSettings.HandRotation);
             AddFeatureToggle("Body Lean/Twist (experimental)", "Lean and twist your torso. Uses the pose model (extra CPU); monocular, so approximate.", BasisMediaPipeSettings.EnableBody);