Merge branch 'main' into localization-support

Author: RamType0

Editor/MeshSimplifierOptionsDrawer.cs

@@ -28,11 +28,23 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
             });
             var resetOptionsButton = root.Q<Button>("ResetOptionsButton");
             LocalizationProvider.LocalizeProperties<MeshSimplifierOptions>(root);
+
+            var enableSmartLinkToggle = root.Q<Toggle>("EnableSmartLinkToggle");
+            var smartLinkOptionsGroup = root.Q<GroupBox>("SmartLinkOptionsGroup");
+
             resetOptionsButton.clicked += () =>
             {
                 property.boxedValue = MeshSimplifierOptions.Default;
                 property.serializedObject.ApplyModifiedProperties();
             };
+
+            enableSmartLinkToggle.RegisterValueChangedCallback(changeEvent =>
+            {
+                smartLinkOptionsGroup.style.display = changeEvent.newValue ? DisplayStyle.Flex : DisplayStyle.None;
+
+            });
+
+
             return root;
         }
     }

Editor/MeshSimplifierOptionsDrawer.uxml

@@ -3,11 +3,13 @@
     <ui:Toggle label="Preserve Border Edges" binding-path="PreserveBorderEdges" />
     <ui:Toggle label="Preserve Surface Curvature" binding-path="PreserveSurfaceCurvature" />
     <ui:Toggle label="Use Barycentric Coordinate Interpolation" binding-path="UseBarycentricCoordinateInterpolation" />
-    <ui:Toggle label="Enable Smart Link" binding-path="EnableSmartLink" value="true" />
     <ui:Slider label="Min Normal Dot" high-value="1" binding-path="MinNormalDot" low-value="-1" />
-    <ui:FloatField label="Vertex Link Distance" value="0.001" binding-path="VertexLinkDistance" />
-    <ui:Slider label="Vertex Link Min Normal Dot" high-value="1" binding-path="VertexLinkMinNormalDot" low-value="-1" />
-    <ui:FloatField label="Vertex Link Color Distance" value="0.01" binding-path="VertexLinkColorDistance" />
-    <ui:Slider label="Vertex Link UV Distance" high-value="1.414214" binding-path="VertexLinkUvDistance" low-value="0" />
+    <ui:Toggle label="Enable Smart Link" binding-path="EnableSmartLink" value="true" name="EnableSmartLinkToggle" />
+    <ui:GroupBox text="Smart Link Options" name="SmartLinkOptionsGroup">
+        <ui:FloatField label="Vertex Link Distance" value="0.001" binding-path="VertexLinkDistance" name="FloatField" />
+        <ui:Slider label="Vertex Link Min Normal Dot" high-value="1" binding-path="VertexLinkMinNormalDot" low-value="-1" />
+        <ui:FloatField label="Vertex Link Color Distance" value="0.01" binding-path="VertexLinkColorDistance" />
+        <ui:Slider label="Vertex Link UV Distance" high-value="1.414214" binding-path="VertexLinkUvDistance" low-value="0" />
+    </ui:GroupBox>
     <ui:Button text="Reset Options" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ResetOptionsButton" enable-rich-text="false" />
 </ui:UXML>

Ndmf/Editor/MeshiaCascadingAvatarMeshSimplifierEditor.cs

@@ -23,8 +23,6 @@ internal class MeshiaCascadingAvatarMeshSimplifierEditor : UnityEditor.Editor
         private SerializedProperty TargetTriangleCountProperty => serializedObject.FindProperty(nameof(MeshiaCascadingAvatarMeshSimplifier.TargetTriangleCount));
         private SerializedProperty EntriesProperty => serializedObject.FindProperty(nameof(MeshiaCascadingAvatarMeshSimplifier.Entries));
 
-        Action<bool>? onNdmfPreviewEnabledChanged;
-
 
         [MenuItem("GameObject/Meshia Mesh Simplification/Meshia Cascading Avatar Mesh Simplifier", false, 0)]
         static void AddCascadingAvatarMeshSimplifier()
@@ -39,15 +37,6 @@ private void OnEnable()
             RefreshEntries();
         }
 
-        private void OnDisable()
-        {
-            if(onNdmfPreviewEnabledChanged != null)
-            {
-                MeshiaCascadingAvatarMeshSimplifierPreview.PreviewControlNode.IsEnabled.OnChange -= onNdmfPreviewEnabledChanged;
-                onNdmfPreviewEnabledChanged = null;
-            }
-        }
-
         private void RefreshEntries()
         {
             if(Target.transform.parent == null)
@@ -84,8 +73,6 @@ public override VisualElement CreateInspectorGUI()
             var targetTriangleCountPresetDropdownField = root.Q<DropdownField>("TargetTriangleCountPresetDropdownField");
             var adjustButton = root.Q<Button>("AdjustButton");
             var autoAdjustEnabledToggle = root.Q<Toggle>("AutoAdjustEnabledToggle");
-
-
             var triangleCountLabel = root.Q<IMGUIContainer>("TriangleCountLabel");
 
             var removeInvalidEntriesButton = root.Q<Button>("RemoveInvalidEntriesButton");
@@ -102,7 +89,6 @@ public override VisualElement CreateInspectorGUI()
                 {
                     name = "Custom";
                 }
-
                 targetTriangleCountPresetDropdownField.SetValueWithoutNotify(name);
                 if (AutoAdjustEnabledProperty.boolValue)
                 {
@@ -287,18 +273,22 @@ public override VisualElement CreateInspectorGUI()
 
                 return itemRoot;
             };
+
+            ndmfPreviewToggle.SetValueWithoutNotify(MeshiaCascadingAvatarMeshSimplifierPreview.PreviewControlNode.IsEnabled.Value);
             ndmfPreviewToggle.RegisterValueChangedCallback(changeEvent =>
             {
                 MeshiaCascadingAvatarMeshSimplifierPreview.PreviewControlNode.IsEnabled.Value = changeEvent.newValue;
             });
 
-            ndmfPreviewToggle.SetValueWithoutNotify(MeshiaCascadingAvatarMeshSimplifierPreview.PreviewControlNode.IsEnabled.Value);
-            onNdmfPreviewEnabledChanged = (newValue) =>
+            Action<bool> onNdmfPreviewEnabledChanged = (newValue) =>
             {
                 ndmfPreviewToggle.SetValueWithoutNotify(newValue);
             };
             MeshiaCascadingAvatarMeshSimplifierPreview.PreviewControlNode.IsEnabled.OnChange += onNdmfPreviewEnabledChanged;
-
+            ndmfPreviewToggle.RegisterCallback<DetachFromPanelEvent>(detachFromPanelEvent =>
+            {
+                MeshiaCascadingAvatarMeshSimplifierPreview.PreviewControlNode.IsEnabled.OnChange -= onNdmfPreviewEnabledChanged;
+            });
 
 
             return root;