resharp

2026-05-16 13:10:07 +00:00 · 2023-08-17 09:43:02 +09:00
parent 35325c8899
commit 3df190382a
33 changed files with 1596 additions and 1752 deletions
--- a/Demo/NanoMonitor/Scripts/NanoMonitor.cs
+++ b/Demo/NanoMonitor/Scripts/NanoMonitor.cs
@@ -1,10 +1,11 @@
 using System;
 using UnityEngine;
+using UnityEngine.Profiling;
 using UnityEngine.Serialization;
 using UnityEngine.UI;
 #if UNITY_EDITOR
 using UnityEditor;
-
+using UnityEditorInternal;
 #endif

 namespace Coffee.NanoMonitor
@@ -13,24 +14,29 @@ namespace Coffee.NanoMonitor
    [CustomEditor(typeof(NanoMonitor))]
    internal class NanoMonitorEditor : Editor
    {
-        private UnityEditorInternal.ReorderableList m_MonitorItemList;
+        private ReorderableList _monitorItemList;

        private void OnEnable()
        {
            var items = serializedObject.FindProperty("m_CustomMonitorItems");
-            m_MonitorItemList = new UnityEditorInternal.ReorderableList(serializedObject, items)
+            _monitorItemList = new ReorderableList(serializedObject, items)
            {
                draggable = false,
-                drawHeaderCallback = r => { EditorGUI.LabelField(r, new GUIContent("Custom Monitor Items")); },
+                drawHeaderCallback = r =>
+                {
+                    EditorGUI.LabelField(r, new GUIContent("Custom Monitor Items"));
+                },
                drawElementCallback = (r, i, _, __) =>
                {
-                    EditorGUI.LabelField(new Rect(r.x, r.y, r.width, r.height - 2), GUIContent.none, EditorStyles.textArea);
+                    EditorGUI.LabelField(new Rect(r.x, r.y, r.width, r.height - 2), GUIContent.none,
+                        EditorStyles.textArea);
                    var labelWidth = EditorGUIUtility.labelWidth;
                    EditorGUIUtility.labelWidth = 80;
-                    EditorGUI.PropertyField(new Rect(r.x + 2, r.y + 3, r.width - 4, r.height - 4), items.GetArrayElementAtIndex(i), true);
+                    EditorGUI.PropertyField(new Rect(r.x + 2, r.y + 3, r.width - 4, r.height - 4),
+                        items.GetArrayElementAtIndex(i), true);
                    EditorGUIUtility.labelWidth = labelWidth;
                },
-                elementHeightCallback = i => EditorGUI.GetPropertyHeight(items.GetArrayElementAtIndex(i)) + 6,
+                elementHeightCallback = i => EditorGUI.GetPropertyHeight(items.GetArrayElementAtIndex(i)) + 6
            };
        }

@@ -38,7 +44,7 @@ namespace Coffee.NanoMonitor
        {
            base.OnInspectorGUI();

-            m_MonitorItemList.DoLayoutList();
+            _monitorItemList.DoLayoutList();
            serializedObject.ApplyModifiedProperties();
        }
    }
@@ -52,38 +58,50 @@ namespace Coffee.NanoMonitor
        // Serialize Members.
        //################################
        // Settings
-        [Header("Settings")] [SerializeField] [Range(0.01f, 2f)]
+        [Header("Settings")]
+        [SerializeField]
+        [Range(0.01f, 2f)]
        private float m_Interval = 1f;

-        [SerializeField] [Range(0, 3)] private int m_Precision = 2;
-        [SerializeField] private Font m_Font;
+        [SerializeField]
+        [Range(0, 3)]
+        private int m_Precision = 2;
+
+        [SerializeField]
+        private Font m_Font;

        // Foldout
-        [Header("Foldout")] [SerializeField] private bool m_Opened = false;
+        [Header("Foldout")]
+        [SerializeField]
+        private bool m_Opened;

-        [FormerlySerializedAs("m_Collapse")] [SerializeField]
-        private GameObject m_FoldoutObject = null;
+        [FormerlySerializedAs("m_Collapse")]
+        [SerializeField]
+        private GameObject m_FoldoutObject;

-        [SerializeField] private Button m_OpenButton = null;
-        [SerializeField] private Button m_CloseButton = null;
+        [SerializeField]
+        private Button m_OpenButton;
+
+        [SerializeField]
+        private Button m_CloseButton;

        // View
