Merge pull request #34 from nasshu2916/feature/imp-recorder-window

Record 処理周りリファクタ

Author: nasshu2916

Assets/ArtNet/Editor/DmxRecorder/AnimationRecorderSettings.cs

@@ -1,3 +1,6 @@
+using System.Collections.Generic;
+using ArtNet.Editor.DmxRecorder.IO;
+using ArtNet.Editor.DmxRecorder.Util;
 using UnityEngine;
 
 namespace ArtNet.Editor.DmxRecorder
@@ -7,5 +10,13 @@ public class AnimationRecorderSettings : RecorderSettings
         protected internal override string Extension => "anim";
         internal override string DefaultName => "Animation";
         protected internal override Texture Icon => IconHelper.Icon("Animation Icon", true);
+
+        public override void StoreUniverseData(IEnumerable<UniverseData> universeData)
+        {
+            FileGenerator.CreateDirectory();
+            var path = OutputAssetPath;
+
+            AnimationClipDmx.Export(universeData, path);
+        }
     }
 }

Assets/ArtNet/Editor/DmxRecorder/BinaryRecorderSettings.cs

@@ -1,3 +1,6 @@
+using System.Collections.Generic;
+using ArtNet.Editor.DmxRecorder.IO;
+using ArtNet.Editor.DmxRecorder.Util;
 using UnityEngine;
 
 namespace ArtNet.Editor.DmxRecorder
@@ -7,5 +10,13 @@ public class BinaryRecorderSettings : RecorderSettings
         protected internal override string Extension => "dmx";
         internal override string DefaultName => "Binary";
         protected internal override Texture Icon => IconHelper.Icon("DefaultAsset Icon", true);
+
+        public override void StoreUniverseData(IEnumerable<UniverseData> universeData)
+        {
+            FileGenerator.CreateDirectory();
+            var path = OutputAbsolutePath;
+
+            BinaryDmx.Export(universeData, path);
+        }
     }
 }

Assets/ArtNet/Editor/DmxRecorder/ConvertAnimInspector.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using ArtNet.Editor.DmxRecorder.IO;
 using ArtNet.Packets;
 using UnityEditor;
 using UnityEngine;
@@ -50,10 +51,10 @@ private static void ConvertAnim(ConvertAnim convertAnim)
             }
 
             var bytes = binary.bytes;
-            var universeData = RecordData.Deserialize(bytes);
+            var universeData = BinaryDmx.Deserialize(bytes);
 
-            TimelineConverter timelineConverter = new(universeData);
-            timelineConverter.SaveDmxTimelineClips(convertAnim.OutputDirectory + "/ArtNetDmx.anim");
+            var output = convertAnim.OutputDirectory + "/ArtNetDmx.anim";
+            AnimationClipDmx.Export(universeData, output);
 
             Debug.Log("Conversion complete");
         }
@@ -103,12 +104,13 @@ private static void ConvertPacket(ConvertAnim convertAnim)
                 }
             }
 
-            var storeData = RecordData.SerializePackets(dmxPackets);
-
+            var dmxUniverseData = dmxPackets.Select(packet =>
+                new UniverseData(packet.Item1 / 1000f, packet.Item2.Universe, packet.Item2.Dmx)).ToList();
 
             var path = convertAnim.OutputDirectory + "/DmxPackets.bytes";
             var exists = File.Exists(path);
-            File.WriteAllBytes(path, storeData);
+            BinaryDmx.Export(dmxUniverseData, path);
+
             var message = exists ? "Data updated" : "Data stored";
             Debug.Log($"ArtNet Recorder: {message} at {path}");
             Debug.Log("Conversion complete");

Assets/ArtNet/Editor/DmxRecorder/EditableLabel.cs

@@ -11,6 +11,7 @@ public class EditableLabel : VisualElement
         private readonly TextField _textField;
 
         private bool _isEditing;
+        private bool _isEditable = true;
 
         public Action<string> OnValueChanged;
         private Focusable _previouslyFocused;
@@ -37,6 +38,11 @@ internal void SetLabelEnabled(bool value)
             _label.SetEnabled(value);
         }
 
