[Automated] Merged dev into main

oculus-samples · Dec 16, 2023 · 3c00952 · 3c00952
2 parents 9aaa97b + 8d5f1bb
commit 3c00952
Show file tree

Hide file tree

Showing 257 changed files with 53,309 additions and 4,874 deletions.
diff --git a/Editor/AnimationRigging/CaptureAnimationConstraintEditor.cs b/Editor/AnimationRigging/CaptureAnimationConstraintEditor.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+using UnityEditor;
+using UnityEngine;
+
+namespace Oculus.Movement.AnimationRigging
+{
+    /// <summary>
+    /// Custom editor for the capture animation constraint.
+    /// </summary>
+    [CustomEditor(typeof(CaptureAnimationConstraint)), CanEditMultipleObjects]
+    public class CaptureAnimationConstraintEditor : Editor
+    {
+        /// <inheritdoc />
+        public override void OnInspectorGUI()
+        {
+            var constraint = (CaptureAnimationConstraint)target;
+            ICaptureAnimationData constraintData = constraint.data;
+            if (constraintData.ConstraintAnimator == null)
+            {
+                if (GUILayout.Button("Find Animator"))
+                {
+                    Undo.RecordObject(constraint, "Find Animator");
+                    var animator = constraint.GetComponentInParent<Animator>();
+                    constraint.data.AssignAnimator(animator);
+                }
+            }
+
+            if (constraintData.CurrentPose == null ||
+                constraintData.ReferencePose == null ||
+                constraintData.CurrentPose.Length < (int)HumanBodyBones.LastBone ||
+                constraintData.ReferencePose.Length < (int)HumanBodyBones.LastBone)
+            {
+                if (GUILayout.Button("Setup pose arrays"))
+                {
+                    Undo.RecordObject(constraint, "Setup pose arrays");
+                    constraint.data.SetupPoseArrays();
+                }
+            }
+
+            GUILayout.Space(EditorGUIUtility.standardVerticalSpacing);
+
+            DrawDefaultInspector();
+        }
+    }
+}
diff --git a/Editor/AnimationRigging/CaptureAnimationConstraintEditor.cs.meta b/Editor/AnimationRigging/CaptureAnimationConstraintEditor.cs.meta
diff --git a/Editor/AnimationRigging/DeformationConstraintEditor.cs b/Editor/AnimationRigging/DeformationConstraintEditor.cs
@@ -41,7 +41,17 @@ public override void OnInspectorGUI()
                 if (GUILayout.Button("Find Hips To Head Bones"))
                 {
                     Undo.RecordObject(constraint, "Find Hips To Head Bones");
-                    constraint.data.SetUpHipsAndHeadBones();
+                    constraint.data.SetUpHipsToHeadBones();
+                    EditorUtility.SetDirty(target);
+                }
+            }
+            if (constraintData.HipsToHeadBoneTargets == null ||
+                constraintData.HipsToHeadBoneTargets.Length == 0)
+            {
+                if (GUILayout.Button("Find Hips To Head Bone Targets"))
+                {
+                    Undo.RecordObject(constraint, "Find Hips To Head Bone Targets");
+                    constraint.data.SetUpHipsToHeadBoneTargets(constraint.transform);
                     EditorUtility.SetDirty(target);
                 }
             }

