From d630da17ebed6b734659ef0a695a1384c71557a0 Mon Sep 17 00:00:00 2001
From: NaoyaKohda <naoya.kohda@gmail.com>
Date: Fri, 3 Jan 2025 19:27:42 +0900
Subject: [PATCH 1/6] =?UTF-8?q?OnEnable=20=E3=81=AE=E5=A0=B4=E5=90=88?=
 =?UTF-8?q?=E3=81=AE=E3=81=BF=20SerializedProperty=20=E3=81=AB=E3=82=BB?=
 =?UTF-8?q?=E3=83=83=E3=83=88=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DmxRecorder/RecorderSettingsEditor.cs     | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/Assets/ArtNet/Editor/DmxRecorder/RecorderSettingsEditor.cs b/Assets/ArtNet/Editor/DmxRecorder/RecorderSettingsEditor.cs
index 5b7a748..3cf73a6 100644
--- a/Assets/ArtNet/Editor/DmxRecorder/RecorderSettingsEditor.cs
+++ b/Assets/ArtNet/Editor/DmxRecorder/RecorderSettingsEditor.cs
@@ -14,6 +14,16 @@ private static class Styles
         }
 
         internal event Action OnRecorderValidated;
+        private SerializedProperty _universeFilter, _fileGenerator, _take;
+
+        public void OnEnable()
+        {
+            if (target == null) return;
+
+            _universeFilter = serializedObject.FindProperty("_universeFilter");
+            _fileGenerator = serializedObject.FindProperty("_fileGenerator");
+            _take = serializedObject.FindProperty("_take");
+        }
 
         public override void OnInspectorGUI()
         {
@@ -26,17 +36,14 @@ public override void OnInspectorGUI()
             DrawHeader("Output File");
             EditorGUILayout.Separator();
 
-            var universeFilter = serializedObject.FindProperty("_universeFilter");
-            EditorGUILayout.PropertyField(universeFilter, GUIContent.none);
+            EditorGUILayout.PropertyField(_universeFilter, GUIContent.none);
             EditorGUILayout.Space();
 
-            var fileNameGenerator = serializedObject.FindProperty("_fileGenerator");
-            EditorGUILayout.PropertyField(fileNameGenerator, GUIContent.none);
+            EditorGUILayout.PropertyField(_fileGenerator, GUIContent.none);
 
             EditorGUILayout.Space();
 
-            var take = serializedObject.FindProperty("_take");
-            EditorGUILayout.PropertyField(take, Styles.TakeNumberLabel);
+            EditorGUILayout.PropertyField(_take, Styles.TakeNumberLabel);
 
             EditorGUILayout.Separator();
 

From cd0071500e12ab5f4fb0bf0573dd5b0bc435e6e8 Mon Sep 17 00:00:00 2001
From: NaoyaKohda <naoya.kohda@gmail.com>
Date: Tue, 7 Jan 2025 07:40:46 +0900
Subject: [PATCH 2/6] =?UTF-8?q?EnteredEditMode=20=E3=81=AB=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4=E6=99=82=E3=82=82=20Setting=20=E3=82=92=E3=83=AA?=
 =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=83=89=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Editor/DmxRecorder/RecorderWindow.cs      | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/Assets/ArtNet/Editor/DmxRecorder/RecorderWindow.cs b/Assets/ArtNet/Editor/DmxRecorder/RecorderWindow.cs
index 41b8b32..9cbd988 100644
--- a/Assets/ArtNet/Editor/DmxRecorder/RecorderWindow.cs
+++ b/Assets/ArtNet/Editor/DmxRecorder/RecorderWindow.cs
@@ -57,17 +57,21 @@ private void OnEnable()
 
         private void OnDisable()
         {
-            Undo.undoRedoPerformed -= OnUndoRedoPerformed;
+            UnregisterCallbacks();
         }
 
-        private void Update()
+        private void RegisterCallbacks()
         {
-            if (IsRecording) _timeCode.text = TimeCodeText(_controller.GetRecordingTime());
+            Undo.undoRedoPerformed += OnUndoRedoPerformed;
+            EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
+            EditorApplication.update += OnUpdate;
         }
 
-        private void RegisterCallbacks()
+        private void UnregisterCallbacks()
         {
-            Undo.undoRedoPerformed += OnUndoRedoPerformed;
+            Undo.undoRedoPerformed -= OnUndoRedoPerformed;
+            EditorApplication.playModeStateChanged -= OnPlayModeStateChanged;
+            EditorApplication.update -= OnUpdate;
         }
 
         private void OnUndoRedoPerformed()
@@ -76,6 +80,21 @@ private void OnUndoRedoPerformed()
             SaveAndRepaint();
         }
 
