feat(Runtime): Update FullBodyDeformation with additional settings for shoulders and arms

Summary:
- Add deformation settings for shoulder width and height
- Add deformation settings for arms height
- Update spine alignment to use limb proportions

Reviewed By: sohailshafiiWk

Differential Revision: D52717237

fbshipit-source-id: 249858618a527f0b6913ad684f2162198dfa12da

Author: Andrew Kim

Editor/AnimationRigging/FullBodyDeformationConstraintEditor.cs

@@ -91,6 +91,9 @@ private static class Content
         private SerializedProperty _spineLowerAlignmentWeightProperty;
         private SerializedProperty _spineUpperAlignmentWeightProperty;
         private SerializedProperty _chestAlignmentWeightProperty;
+        private SerializedProperty _shouldersHeightAdjustmentWeightProperty;
+        private SerializedProperty _shouldersWidthAdjustmentWeightProperty;
+        private SerializedProperty _armsHeightAdjustmentWeightProperty;
         private SerializedProperty _alignFeetWeightProperty;
 
         private SerializedProperty _leftShoulderWeightProperty;
@@ -130,6 +133,10 @@ private void OnEnable()
             _spineLowerAlignmentWeightProperty = data.FindPropertyRelative("_spineLowerAlignmentWeight");
             _spineUpperAlignmentWeightProperty = data.FindPropertyRelative("_spineUpperAlignmentWeight");
             _chestAlignmentWeightProperty = data.FindPropertyRelative("_chestAlignmentWeight");
+            _shouldersHeightAdjustmentWeightProperty = data.FindPropertyRelative("_shouldersHeightAdjustmentWeight");
+            _shouldersWidthAdjustmentWeightProperty = data.FindPropertyRelative("_shouldersWidthAdjustmentWeight");
+            _armsHeightAdjustmentWeightProperty = data.FindPropertyRelative("_armsHeightAdjustmentWeight");
+
             _leftShoulderWeightProperty = data.FindPropertyRelative("_leftShoulderWeight");
             _rightShoulderWeightProperty = data.FindPropertyRelative("_rightShoulderWeight");
             _leftArmWeightProperty = data.FindPropertyRelative("_leftArmWeight");
@@ -266,10 +273,19 @@ private void DisplaySettingsFoldoutContent()
             EditorGUILayout.Space();
             GUILayout.BeginHorizontal();
             GUILayout.Space(EditorGUI.indentLevel * _indentSpacing);
-            GUILayout.Label(new GUIContent("Arms"), EditorStyles.boldLabel);
+            GUILayout.Label(new GUIContent("Shoulders"), EditorStyles.boldLabel);
             GUILayout.EndHorizontal();
+            EditorGUILayout.PropertyField(_shouldersHeightAdjustmentWeightProperty);
+            EditorGUILayout.PropertyField(_shouldersWidthAdjustmentWeightProperty);
             AverageWeightSlider(Content.ShouldersWeight,
                 new[] { _leftShoulderWeightProperty, _rightShoulderWeightProperty });
+
+            EditorGUILayout.Space();
+            GUILayout.BeginHorizontal();
+            GUILayout.Space(EditorGUI.indentLevel * _indentSpacing);
+            GUILayout.Label(new GUIContent("Arms"), EditorStyles.boldLabel);
+            GUILayout.EndHorizontal();
+            EditorGUILayout.PropertyField(_armsHeightAdjustmentWeightProperty);
             AverageWeightSlider(Content.ArmsWeight,
                 new[] { _leftArmWeightProperty, _rightArmWeightProperty });
             AverageWeightSlider(Content.HandsWeight,

Runtime/Scripts/AnimationRigging/DeformationConstraint.cs

@@ -697,8 +697,8 @@ public void SetUpBonePairs()
                 bonePairs[i] = bonePair;
             }
 
