recording した sequence を送信しない

nasshu2916 · Dec 1, 2024 · b3927d5 · b3927d5
1 parent cea7c47
commit b3927d5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 24 deletions.
diff --git 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
@@ -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
@@ -133,12 +133,6 @@ private void InitializeSenderSettings(VisualElement root)
                 }
             });
 
-            var sendRecordSequenceToggle = root.Q<Toggle>("sendRecordSequenceToggle");
-            sendRecordSequenceToggle.RegisterValueChangedCallback(evt =>
-            {
-                _sender.SenderSettings.IsRecordSequence = evt.newValue;
-            });
-
             var sendSpeedSlider = root.Q<Slider>("sendSpeed");
             var sendSpeedDropdown = root.Q<DropdownField>("sendSpeedDropdown");
             sendSpeedDropdown.choices.Clear();

diff --git a/Assets/ArtNet/Editor/DmxRecorder/SenderWindow.uxml b/Assets/ArtNet/Editor/DmxRecorder/SenderWindow.uxml
@@ -33,7 +33,6 @@
                     <ui:VisualElement name="senderConfigFields" style="width: 100%;">
                         <ui:Toggle label="Loop" name="sendLoopToggle"/>
                         <ui:TextField name="sendDistIpField" label="Dist IP" text="127.0.0.1"/>
-                        <ui:Toggle label="Use Record Sequence" name="SenderRecordSequence"/>
                         <ui:VisualElement style="flex-direction: row;">
                             <ui:Slider label="Speed" high-value="10" name="sendSpeed" style="flex-grow: 1;"/>
                             <ui:DropdownField name="sendSpeedDropdown" choices="-"/>