diff --git a/src/Debug/Editor/DebugMonitorPrefs.cs b/src/Debug/Editor/SettingsPrefs.cs similarity index 82% rename from src/Debug/Editor/DebugMonitorPrefs.cs rename to src/Debug/Editor/SettingsPrefs.cs index 2923965..fdedf29 100644 --- a/src/Debug/Editor/DebugMonitorPrefs.cs +++ b/src/Debug/Editor/SettingsPrefs.cs @@ -4,8 +4,8 @@ using UnityEngine; namespace DCFApixels.DragonECS.Unity.Editors { - [FilePath(EcsConsts.FRAMEWORK_NAME + "/" + nameof(DebugMonitorPrefs) + ".prefs", FilePathAttribute.Location.ProjectFolder)] - public class DebugMonitorPrefs : ScriptableSingleton + [FilePath(EcsConsts.FRAMEWORK_NAME + "/" + nameof(SettingsPrefs) + ".prefs", FilePathAttribute.Location.ProjectFolder)] + public class SettingsPrefs : ScriptableSingleton { [SerializeField] private bool _isShowInterfaces = false; @@ -30,7 +30,7 @@ namespace DCFApixels.DragonECS.Unity.Editors } } [SerializeField] - private bool _isShowRuntimeComponents = true; + private bool _isShowRuntimeComponents = false; public bool IsShowRuntimeComponents { get => _isShowRuntimeComponents; diff --git a/src/Debug/Editor/DebugMonitorPrefs.cs.meta b/src/Debug/Editor/SettingsPrefs.cs.meta similarity index 100% rename from src/Debug/Editor/DebugMonitorPrefs.cs.meta rename to src/Debug/Editor/SettingsPrefs.cs.meta diff --git a/src/Debug/Monitors/Editor/PipelineMonitorEditor.cs b/src/Debug/Monitors/Editor/PipelineMonitorEditor.cs index 41819f6..9936e29 100644 --- a/src/Debug/Monitors/Editor/PipelineMonitorEditor.cs +++ b/src/Debug/Monitors/Editor/PipelineMonitorEditor.cs @@ -22,13 +22,13 @@ namespace DCFApixels.DragonECS.Unity.Editors private PipelineMonitor Target => (PipelineMonitor)target; private bool IsShowInterfaces { - get { return DebugMonitorPrefs.instance.IsShowInterfaces; } - set { DebugMonitorPrefs.instance.IsShowInterfaces = value; } + get { return SettingsPrefs.instance.IsShowInterfaces; } + set { SettingsPrefs.instance.IsShowInterfaces = value; } } private bool IsShowHidden { - get { return DebugMonitorPrefs.instance.IsShowHidden; } - set { DebugMonitorPrefs.instance.IsShowHidden = value; } + get { return SettingsPrefs.instance.IsShowHidden; } + set { SettingsPrefs.instance.IsShowHidden = value; } } public override void OnInspectorGUI() diff --git a/src/Debug/Monitors/Editor/PipelineProcessesMonitorEditor.cs b/src/Debug/Monitors/Editor/PipelineProcessesMonitorEditor.cs index ae4ff83..7dffd56 100644 --- a/src/Debug/Monitors/Editor/PipelineProcessesMonitorEditor.cs +++ b/src/Debug/Monitors/Editor/PipelineProcessesMonitorEditor.cs @@ -23,13 +23,13 @@ namespace DCFApixels.DragonECS.Unity.Editors private PipelineProcessMonitor Target => (PipelineProcessMonitor)target; private bool IsShowInterfaces { - get { return DebugMonitorPrefs.instance.IsShowInterfaces; } - set { DebugMonitorPrefs.instance.IsShowInterfaces = value; } + get { return SettingsPrefs.instance.IsShowInterfaces; } + set { SettingsPrefs.instance.IsShowInterfaces = value; } } private bool IsShowHidden { - get { return DebugMonitorPrefs.instance.IsShowHidden; } - set { DebugMonitorPrefs.instance.IsShowHidden = value; } + get { return SettingsPrefs.instance.IsShowHidden; } + set { SettingsPrefs.instance.IsShowHidden = value; } } private void Init() @@ -78,7 +78,6 @@ namespace DCFApixels.DragonECS.Unity.Editors private Vector2 _cellsize = new Vector2(EditorGUIUtility.singleLineHeight, EditorGUIUtility.singleLineHeight); private Vector2 _nameCellSize = new Vector2(200f, 200f); - //private Vector2Int _selectedPoint = new Vector2Int(-1, -1); private (TypeMeta system, TypeMeta process) _selectedPointMeta = default; public override void OnInspectorGUI() { @@ -126,7 +125,6 @@ namespace DCFApixels.DragonECS.Unity.Editors if (EcsGUI.HitTest(lineRect)) { GUI.Button(lineRect, "", EditorStyles.selectionRect); - //_selectedPoint.x = i; _selectedPointMeta.process = meta; } GUIUtility.RotateAroundPivot(90, pivod); @@ -158,7 +156,6 @@ namespace DCFApixels.DragonECS.Unity.Editors if (EcsGUI.HitTest(lineRect)) { GUI.Button(lineRect, "", EditorStyles.selectionRect); - //_selectedPoint.y = i; _selectedPointMeta.system = meta; } GUI.Label(rect, UnityEditorUtility.GetLabel(name, i + " " + name), EditorStyles.miniBoldLabel); @@ -175,10 +172,6 @@ namespace DCFApixels.DragonECS.Unity.Editors { rect = new Rect(x * _cellsize.x + _nameCellSize.x, y * _cellsize.y + _nameCellSize.y, _cellsize.x, _cellsize.y); bool flag = process.systemsBitMask[y]; - - //string tooltip = $"{process.meta.Name}-{_systemsList[x].meta.Name}"; - //GUIContent label = flag ? UnityEditorUtility.GetLabel(checkIcon, tooltip) : UnityEditorUtility.GetLabel("", tooltip); - //GUI.Label(rect, label); if (flag) { GUI.Label(rect, UnityEditorUtility.GetLabel(checkIcon)); diff --git a/src/Internal/Editor/EcsGUI.cs b/src/Internal/Editor/EcsGUI.cs index 6428dc0..5d13281 100644 --- a/src/Internal/Editor/EcsGUI.cs +++ b/src/Internal/Editor/EcsGUI.cs @@ -48,13 +48,13 @@ namespace DCFApixels.DragonECS.Unity.Editors private static bool IsShowHidden { - get { return DebugMonitorPrefs.instance.IsShowHidden; } - set { DebugMonitorPrefs.instance.IsShowHidden = value; } + get { return SettingsPrefs.instance.IsShowHidden; } + set { SettingsPrefs.instance.IsShowHidden = value; } } private static bool IsShowRuntimeComponents { - get { return DebugMonitorPrefs.instance.IsShowRuntimeComponents; } - set { DebugMonitorPrefs.instance.IsShowRuntimeComponents = value; } + get { return SettingsPrefs.instance.IsShowRuntimeComponents; } + set { SettingsPrefs.instance.IsShowRuntimeComponents = value; } } public enum AddClearComponentButton : byte