-        [Header("View")] [SerializeField] private MonitorUI m_Fps = null;
-        [SerializeField] private MonitorUI m_Gc = null;
-        [SerializeField] private MonitorUI m_MonoUsage = null;
-        [SerializeField] private MonitorUI m_UnityUsage = null;
+        [Header("View")]
+        [SerializeField]
+        private MonitorUI m_Fps;

-        [HideInInspector] [SerializeField] private CustomMonitorItem[] m_CustomMonitorItems = new CustomMonitorItem[0];
+        [SerializeField]
+        private MonitorUI m_Gc;

+        [SerializeField]
+        private MonitorUI m_MonoUsage;

-        //################################
-        // Public Members.
-        //################################
-        public void Clean()
-        {
-            Resources.UnloadUnusedAssets();
-            GC.Collect();
-        }
+        [SerializeField]
+        private MonitorUI m_UnityUsage;
+
+        [HideInInspector]
+        [SerializeField]
+        private CustomMonitorItem[] m_CustomMonitorItems = new CustomMonitorItem[0];


        //################################
@@ -93,44 +111,75 @@ namespace Coffee.NanoMonitor
        private double _fpsElapsed;
        private int _frames;

-        private void Open()
+        private void Update()
        {
+            _frames++;
+            _elapsed += Time.unscaledDeltaTime;
+            _fpsElapsed += Time.unscaledDeltaTime;
+            if (_elapsed < m_Interval) return;
+
+            if (m_Fps)
+            {
+                m_Fps.SetText("FPS: {0}", (int)(_frames / _fpsElapsed));
+            }
+
+            if (m_Gc)
+            {
+                m_Gc.SetText("GC: {0}", GC.CollectionCount(0));
+            }
+
+            if (m_MonoUsage)
+            {
+                var monoUsed = (Profiler.GetMonoUsedSizeLong() >> 10) / 1024f;
+                var monoTotal = (Profiler.GetMonoHeapSizeLong() >> 10) / 1024f;
+                if (m_Precision == 3)
+                {
+                    m_MonoUsage.SetText("Mono: {0:N3}/{1:N3}MB", monoUsed, monoTotal);
+                }
+                else if (m_Precision == 2)
+                {
+                    m_MonoUsage.SetText("Mono: {0:N2}/{1:N2}MB", monoUsed, monoTotal);
+                }
+                else if (m_Precision == 1)
+                {
+                    m_MonoUsage.SetText("Mono: {0:N1}/{1:N1}MB", monoUsed, monoTotal);
+                }
+                else
+                {
+                    m_MonoUsage.SetText("Mono: {0:N0}/{1:N0}MB", monoUsed, monoTotal);
+                }
+            }
+
+            if (m_UnityUsage)
+            {
+                var unityUsed = (Profiler.GetTotalAllocatedMemoryLong() >> 10) / 1024f;
+                var unityTotal = (Profiler.GetTotalReservedMemoryLong() >> 10) / 1024f;
+                if (m_Precision == 3)
+                {
+                    m_UnityUsage.SetText("Unity: {0:N3}/{1:N3}MB", unityUsed, unityTotal);
+                }
+                else if (m_Precision == 2)
+                {
+                    m_UnityUsage.SetText("Unity: {0:N2}/{1:N2}MB", unityUsed, unityTotal);
+                }
+                else if (m_Precision == 1)
+                {
+                    m_UnityUsage.SetText("Unity: {0:N1}/{1:N1}MB", unityUsed, unityTotal);
+                }
+                else
+                {
+                    m_UnityUsage.SetText("Unity: {0:N0}/{1:N0}MB", unityUsed, unityTotal);
+                }
+            }
+
+            foreach (var item in m_CustomMonitorItems)
+            {
+                item.UpdateText();
+            }
+
            _frames = 0;
-            _elapsed = m_Interval;
+            _elapsed %= m_Interval;
            _fpsElapsed = 0;
-
-            if (m_FoldoutObject)
-            {
-                m_FoldoutObject.SetActive(true);
-            }
-
-            if (m_CloseButton)
-            {
-                m_CloseButton.gameObject.SetActive(true);
-            }
-
-            if (m_OpenButton)
-            {
-                m_OpenButton.gameObject.SetActive(false);
-            }
-        }
-
-        private void Close()
-        {
-            if (m_FoldoutObject)
-            {
-                m_FoldoutObject.SetActive(false);
-            }
-
-            if (m_CloseButton)
-            {
-                m_CloseButton.gameObject.SetActive(false);
-            }
-
-            if (m_OpenButton)
-            {
-                m_OpenButton.gameObject.SetActive(true);
-            }
        }