+        private void OnPlayModeStateChanged(PlayModeStateChange state)
+        {
+            if (state == PlayModeStateChange.EnteredEditMode)
+            {
+                SetRecordControllerSettings(RecordControllerSettings.GetOrNewGlobalSettings());
+                ReloadRecorderSettings();
+                Repaint();
+            }
+        }
+
+        private void OnUpdate()
+        {
+            if (IsRecording) _timeCode.text = TimeCodeText(_controller.GetRecordingTime());
+        }
+
         private void ReloadRecorderSettings()
         {
             if (_controllerSettings == null)

From 47a7fef2c9854c73d8dc6ec3d84703afb76379ca Mon Sep 17 00:00:00 2001
From: NaoyaKohda <naoya.kohda@gmail.com>
Date: Fri, 10 Jan 2025 01:07:58 +0900
Subject: [PATCH 3/6] =?UTF-8?q?Recording=20=E4=B8=AD=E3=81=AF=20setting=20?=
 =?UTF-8?q?=E3=82=92=E5=A4=89=E6=9B=B4=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Editor/DmxRecorder/RecorderWindow.cs       | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/Assets/ArtNet/Editor/DmxRecorder/RecorderWindow.cs b/Assets/ArtNet/Editor/DmxRecorder/RecorderWindow.cs
index 9cbd988..87ae7e1 100644
--- a/Assets/ArtNet/Editor/DmxRecorder/RecorderWindow.cs
+++ b/Assets/ArtNet/Editor/DmxRecorder/RecorderWindow.cs
@@ -27,6 +27,7 @@ private class RecorderList : ElementItemList<RecorderItem> { }
 
         private static IEnumerable<Type> _cachedRecorderTypes;
 
+        private VisualElement _addNewRecordPanel, _recorderSettingsPanel;
         private RecorderList _recorderList;
         private RecorderItem _selectedRecorderItem;
 
@@ -161,8 +162,8 @@ private void CreateView()
             // RecordersPanel の作成
             var recordersPanel = visualElement.Q<VisualElement>("recordersPanel");
 
-            var addRecorderLabel = visualElement.Q<Label>("addRecorderLabel");
-            addRecorderLabel.RegisterCallback<ClickEvent>(_ => ShowRecorderContextMenu());
+            _addNewRecordPanel = visualElement.Q<Label>("addRecorderLabel");
+            _addNewRecordPanel.RegisterCallback<ClickEvent>(_ => ShowRecorderContextMenu());
             _recorderList = new RecorderList
             {
                 name = "recorderList",
@@ -175,10 +176,11 @@ private void CreateView()
             _recorderList.OnContextMenu += ShowRecorderContextMenu;
             recordersPanel.Add(_recorderList);
 
-            var recorderSettingsPanel = visualElement.Q<VisualElement>("recorderSettingsPanel");
-            recorderSettingsPanel.Add(new IMGUIContainer(RecorderSettingsGUI));
+            _recorderSettingsPanel = visualElement.Q<VisualElement>("recorderSettingsPanel");
+            _recorderSettingsPanel.Add(new IMGUIContainer(RecorderSettingsGUI));
 
             SetRecordControllerSettings(RecordControllerSettings.GetOrNewGlobalSettings());
+            SetEnabledControl(true);
         }
 
         private bool DisableEditRecordSettings()
@@ -404,6 +406,7 @@ private void OnStartRecording()
             _playButton.Clear();
             _playButton.Add(new Image { image = IconHelper.PauseButton });
             _stopButton.SetEnabled(true);
+            SetEnabledControl(false);
         }
 
         private void OnPauseRecording()
@@ -422,6 +425,13 @@ private void OnFinishRecording()
             _playButton.Add(new Image { image = IconHelper.PlayButton });
             _stopButton.SetEnabled(false);
             _timeCode.text = TimeCodeText(_controller.GetRecordingTime());
+            SetEnabledControl(true);
+        }
+
+        private void SetEnabledControl(bool enabled)
+        {
+            _addNewRecordPanel.SetEnabled(enabled);
+            _recorderSettingsPanel.SetEnabled(enabled);
         }
 
         private static string TimeCodeText(int time)