diff --git a/Editor/AnimationRigging/GroundingConstraintEditor.cs b/Editor/AnimationRigging/GroundingConstraintEditor.cs
@@ -57,17 +57,20 @@ private void FindHips(GroundingConstraint constraint)
         {
             IGroundingData groundingData = constraint.data;
             Transform hipsTransform = null;
+            bool isFullSkeleton = groundingData.ConstraintSkeleton.GetSkeletonType() == OVRSkeleton.SkeletonType.FullBody;
+
             if (groundingData.ConstraintSkeleton != null)
             {
                 hipsTransform = RiggingUtilities.FindBoneTransformFromCustomSkeleton(
                     groundingData.ConstraintSkeleton,
-                    OVRSkeleton.BoneId.Body_Hips);
+                    isFullSkeleton ? OVRSkeleton.BoneId.FullBody_Hips : OVRSkeleton.BoneId.Body_Hips);
             }
             else
             {
                 hipsTransform = RiggingUtilities.FindBoneTransformAnimator(
                     groundingData.ConstraintAnimator,
-                    OVRSkeleton.BoneId.Body_Hips);
+                    isFullSkeleton ? OVRSkeleton.BoneId.FullBody_Hips : OVRSkeleton.BoneId.Body_Hips,
+                    groundingData.ConstraintAnimator.GetComponent<OVRSkeleton>().GetSkeletonType() == OVRSkeleton.SkeletonType.FullBody);
             }
             if (hipsTransform == null)
             {

diff --git a/Editor/AnimationRigging/HipPinningConstraintEditor.cs b/Editor/AnimationRigging/HipPinningConstraintEditor.cs
@@ -16,16 +16,44 @@ public override void OnInspectorGUI()
         {
             var constraint = (HipPinningConstraint)target;
             IHipPinningData constraintData = constraint.data;
-            if (constraintData.ConstraintSkeleton == null)
+            if (constraintData.ConstraintSkeleton == null &&
+                constraintData.AnimatorComponent == null)
             {
                 if (GUILayout.Button("Find OVR Skeleton"))
                 {
                     Undo.RecordObject(constraint, "Find OVR Skeleton");
                     var skeleton = constraint.GetComponentInParent<OVRCustomSkeleton>();
                     constraint.data.AssignOVRSkeleton(skeleton);
+                    EditorUtility.SetDirty(target);
+                }
+                if (GUILayout.Button("Find Animator"))
+                {
+                    Undo.RecordObject(constraint, "Find Animator");
+                    var animatorComp = constraint.GetComponentInParent<Animator>();
+                    constraint.data.AssignAnimator(animatorComp);
+                    EditorUtility.SetDirty(target);
+                }
+            }
+            else if (!constraintData.ObtainedProperReferences)
+            {
+                if (GUILayout.Button("Set up data"))
+                {
+                    Undo.RecordObject(constraint, "Set up data");
+                    constraint.data.SetUpBoneReferences();
+                    EditorUtility.SetDirty(target);
                 }
-                GUILayout.Space(EditorGUIUtility.standardVerticalSpacing);
             }
+            else if (constraintData.ObtainedProperReferences)
+            {
+                if (GUILayout.Button("Clear data"))
+                {
+                    Undo.RecordObject(constraint, "Clear data");
+                    constraint.data.ClearSetupReferences();
+                    EditorUtility.SetDirty(target);
+                }
+            }
+
+            GUILayout.Space(EditorGUIUtility.standardVerticalSpacing);
             DrawDefaultInspector();
         }
     }

diff --git a/Editor/Meta.Movement.Editor.asmdef b/Editor/Meta.Movement.Editor.asmdef
@@ -3,6 +3,7 @@
     "rootNamespace": "",
     "references": [
         "GUID:502e28d01b3ebaf4689df96d8655467c",
+        "GUID:2a230cb87a1d3ba4a98bdc0ddae76e6c",
         "GUID:f64c9ebcd7899c3448a08dc9f9ddbe30",
         "GUID:d2761a0af0f567748a72629d4bb18a26",
         "GUID:7305c54a43f3814439df347c7519653e",

diff --git a/Editor/ThirdParty.meta b/Editor/ThirdParty.meta
diff --git a/Editor/ThirdParty/LICENSE.txt b/Editor/ThirdParty/LICENSE.txt
@@ -0,0 +1,4 @@
+// Developed by Tom Kail at Inkle
+// Released under the MIT Licence as held at https://opensource.org/licenses/MIT
+//
+// From https://gist.github.com/tomkail/ba4136e6aa990f4dc94e0d39ec6a058c
diff --git a/Editor/ThirdParty/LICENSE.txt.meta b/Editor/ThirdParty/LICENSE.txt.meta