From 7b2f9f5093268cf8d3b8e059a0fe9ad017f3ed7e Mon Sep 17 00:00:00 2001 From: Mikhail <99481254+DCFApixels@users.noreply.github.com> Date: Wed, 15 May 2024 00:49:28 +0800 Subject: [PATCH] rename/update setting prefs --- src/Debug/Editor/SettingsEditor.cs | 12 ++++++------ src/Debug/Editor/SettingsPrefs.cs | 12 ++++++------ src/EntityTemplate/Editor/EntityTemplateEditor.cs | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Debug/Editor/SettingsEditor.cs b/src/Debug/Editor/SettingsEditor.cs index b782fc2..e8e0e39 100644 --- a/src/Debug/Editor/SettingsEditor.cs +++ b/src/Debug/Editor/SettingsEditor.cs @@ -61,27 +61,27 @@ namespace DCFApixels.DragonECS.Unity.Editors GUILayout.BeginHorizontal(); settings.IsShowHidden = EditorGUILayout.Toggle(SettingsPrefs.instance.IsShowHidden, GUILayout.Width(checkBoxWidth)); - GUILayout.Label(nameof(SettingsPrefs.IsShowHidden), GUILayout.ExpandWidth(false)); + GUILayout.Label(UnityEditorUtility.TransformFieldName(nameof(SettingsPrefs.IsShowHidden)), GUILayout.ExpandWidth(false)); GUILayout.EndHorizontal(); GUILayout.BeginHorizontal(); settings.IsShowInterfaces = EditorGUILayout.Toggle(SettingsPrefs.instance.IsShowInterfaces, GUILayout.Width(checkBoxWidth)); - GUILayout.Label(nameof(SettingsPrefs.IsShowInterfaces), GUILayout.ExpandWidth(false)); + GUILayout.Label(UnityEditorUtility.TransformFieldName(nameof(SettingsPrefs.IsShowInterfaces)), GUILayout.ExpandWidth(false)); GUILayout.EndHorizontal(); GUILayout.BeginHorizontal(); settings.IsShowRuntimeComponents = EditorGUILayout.Toggle(SettingsPrefs.instance.IsShowRuntimeComponents, GUILayout.Width(checkBoxWidth)); - GUILayout.Label(nameof(SettingsPrefs.IsShowRuntimeComponents), GUILayout.ExpandWidth(false)); + GUILayout.Label(UnityEditorUtility.TransformFieldName(nameof(SettingsPrefs.IsShowRuntimeComponents)), GUILayout.ExpandWidth(false)); GUILayout.EndHorizontal(); - settings.AutoColorMode = (AutoColorMode)EditorGUILayout.EnumPopup(nameof(SettingsPrefs.AutoColorMode), SettingsPrefs.instance.AutoColorMode); + settings.AutoColorMode = (ComponentColorMode)EditorGUILayout.EnumPopup(UnityEditorUtility.TransformFieldName(nameof(SettingsPrefs.ComponentColorMode)), SettingsPrefs.instance.ComponentColorMode); if (EditorGUI.EndChangeCheck()) { SettingsPrefs.instance.IsShowHidden = settings.IsShowHidden; SettingsPrefs.instance.IsShowInterfaces = settings.IsShowInterfaces; SettingsPrefs.instance.IsShowRuntimeComponents = settings.IsShowRuntimeComponents; - SettingsPrefs.instance.AutoColorMode = settings.AutoColorMode; + SettingsPrefs.instance.ComponentColorMode = settings.AutoColorMode; } GUILayout.EndVertical(); @@ -147,7 +147,7 @@ namespace DCFApixels.DragonECS.Unity.Editors public bool IsShowHidden; public bool IsShowInterfaces; public bool IsShowRuntimeComponents; - public AutoColorMode AutoColorMode; + public ComponentColorMode AutoColorMode; } } } diff --git a/src/Debug/Editor/SettingsPrefs.cs b/src/Debug/Editor/SettingsPrefs.cs index 22e81b6..a193e42 100644 --- a/src/Debug/Editor/SettingsPrefs.cs +++ b/src/Debug/Editor/SettingsPrefs.cs @@ -4,10 +4,10 @@ using UnityEngine; namespace DCFApixels.DragonECS.Unity.Editors { - internal enum AutoColorMode + internal enum ComponentColorMode { Generic = 0, - Name = 1, + Auto = 1, Rainbow = 2, } [FilePath(EcsConsts.AUTHOR + "/" + EcsConsts.FRAMEWORK_NAME + "/" + nameof(SettingsPrefs) + ".prefs", FilePathAttribute.Location.ProjectFolder)] @@ -61,13 +61,13 @@ namespace DCFApixels.DragonECS.Unity.Editors [SerializeField] - private AutoColorMode _autoColorMode = AutoColorMode.Name; - public AutoColorMode AutoColorMode + private ComponentColorMode _componentColorMode = ComponentColorMode.Auto; + public ComponentColorMode ComponentColorMode { - get => _autoColorMode; + get => _componentColorMode; set { - _autoColorMode = value; + _componentColorMode = value; Save(false); } } diff --git a/src/EntityTemplate/Editor/EntityTemplateEditor.cs b/src/EntityTemplate/Editor/EntityTemplateEditor.cs index b30ec75..ac4e4c1 100644 --- a/src/EntityTemplate/Editor/EntityTemplateEditor.cs +++ b/src/EntityTemplate/Editor/EntityTemplateEditor.cs @@ -16,10 +16,10 @@ namespace DCFApixels.DragonECS.Unity.Editors private GenericMenu _genericMenu; private bool _isInit = false; - private static AutoColorMode AutoColorMode + private static ComponentColorMode AutoColorMode { - get { return SettingsPrefs.instance.AutoColorMode; } - set { SettingsPrefs.instance.AutoColorMode = value; } + get { return SettingsPrefs.instance.ComponentColorMode; } + set { SettingsPrefs.instance.ComponentColorMode = value; } } #region Init @@ -208,10 +208,10 @@ namespace DCFApixels.DragonECS.Unity.Editors { switch (AutoColorMode) { - case AutoColorMode.Name: + case ComponentColorMode.Auto: panelColor = meta.Color.ToUnityColor().Desaturate(0.48f) / 1.18f; //.Desaturate(0.48f) / 1.18f; break; - case AutoColorMode.Rainbow: + case ComponentColorMode.Rainbow: Color hsv = Color.HSVToRGB(1f / (Mathf.Max(total, EscEditorConsts.AUTO_COLOR_RAINBOW_MIN_RANGE)) * index, 1, 1); panelColor = hsv.Desaturate(0.48f) / 1.18f; break;