From 2f7b1a0ee63a061a22e388713dfb1d454a3e24ca Mon Sep 17 00:00:00 2001
From: NaoyaKohda <naoya.kohda@gmail.com>
Date: Fri, 10 Jan 2025 01:38:02 +0900
Subject: [PATCH 4/6] =?UTF-8?q?setting=20=E3=81=AB=20error=20=E3=81=AE?=
 =?UTF-8?q?=E8=A6=81=E7=B4=A0=E3=81=8C=E3=81=82=E3=82=8C=E3=81=B0=20record?=
 =?UTF-8?q?ing=20=E9=96=8B=E5=A7=8B=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Editor/DmxRecorder/RecorderWindow.cs      | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/Assets/ArtNet/Editor/DmxRecorder/RecorderWindow.cs b/Assets/ArtNet/Editor/DmxRecorder/RecorderWindow.cs
index 87ae7e1..43ce258 100644
--- a/Assets/ArtNet/Editor/DmxRecorder/RecorderWindow.cs
+++ b/Assets/ArtNet/Editor/DmxRecorder/RecorderWindow.cs
@@ -94,6 +94,22 @@ private void OnPlayModeStateChanged(PlayModeStateChange state)
         private void OnUpdate()
         {
             if (IsRecording) _timeCode.text = TimeCodeText(_controller.GetRecordingTime());
+
+            var recordButtonsEnabled = true;
+            if (_controller == null)
+            {
+                recordButtonsEnabled = false;
+            }
+            else
+            {
+                var recorderSettings = _controller.Settings.RecorderSettings;
+                if (recorderSettings.All(x => !x.Enabled) || recorderSettings.Any(x => x.HasErrors()))
+                {
+                    recordButtonsEnabled = false;
+                }
+            }
+
+            SetRecordButtonEnabled(recordButtonsEnabled);
         }
 
         private void ReloadRecorderSettings()
@@ -180,7 +196,7 @@ private void CreateView()
             _recorderSettingsPanel.Add(new IMGUIContainer(RecorderSettingsGUI));
 
             SetRecordControllerSettings(RecordControllerSettings.GetOrNewGlobalSettings());
-            SetEnabledControl(true);
+            SetSettingPanelEnabled(!DisableEditRecordSettings());
         }
 
         private bool DisableEditRecordSettings()
@@ -262,11 +278,12 @@ private void RecorderSettingsGUI()
         private void ShowRecorderContextMenu()
         {
             var menu = new GenericMenu();
+            var isDisabled = DisableEditRecordSettings();
 
             foreach (var type in _cachedRecorderTypes)
             {
                 var context = new GUIContent(type.Name);
-                if (DisableEditRecordSettings())
+                if (isDisabled)
                 {
                     menu.AddDisabledItem(context);
                 }
@@ -406,7 +423,7 @@ private void OnStartRecording()
             _playButton.Clear();
             _playButton.Add(new Image { image = IconHelper.PauseButton });
             _stopButton.SetEnabled(true);
-            SetEnabledControl(false);
+            SetSettingPanelEnabled(false);
         }
 
         private void OnPauseRecording()
@@ -425,10 +442,15 @@ private void OnFinishRecording()
             _playButton.Add(new Image { image = IconHelper.PlayButton });
             _stopButton.SetEnabled(false);
             _timeCode.text = TimeCodeText(_controller.GetRecordingTime());
-            SetEnabledControl(true);
+            SetSettingPanelEnabled(true);
+        }
+
+        private void SetRecordButtonEnabled(bool enabled)
+        {
+            _playButton.SetEnabled(enabled);
         }
 
