Merge pb config and merge config

CHANGELOG-PRERELEASE.md

@@ -18,6 +18,15 @@ The format is based on [Keep a Changelog].
 - **BREAKING** Dropped support for VRCSDK 3.1.12 or older `#101`
   - Now, we require VRCSDK since 3.1.13 (including) until 3.2.0 (excluding)
 - Use IEditorOnly instead of mokeypatching VRCSDK `#102`
+- Move the toggle for Override and the setting of the value after Override closer together. `#105`
+  - With this changes, the merged PhysBone is now hidden.
+  - The merged PhysBone will be shown in Play mode.
+- Now we can Copy (instead of Override) `Pull`, `Gravity`, `Immobile` properties even if `Integration Type` is overriden. `#105`
+  - During migration, if `Integration Type` (previously called `Force`) is configured to be Override, `Pull`, `Gravity`, `Immobile` will be configured to be Override.
+  - This is **BREAKING** changes.
+- Now we can Copy / Override `Immobile Type` and `Immobile` (strength) separately. `#105`
+  - Previously, if you override `Immobile Type`, you also required to override `Immobile` but no longer required.
+  - This is **BREAKING** changes in the semantics of `immobile` property.
 
 [about-root-transform]: https://github.com/anatawa12/AvatarOptimizer/issues/62#issuecomment-1512586282
 

CHANGELOG.md

@@ -18,6 +18,15 @@ The format is based on [Keep a Changelog].
 - **BREAKING** Dropped support for VRCSDK 3.1.12 or older `#101`
   - Now, we require VRCSDK since 3.1.13 (including) until 3.2.0 (excluding)
 - Use IEditorOnly instead of mokeypatching VRCSDK `#102`
+- Move the toggle for Override and the setting of the value after Override closer together. `#105`
+  - With this changes, the merged PhysBone is now hidden.
+  - The merged PhysBone will be shown in Play mode.
+- Now we can Copy (instead of Override) `Pull`, `Gravity`, `Immobile` properties even if `Integration Type` is overriden. `#105`
+  - During migration, if `Integration Type` (previously called `Force`) is configured to be Override, `Pull`, `Gravity`, `Immobile` will be configured to be Override.
+  - This is **BREAKING** changes.
+- Now we can Copy / Override `Immobile Type` and `Immobile` (strength) separately. `#105`
+  - Previously, if you override `Immobile Type`, you also required to override `Immobile` but no longer required.
+  - This is **BREAKING** changes in the semantics of `immobile` property.
 
 [about-root-transform]: https://github.com/anatawa12/AvatarOptimizer/issues/62#issuecomment-1512586282
 

Editor/MergeToonLitMaterialEditor.cs

@@ -127,10 +127,10 @@ protected override void OnInspectorGUIInner()
                     var preview = _generatedPreviews != null ? _generatedPreviews[i] : Utils.PreviewHereTex;
                     EditorGUILayout.LabelField(new GUIContent(preview), GUILayout.MaxHeight(256), GUILayout.MaxHeight(256));
 
-                    HorizontalLine();
+                    Utils.HorizontalLine();
                 },
                 _candidateMaterials.Length != 0 ? _createNewMergeInfo : null,
-                postButtons: () => HorizontalLine(),
+                postButtons: () => Utils.HorizontalLine(),
                 onMoved: OnChanged,
                 onAdded: _ => OnChanged(),
                 onRemoved: _ => OnChanged()
@@ -157,26 +157,6 @@ private void OnChanged(bool dirty)
             _candidateNames = new []{""}.Concat(_candidateMaterials.Select(x => x.mat.name)).ToArray();
         }
 
-        private void HorizontalLine(bool marginTop = true, bool marginBottom = true)
-        {
-            const float margin = 17f / 2;
-            var maxHeight = 1f;
-            if (marginTop) maxHeight += margin;
-            if (marginBottom) maxHeight += margin;
-
-            var rect = GUILayoutUtility.GetRect(
-                EditorGUIUtility.fieldWidth, float.MaxValue, 
-                1, maxHeight, GUIStyle.none);
-            if (marginTop && marginBottom)
-                rect.y += rect.height / 2 - 0.5f;
-            else if (marginTop)
-                rect.y += rect.height - 1f;
-            else if (marginBottom)
-                rect.y += 0;
-            rect.height = 1;
-            EditorGUI.DrawRect(rect, new Color(0.5f, 0.5f, 0.5f, 1));
-        }
-
         private void OnEnable()
         {
             var component = (MergeToonLitMaterial)target;

Editor/Migration/Migration.cs

@@ -473,8 +473,9 @@ SerializedProperty[] GetContainers()
                     {
                         // might be incompatible changes.
                         var parent = (Transform)root.objectReferenceValue;
-                        var components = EditorUtil<VRCPhysBoneBase>.Create(serialized.FindProperty(nameof(MergePhysBone.componentsSet)), nestCount,
-                            x => (VRCPhysBoneBase)x.objectReferenceValue, (x, y) => x.objectReferenceValue = y)
+                        var components = EditorUtil<VRCPhysBoneBase>.Create(
+                                serialized.FindProperty(nameof(MergePhysBone.componentsSet)), nestCount,
+                                x => (VRCPhysBoneBase)x.objectReferenceValue, (x, y) => x.objectReferenceValue = y)
                             .Values.ToList();
 
                         if (components.Count != 0)
@@ -485,6 +486,22 @@ SerializedProperty[] GetContainers()
                                     serialized.targetObject);
                         }
                     }
+
+                    serialized.FindProperty(nameof(MergePhysBone.immobileType)).boolValue
+                        = serialized.FindProperty(nameof(MergePhysBone.immobile)).boolValue;
+
+                    // integrationType was previously force
+                    if (serialized.FindProperty(nameof(MergePhysBone.integrationType)).boolValue)
+                    {
+                        serialized.FindProperty(nameof(MergePhysBone.pull)).boolValue = true;
+                        // They are force overriden by integrationType so there's no need to override
+                        //serialized.FindProperty(nameof(MergePhysBone.spring)).boolValue = true;
+                        //serialized.FindProperty(nameof(MergePhysBone.stiffness)).boolValue = true;
+                        serialized.FindProperty(nameof(MergePhysBone.gravity)).boolValue = true;
+                        serialized.FindProperty(nameof(MergePhysBone.gravityFalloff)).boolValue = true;
+                        serialized.FindProperty(nameof(MergePhysBone.immobileType)).boolValue = true;
+                        serialized.FindProperty(nameof(MergePhysBone.immobile)).boolValue = true;
+                    }
                     break;
                 }
             }