@@ -172,77 +221,6 @@ namespace Coffee.NanoMonitor
            }
        }

-        private void Update()
-        {
-            _frames++;
-            _elapsed += Time.unscaledDeltaTime;
-            _fpsElapsed += Time.unscaledDeltaTime;
-            if (_elapsed < m_Interval) return;
-
-            if (m_Fps)
-            {
-                m_Fps.SetText("FPS: {0}", (int) (_frames / _fpsElapsed));
-            }
-
-            if (m_Gc)
-            {
-                m_Gc.SetText("GC: {0}", GC.CollectionCount(0));
-            }
-
-            if (m_MonoUsage)
-            {
-                var monoUsed = (UnityEngine.Profiling.Profiler.GetMonoUsedSizeLong() >> 10) / 1024f;
-                var monoTotal = (UnityEngine.Profiling.Profiler.GetMonoHeapSizeLong() >> 10) / 1024f;
-                if (m_Precision == 3)
-                {
-                    m_MonoUsage.SetText("Mono: {0:N3}/{1:N3}MB", monoUsed, monoTotal);
-                }
-                else if (m_Precision == 2)
-                {
-                    m_MonoUsage.SetText("Mono: {0:N2}/{1:N2}MB", monoUsed, monoTotal);
-                }
-                else if (m_Precision == 1)
-                {
-                    m_MonoUsage.SetText("Mono: {0:N1}/{1:N1}MB", monoUsed, monoTotal);
-                }
-                else
-                {
-                    m_MonoUsage.SetText("Mono: {0:N0}/{1:N0}MB", monoUsed, monoTotal);
-                }
-            }
-
-            if (m_UnityUsage)
-            {
-                var unityUsed = (UnityEngine.Profiling.Profiler.GetTotalAllocatedMemoryLong() >> 10) / 1024f;
-                var unityTotal = (UnityEngine.Profiling.Profiler.GetTotalReservedMemoryLong() >> 10) / 1024f;
-                if (m_Precision == 3)
-                {
-                    m_UnityUsage.SetText("Unity: {0:N3}/{1:N3}MB", unityUsed, unityTotal);
-                }
-                else if (m_Precision == 2)
-                {
-                    m_UnityUsage.SetText("Unity: {0:N2}/{1:N2}MB", unityUsed, unityTotal);
-                }
-                else if (m_Precision == 1)
-                {
-                    m_UnityUsage.SetText("Unity: {0:N1}/{1:N1}MB", unityUsed, unityTotal);
-                }
-                else
-                {
-                    m_UnityUsage.SetText("Unity: {0:N0}/{1:N0}MB", unityUsed, unityTotal);
-                }
-            }
-
-            foreach (var item in m_CustomMonitorItems)
-            {
-                item.UpdateText();
-            }
-
-            _frames = 0;
-            _elapsed %= m_Interval;
-            _fpsElapsed = 0;
-        }
-
 #if UNITY_EDITOR
        private void OnValidate()
        {
@@ -264,5 +242,55 @@ namespace Coffee.NanoMonitor
            }
        }
 #endif
+
+
+        //################################
+        // Public Members.
+        //################################
+        public void Clean()
+        {
+            Resources.UnloadUnusedAssets();
+            GC.Collect();
+        }
+
+        private void Open()
+        {
+            _frames = 0;
+            _elapsed = m_Interval;
+            _fpsElapsed = 0;
+
+            if (m_FoldoutObject)
+            {
+                m_FoldoutObject.SetActive(true);
+            }
+
+            if (m_CloseButton)
+            {
+                m_CloseButton.gameObject.SetActive(true);
+            }
+
+            if (m_OpenButton)
+            {
+                m_OpenButton.gameObject.SetActive(false);
+            }
+        }
+
+        private void Close()
+        {
+            if (m_FoldoutObject)
+            {
+                m_FoldoutObject.SetActive(false);
+            }
+
+            if (m_CloseButton)
+            {
+                m_CloseButton.gameObject.SetActive(false);
+            }
+
+            if (m_OpenButton)
+            {
+                m_OpenButton.gameObject.SetActive(true);
+            }
+        }
    }
 }