+        internal void SetEditable(bool value)
+        {
+            _isEditable = value;
+        }
+
         private void SetValueAndNotify(string newValue)
         {
             if (EqualityComparer<string>.Default.Equals(_label.text, newValue))
@@ -51,8 +57,7 @@ private void SetValueAndNotify(string newValue)
 
         internal void StartEditing()
         {
-            if (_isEditing)
-                return;
+            if (_isEditing || !_isEditable) return;
 
             _isEditing = true;
             _textField.value = _label.text;
@@ -64,8 +69,7 @@ internal void StartEditing()
 
         private void ApplyEditing()
         {
-            if (!_isEditing)
-                return;
+            if (!_isEditing) return;
 
             SetValueAndNotify(_textField.text);
 
@@ -76,8 +80,7 @@ private void ApplyEditing()
 
         private void CancelEditing()
         {
-            if (!_isEditing)
-                return;
+            if (!_isEditing) return;
 
             _isEditing = false;
             Remove(_textField);

Assets/ArtNet/Editor/DmxRecorder/FileGeneratorDrawer.cs

@@ -1,4 +1,5 @@
 using System.IO;
+using ArtNet.Editor.DmxRecorder.Util;
 using UnityEditor;
 using UnityEngine;
 

Assets/ArtNet/Editor/DmxRecorder/IO.meta

@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace ArtNet.Editor.DmxRecorder.IO
+{
+    public static class AnimationClipDmx
+    {
+        public static void Export(IEnumerable<UniverseData> universeData, string path)
+        {
+            var clip = new UnityEngine.AnimationClip();
+
+            AssetDatabase.CreateAsset(clip, path);
+            var timelineConverter = new TimelineConverter(universeData);
+            timelineConverter.SaveToClip(clip);
+
+            AssetDatabase.SaveAssets();
+            AssetDatabase.Refresh();
+        }
+    }
+}

Assets/ArtNet/Editor/DmxRecorder/IO/AnimationClipDmx.cs

@@ -2,26 +2,24 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using ArtNet.Packets;
 using UnityEngine;
 
-namespace ArtNet.Editor.DmxRecorder
+namespace ArtNet.Editor.DmxRecorder.IO
 {
-    public static class RecordData
+    public static class BinaryDmx
     {
         private const byte IdentifierLength = 4;
         private static readonly byte[] Identifiers = { 0xFF, 0x44, 0x4D, 0x58 };
         private static readonly byte[] ReservedBuffer = new byte[11];
         private const byte Version = 0x02;
 
-        public static byte[] SerializePackets(IEnumerable<(int time, DmxPacket packet)> dmxPackets)
+        public static void Export(IEnumerable<UniverseData> universeData, string path)
         {
-            var universeData = dmxPackets.Select(packet =>
-                new UniverseData(packet.time / 1000f, packet.packet.Universe, packet.packet.Dmx));
-
-            return SerializeUniverseData(universeData);
+            var binary = SerializeUniverseData(universeData);
+            File.WriteAllBytes(path, binary);
         }
 
+
         public static byte[] SerializeUniverseData(IEnumerable<UniverseData> universeData)
         {
             var sortedData = universeData.OrderBy(x => x.Time).ToList();

Assets/ArtNet/Editor/DmxRecorder/IO/AnimationClipDmx.cs.meta

@@ -1,10 +1,9 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEditor;
 using UnityEngine;
 
-namespace ArtNet.Editor.DmxRecorder
+namespace ArtNet.Editor.DmxRecorder.IO
 {
     public class TimelineConverter
     {
@@ -52,16 +51,6 @@ public void SaveToClip(AnimationClip clip)
             }
         }
 
-        public void SaveDmxTimelineClips(string path)
-        {
-            var clip = new AnimationClip { name = "ArtNetDmx" };
-            SaveToClip(clip);
-
-            AssetDatabase.CreateAsset(clip, path);
-            AssetDatabase.SaveAssets();
-            AssetDatabase.Refresh();
-        }
-
         public List<UniverseData> ToUniverseData()
         {
             return Timelines.SelectMany(x => x.ToUniverseData()).OrderBy(x => x.Time).ToList();

Assets/ArtNet/Editor/DmxRecorder/RecordData.cs renamed to Assets/ArtNet/Editor/DmxRecorder/IO/BinaryDmx.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Net;
 using ArtNet.Enums;
@@ -19,13 +18,14 @@ public enum RecordingStatus
     public class RecordController
     {
         private readonly UdpReceiver _receiver = new(ArtNetReceiver.ArtNetPort);
-        private int _recordedTime;
 
         private List<(int, DmxPacket)> _recordedDmx = new();
 
         private long _recordStartTime;
 
         public RecordControllerSettings Settings { get; }
+        public int RecordedTime { get; private set; }
+
         public Action OnStartRecording, OnStopRecording, OnPauseRecording, OnResumeRecording;
 
         public RecordController(RecordControllerSettings settings)
@@ -47,7 +47,7 @@ public void StartRecording()
             }
 
             _recordedDmx = new List<(int, DmxPacket)>();
-            _recordedTime = 0;
+            RecordedTime = 0;
             Status = RecordingStatus.Recording;
             _recordStartTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
             _receiver.StartReceive();
@@ -64,7 +64,7 @@ public void StopRecording()
 
             var time = GetRecordingTime();
             Status = RecordingStatus.None;
-            _recordedTime = time;
+            RecordedTime = time;
 
             _receiver.StopReceive();
             StoreDmxPacket();
@@ -81,7 +81,7 @@ public void PauseRecording()
 
             var time = GetRecordingTime();
             Status = RecordingStatus.Paused;
-            _recordedTime = time;
+            RecordedTime = time;
             _recordStartTime = 0;
             OnPauseRecording?.Invoke();
         }
@@ -103,11 +103,11 @@ public int GetRecordingTime()
         {
             if (Status != RecordingStatus.Recording)
             {
-                return _recordedTime;
+                return RecordedTime;
             }
 
             var currentRecordTime = (int) (DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() - _recordStartTime);
-            return currentRecordTime + _recordedTime;
+            return currentRecordTime + RecordedTime;
         }
 
         private void OnReceivedPacket(byte[] receiveBuffer, int length, EndPoint remoteEp)
@@ -136,54 +136,12 @@ private void StoreDmxPacket()
             var recorderSettings = Settings.RecorderSettings.Where(x => x.Enabled && !x.HasErrors());
             foreach (var setting in recorderSettings)
             {
-                var recordedDmx = FilterDmxPackets(_recordedDmx, setting.UniverseFilter);
-                switch (setting)
-                {
-                    case BinaryRecorderSettings binarySettings:
-                        StoreBinary(recordedDmx, binarySettings);
-                        break;
-                    case AnimationRecorderSettings animationSettings:
-                        StoreAnimation(recordedDmx, animationSettings);
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException();
-                }
-                setting.Take++;
-            }
-        }
+                var universeData = setting.UniverseFilter.Filter(_recordedDmx, frame => frame.Item2.Universe)
+                    .Select(x => new UniverseData(x.Item1 / 1000f, x.Item2.Universe, x.Item2.Dmx));
 
-        private static List<(int, DmxPacket)> FilterDmxPackets(List<(int, DmxPacket)> recordedDmx, UniverseFilter universeFilter)
-        {
-            if (!universeFilter.Enabled) return recordedDmx;
-
-            var filteredDmx = new List<(int, DmxPacket)>();
-            foreach (var (time, packet) in recordedDmx)
-            {
-                if (universeFilter.IsMatch(packet.Universe)) continue;
-                filteredDmx.Add((time, packet));
+                setting.StoreUniverseData(universeData);
+                setting.Take++;
             }
-
-            return filteredDmx;
-        }
-
-        private static void StoreBinary(IReadOnlyList<(int time, DmxPacket packet)> recordDmx, BinaryRecorderSettings settings)
-        {
-            settings.FileGenerator.CreateDirectory();
-
-            var binary = RecordData.SerializePackets(recordDmx);
-            var path = settings.OutputAbsolutePath;
-            File.WriteAllBytes(path, binary);
-        }
-
-        private static void StoreAnimation(IReadOnlyList<(int, DmxPacket)> recordDmx, AnimationRecorderSettings settings)
-        {
-            settings.FileGenerator.CreateDirectory();
-            var path = settings.OutputAssetPath;
-
-            var universeData = recordDmx.Select(packet => new UniverseData(packet.Item1 / 1000f, packet.Item2
-                .Universe, packet.Item2.Dmx));
-            var timelineConverter = new TimelineConverter(universeData);
-            timelineConverter.SaveDmxTimelineClips(path);
         }
     }
 }

Assets/ArtNet/Editor/DmxRecorder/IO/BinaryDmx.cs.meta

@@ -1,4 +1,5 @@
 using System;
+using ArtNet.Editor.DmxRecorder.Util;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.UIElements;
@@ -192,6 +193,12 @@ private void SetItemEnabled(RecordControllerSettings recordControllerSettings, b
             OnEnableStateChanged?.Invoke(value);
         }
 
+        public void SetReadOnly(bool value)
+        {
+            _editableLabel.SetEditable(!value);
+            _toggle.SetEnabled(!value);
+        }
+
         public void StartRenaming()
         {
             _editableLabel.StartEditing();

Assets/ArtNet/Editor/DmxRecorder/TimelineConverter.cs renamed to Assets/ArtNet/Editor/DmxRecorder/IO/TimelineConverter.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using UnityEngine;
 
 namespace ArtNet.Editor.DmxRecorder
@@ -88,5 +87,7 @@ internal virtual void OnValidate()
         protected virtual void OnBeforeSerialize() { }
         protected virtual void OnAfterDeserialize() { }
         public virtual void OnAfterDuplicate() { }
+
+        public abstract void StoreUniverseData(IEnumerable<UniverseData> universeData);
     }
 }