diff --git a/Assets/ArtNet/Editor/DmxRecorder/Sender.cs b/Assets/ArtNet/Editor/DmxRecorder/Sender.cs index 89e0a08..d8c2f1c 100644 --- a/Assets/ArtNet/Editor/DmxRecorder/Sender.cs +++ b/Assets/ArtNet/Editor/DmxRecorder/Sender.cs @@ -47,17 +47,14 @@ public void Load(string path) SenderSettings.LoadFilePath = path; var data = File.ReadAllBytes(path); var universeData = RecordData.Deserialize(data).OrderBy(x => x.Time).ToList(); - byte sequence = 0; foreach (var dataPacket in universeData) { var packet = new DmxPacket { - Universe = (ushort)dataPacket.Universe, - Dmx = dataPacket.Values, - Sequence = sequence + Universe = dataPacket.Universe, + Dmx = dataPacket.Values }; DmxPackets.Add((Mathf.RoundToInt((float)(dataPacket.Time * 1000f)), packet)); - sequence = sequence == byte.MaxValue ? (byte) 0 : (byte) (sequence + 1); } MaxTime = DmxPackets.Max(x => x.time); } @@ -110,17 +107,10 @@ private void Update(int deltaTime) private void SendDmx(DmxPacket packet) { var universe = packet.Universe; - if (!SenderSettings.IsRecordSequence) - { - var sequence = _sequenceMap.GetValueOrDefault(universe, (byte) 0); - sequence = sequence == byte.MaxValue ? (byte) 0 : (byte) (sequence + 1); - packet.Sequence = sequence; - _sequenceMap[universe] = sequence; - } - else - { - _sequenceMap[universe] = packet.Sequence; - } + var sequence = _sequenceMap.GetValueOrDefault(universe, (byte) 0); + sequence = sequence == byte.MaxValue ? (byte) 0 : (byte) (sequence + 1); + packet.Sequence = sequence; + _sequenceMap[universe] = sequence; var data = packet.ToByteArray(); _udpSender.Send(data, SenderSettings.Ip); diff --git a/Assets/ArtNet/Editor/DmxRecorder/SenderSettings.cs b/Assets/ArtNet/Editor/DmxRecorder/SenderSettings.cs index 5adaf3f..a17f5db 100644 --- a/Assets/ArtNet/Editor/DmxRecorder/SenderSettings.cs +++ b/Assets/ArtNet/Editor/DmxRecorder/SenderSettings.cs @@ -19,7 +19,6 @@ public class SenderSettings : ScriptableObject public string LoadFilePath { get => _loadFilePath; set => _loadFilePath = value; } public IPAddress Ip { get => IPAddress.Parse(_ip); set => _ip = value.ToString(); } public bool IsLoop { get => _isLoop; set => _isLoop = value; } - public bool IsRecordSequence { get => _isRecordSequence; set => _isRecordSequence = value; } public float Speed { get => _speed; set => _speed = value; } private string _savePath; diff --git a/Assets/ArtNet/Editor/DmxRecorder/SenderWindow.cs b/Assets/ArtNet/Editor/DmxRecorder/SenderWindow.cs index 6225b5b..a718713 100644 --- a/Assets/ArtNet/Editor/DmxRecorder/SenderWindow.cs +++ b/Assets/ArtNet/Editor/DmxRecorder/SenderWindow.cs @@ -133,12 +133,6 @@ private void InitializeSenderSettings(VisualElement root) } }); - var sendRecordSequenceToggle = root.Q("sendRecordSequenceToggle"); - sendRecordSequenceToggle.RegisterValueChangedCallback(evt => - { - _sender.SenderSettings.IsRecordSequence = evt.newValue; - }); - var sendSpeedSlider = root.Q("sendSpeed"); var sendSpeedDropdown = root.Q("sendSpeedDropdown"); sendSpeedDropdown.choices.Clear(); diff --git a/Assets/ArtNet/Editor/DmxRecorder/SenderWindow.uxml b/Assets/ArtNet/Editor/DmxRecorder/SenderWindow.uxml index 78f280b..e198bb9 100644 --- a/Assets/ArtNet/Editor/DmxRecorder/SenderWindow.uxml +++ b/Assets/ArtNet/Editor/DmxRecorder/SenderWindow.uxml @@ -33,7 +33,6 @@ -