-            // Calculate proportions for spine.
-            for (int i = 0; i < _hipsToHeadBones.Length - 1; i++)
+            // Calculate proportions for the upper body.
+            for (int i = 0; i < _hipsToHeadBones.Length + 1; i++)
             {
                 var bonePair = bonePairs[i];
                 bonePair.HeightProportion = bonePair.Distance / _hipsToHeadDistance;

Runtime/Scripts/AnimationRigging/FullBodyDeformationConstraint.cs

@@ -161,6 +161,21 @@ public interface IFullBodyDeformationData
         /// </summary>
         public string ChestAlignmentWeightFloatProperty { get; }
 
+        /// <summary>
+        /// The shoulders height adjustment weight float property.
+        /// </summary>
+        string ShouldersHeightAdjustmentWeightFloatProperty { get; }
+
+        /// <summary>
+        /// The shoulders width adjustment weight float property.
+        /// </summary>
+        string ShouldersWidthAdjustmentWeightFloatProperty { get; }
+
+        /// <summary>
+        /// The arms height adjustment weight float property.
+        /// </summary>
+        string ArmsHeightAdjustmentWeightFloatProperty { get; }
+
         /// <summary>
         /// The left shoulder weight float property.
         /// </summary>
@@ -356,6 +371,18 @@ bool IFullBodyDeformationData.ShouldUpdate
         string IFullBodyDeformationData.ChestAlignmentWeightFloatProperty =>
             ConstraintsUtils.ConstructConstraintDataPropertyName(nameof(_chestAlignmentWeight));
 
+        /// <inheritdoc />
+        string IFullBodyDeformationData.ShouldersHeightAdjustmentWeightFloatProperty =>
+            ConstraintsUtils.ConstructConstraintDataPropertyName(nameof(_shouldersHeightAdjustmentWeight));
+
+        /// <inheritdoc />
+        string IFullBodyDeformationData.ShouldersWidthAdjustmentWeightFloatProperty =>
+            ConstraintsUtils.ConstructConstraintDataPropertyName(nameof(_shouldersWidthAdjustmentWeight));
+
+        /// <inheritdoc />
+        string IFullBodyDeformationData.ArmsHeightAdjustmentWeightFloatProperty =>
+            ConstraintsUtils.ConstructConstraintDataPropertyName(nameof(_armsHeightAdjustmentWeight));
+
         /// <inheritdoc />
         string IFullBodyDeformationData.LeftShoulderWeightFloatProperty =>
             ConstraintsUtils.ConstructConstraintDataPropertyName(nameof(_leftShoulderWeight));
@@ -441,6 +468,42 @@ public float ChestAlignmentWeight
             set => _chestAlignmentWeight = value;
         }
 
+        /// <summary>
+        /// The weight for shoulders height adjustment.
+        /// </summary>
+        [SyncSceneToStream, SerializeField, Range(0.0f, 1.0f)]
+        [Tooltip(DeformationDataTooltips.ShouldersHeightAdjustmentWeight)]
+        private float _shouldersHeightAdjustmentWeight;
+        public float ShouldersHeightAdjustmentWeight
+        {
+            get => _shouldersHeightAdjustmentWeight;
+            set => _shouldersHeightAdjustmentWeight = value;
+        }
+
+        /// <summary>
+        /// The weight for shoulders width adjustment.
+        /// </summary>
+        [SyncSceneToStream, SerializeField, Range(0.0f, 1.0f)]
+        [Tooltip(DeformationDataTooltips.ShouldersHeightAdjustmentWeight)]
+        private float _shouldersWidthAdjustmentWeight;
+        public float ShouldersWidthAdjustmentWeight
+        {
+            get => _shouldersWidthAdjustmentWeight;
+            set => _shouldersWidthAdjustmentWeight = value;
+        }
+
+        /// <summary>
+        /// The weight for arms height adjustment.
+        /// </summary>
+        [SyncSceneToStream, SerializeField, Range(0.0f, 1.0f)]
+        [Tooltip(DeformationDataTooltips.ArmsHeightAdjustmentWeight)]
+        private float _armsHeightAdjustmentWeight;
+        public float ArmsHeightAdjustmentWeight
+        {
+            get => _armsHeightAdjustmentWeight;
+            set => _armsHeightAdjustmentWeight = value;
+        }
+
         /// <summary>
         /// The weight for the deformation on the left shoulder.
         /// </summary>
@@ -971,16 +1034,16 @@ public void SetUpBonePairs()
                 bonePairs[i] = bonePair;
             }
 
-            // Calculate proportions for spine.
-            for (int i = 0; i < _hipsToHeadBones.Length - 1; i++)
+            // Calculate proportions for the upper body.
+            for (int i = 0; i < _hipsToHeadBones.Length + 1; i++)
             {
                 var bonePair = bonePairs[i];
                 bonePair.HeightProportion = bonePair.Distance / (_hipsToHeadDistance + _hipsToFootDistance);
                 bonePair.LimbProportion = bonePair.Distance / _hipsToHeadDistance;
                 bonePairs[i] = bonePair;
             }
 
-            // Calculate proportions for legs.
+            // Calculate proportions for the lower body.
             for (int i = upperLegIndex; i < bonePairs.Count; i++)
             {
                 var bonePair = bonePairs[i];