-        private void SetEnabledControl(bool enabled)
+        private void SetSettingPanelEnabled(bool enabled)
         {
             _addNewRecordPanel.SetEnabled(enabled);
             _recorderSettingsPanel.SetEnabled(enabled);

From 09760e19462137f807645b004956e06d66a92f29 Mon Sep 17 00:00:00 2001
From: NaoyaKohda <naoya.kohda@gmail.com>
Date: Fri, 10 Jan 2025 01:42:19 +0900
Subject: [PATCH 5/6] =?UTF-8?q?=5FcontrollerSettings=20=E3=81=AE=E3=83=A1?=
 =?UTF-8?q?=E3=83=B3=E3=83=90=E5=A4=89=E6=95=B0=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Editor/DmxRecorder/RecorderWindow.cs      | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/Assets/ArtNet/Editor/DmxRecorder/RecorderWindow.cs b/Assets/ArtNet/Editor/DmxRecorder/RecorderWindow.cs
index 43ce258..3061698 100644
--- a/Assets/ArtNet/Editor/DmxRecorder/RecorderWindow.cs
+++ b/Assets/ArtNet/Editor/DmxRecorder/RecorderWindow.cs
@@ -32,7 +32,6 @@ private class RecorderList : ElementItemList<RecorderItem> { }
         private RecorderItem _selectedRecorderItem;
 
         private RecordController _controller;
-        private RecordControllerSettings _controllerSettings;
 
         private Label _timeCode;
         private Button _playButton, _stopButton;
@@ -114,10 +113,10 @@ private void OnUpdate()
 
         private void ReloadRecorderSettings()
         {
-            if (_controllerSettings == null)
+            if (_controller?.Settings == null)
                 return;
 
-            var recorderItems = _controllerSettings.RecorderSettings.Select(CreateRecorderItem).ToArray();
+            var recorderItems = _controller.Settings.RecorderSettings.Select(CreateRecorderItem).ToArray();
             foreach (var recorderItem in recorderItems)
                 recorderItem.UpdateState();
 
@@ -126,8 +125,8 @@ private void ReloadRecorderSettings()
 
         private void SaveAndRepaint()
         {
-            if (_controllerSettings != null)
-                _controllerSettings.Save();
+            if (_controller.Settings != null)
+                _controller.Settings.Save();
 
             Repaint();
         }
@@ -206,7 +205,6 @@ private bool DisableEditRecordSettings()
 
         private void SetRecordControllerSettings(RecordControllerSettings settings)
         {
-            _controllerSettings = settings;
             _controller = new RecordController(settings);
             _controller.OnStartRecording += OnStartRecording;
             _controller.OnPauseRecording += OnPauseRecording;
@@ -263,7 +261,7 @@ private void RecorderSettingsGUI()
                         if (EditorGUI.EndChangeCheck() || EditorUtility.IsDirty(_selectedRecorderItem.Settings))
                         {
                             // data changed
-                            _controllerSettings.Save();
+                            _controller.Settings.Save();
                             _selectedRecorderItem.UpdateState();
                         }
                     }
@@ -325,7 +323,7 @@ private void OnRecorderContextMenu(RecorderItem recorder)
 
         private RecorderItem CreateRecorderItem(RecorderSettings recorderSettings)
         {
-            var recorderItem = new RecorderItem(_controllerSettings, recorderSettings);
+            var recorderItem = new RecorderItem(_controller.Settings, recorderSettings);
             recorderItem.OnEnableStateChanged += enabled =>
             {
                 if (enabled)
@@ -352,7 +350,7 @@ private void AddRecorder(RecorderSettings recorder, string recorderName, bool en
         {
             recorder.name = UniqueRecorderName(recorderName);
             recorder.Enabled = enabled;
-            _controllerSettings.AddRecorderSettings(recorder);
+            _controller.Settings.AddRecorderSettings(recorder);
 
             var item = CreateRecorderItem(recorder);
             _recorderList.Add(item);
@@ -370,7 +368,7 @@ private void DuplicateRecorder(RecorderItem item)
         private void DeleteRecorder(RecorderItem item)
         {
             var settings = item.Settings;
-            _controllerSettings.RemoveRecorderSettings(settings);
+            _controller.Settings.RemoveRecorderSettings(settings);
             _recorderList.Remove(item);
         }
 
@@ -382,7 +380,7 @@ private void OnAddNewRecorder(Type type)
 
         private string UniqueRecorderName(string recorderName)
         {
-            var existingNames = _controllerSettings.RecorderSettings.Select(settings => settings.name).ToArray();
+            var existingNames = _controller.Settings.RecorderSettings.Select(settings => settings.name).ToArray();
             return ObjectNames.GetUniqueName(existingNames, recorderName);
         }
 

From abc06a5bdc43f34e4346333ee5c92d6f380e559e Mon Sep 17 00:00:00 2001
From: NaoyaKohda <naoya.kohda@gmail.com>
Date: Fri, 10 Jan 2025 02:07:31 +0900
Subject: [PATCH 6/6] =?UTF-8?q?=E9=8C=B2=E7=94=BB=E9=96=8B=E5=A7=8B?=
 =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AB=20tooltip=20=E3=82=92?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Editor/DmxRecorder/RecorderWindow.cs      | 52 ++++++++++++-------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/Assets/ArtNet/Editor/DmxRecorder/RecorderWindow.cs b/Assets/ArtNet/Editor/DmxRecorder/RecorderWindow.cs
index 3061698..85e1cb5 100644
--- a/Assets/ArtNet/Editor/DmxRecorder/RecorderWindow.cs
+++ b/Assets/ArtNet/Editor/DmxRecorder/RecorderWindow.cs
@@ -92,23 +92,37 @@ private void OnPlayModeStateChanged(PlayModeStateChange state)
 
         private void OnUpdate()
         {
-            if (IsRecording) _timeCode.text = TimeCodeText(_controller.GetRecordingTime());
+            switch (_controller.Status)
+            {
+                case RecordingStatus.Recording:
+                    _timeCode.text = TimeCodeText(_controller.GetRecordingTime());
+                    break;
+                case RecordingStatus.Paused:
+                    break;
+                case RecordingStatus.None:
+                    OnUpdateRecordButton();
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+        }
 
-            var recordButtonsEnabled = true;
-            if (_controller == null)
+        private void OnUpdateRecordButton()
+        {
+            var recorderSettings = _controller.Settings.RecorderSettings;
+            if (recorderSettings.All(x => !x.Enabled))
             {
-                recordButtonsEnabled = false;
+                SetRecordButtonEnabled(false, "No recorders enabled");
+                return;
             }
-            else
+
+            if (recorderSettings.Any(x => x.Enabled && x.HasErrors()))
             {
-                var recorderSettings = _controller.Settings.RecorderSettings;
-                if (recorderSettings.All(x => !x.Enabled) || recorderSettings.Any(x => x.HasErrors()))
-                {
-                    recordButtonsEnabled = false;
-                }
+                SetRecordButtonEnabled(false, "Some recorders have errors");
+                return;
             }
 
-            SetRecordButtonEnabled(recordButtonsEnabled);
+            SetRecordButtonEnabled(true);
         }
 
         private void ReloadRecorderSettings()
@@ -167,11 +181,11 @@ private void CreateView()
 
             _playButton = visualElement.Q<Button>("playButton");
             _playButton.clicked += OnPlayButtonClicked;
-            _playButton.Add(new Image { image = IconHelper.PlayButton });
+            _playButton.style.backgroundImage = (StyleBackground) IconHelper.PlayButton;
 
             _stopButton = visualElement.Q<Button>("stopButton");
             _stopButton.clicked += OnStopButtonClicked;
-            _stopButton.Add(new Image { image = IconHelper.PreMatQuad });
+            _stopButton.style.backgroundImage = (StyleBackground) IconHelper.PreMatQuad;
             _stopButton.SetEnabled(false);
 
             // RecordersPanel の作成
@@ -418,8 +432,7 @@ private void OnStartRecording()
         {
             _timeCode.ClearClassList();
             _timeCode.AddToClassList("recording");
-            _playButton.Clear();
-            _playButton.Add(new Image { image = IconHelper.PauseButton });
+            _playButton.style.backgroundImage = (StyleBackground) IconHelper.PauseButton;
             _stopButton.SetEnabled(true);
             SetSettingPanelEnabled(false);
         }
@@ -428,24 +441,23 @@ private void OnPauseRecording()
         {
             _timeCode.ClearClassList();
             _timeCode.AddToClassList("paused");
-            _playButton.Clear();
-            _playButton.Add(new Image { image = IconHelper.PlayButton });
+            _playButton.style.backgroundImage = (StyleBackground) IconHelper.PlayButton;
             _stopButton.SetEnabled(true);
         }
 
         private void OnFinishRecording()
         {
             _timeCode.ClearClassList();
-            _playButton.Clear();
-            _playButton.Add(new Image { image = IconHelper.PlayButton });
+            _playButton.style.backgroundImage = (StyleBackground) IconHelper.PlayButton;
             _stopButton.SetEnabled(false);
             _timeCode.text = TimeCodeText(_controller.GetRecordingTime());
             SetSettingPanelEnabled(true);
         }
 
-        private void SetRecordButtonEnabled(bool enabled)
+        private void SetRecordButtonEnabled(bool enabled, string tooltip = null)
         {
             _playButton.SetEnabled(enabled);
+            _playButton.tooltip = tooltip;
         }
 
         private void SetSettingPanelEnabled(bool enabled)