Refactor OSC to clean things up and allow us to use template types. I…

…nclude and utilize unmanaged rust lib (https://github.com/benaclejames/SimpleRustOSC). Lotta optimization and performance optimizations.
benaclejames · Mar 21, 2023 · a6fa75d · a6fa75d
1 parent 9298941
commit a6fa75d
Show file tree

Hide file tree

Showing 18 changed files with 217 additions and 386 deletions.
diff --git a/SRanipalExtTrackingModule/ModuleLibs/SRWorks_Log.dll b/SRanipalExtTrackingModule/ModuleLibs/SRWorks_Log.dll
diff --git a/SRanipalExtTrackingModule/ModuleLibs/SRanipal.dll b/SRanipalExtTrackingModule/ModuleLibs/SRanipal.dll
diff --git a/SRanipalExtTrackingModule/ModuleLibs/ViveSR_Client.dll b/SRanipalExtTrackingModule/ModuleLibs/ViveSR_Client.dll
diff --git a/SRanipalExtTrackingModule/ModuleLibs/libHTC_License.dll b/SRanipalExtTrackingModule/ModuleLibs/libHTC_License.dll
diff --git a/SRanipalExtTrackingModule/ModuleLibs/nanomsg.dll b/SRanipalExtTrackingModule/ModuleLibs/nanomsg.dll
diff --git a/VRCFaceTracking/ConfigParser.cs b/VRCFaceTracking/ConfigParser.cs
@@ -33,7 +33,7 @@ public class AvatarConfigSpec
             public List<Parameter> parameters { get; set; }
         }
 
-        public static Action OnConfigLoaded = () => { };
+        public static Action<int> OnConfigLoaded = (int count) => { };
 
         public static void ParseNewAvatar(string newId)
         {
@@ -62,10 +62,11 @@ public static void ParseNewAvatar(string newId)
             Logger.Msg("Parsing config file for avatar: " + avatarConfig.name);
             var parameters = avatarConfig.parameters.Where(param => param.input != null).ToArray();
 
+            int count = 0;
             foreach (var parameter in UnifiedTracking.AllParameters_v2.Concat(UnifiedTracking.AllParameters_v1).ToArray())
-                parameter.ResetParam(parameters);
+                count += parameter.ResetParam(parameters);
 
-            OnConfigLoaded();
+            OnConfigLoaded(count);
         }
     }
 }
diff --git a/VRCFaceTracking/MainStandalone.cs b/VRCFaceTracking/MainStandalone.cs
@@ -6,6 +6,7 @@
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Windows;
+using System.Windows.Documents;
 using VRCFaceTracking.Assets.UI;
 using VRCFaceTracking.OSC;
 using VRCFaceTracking.Types;
@@ -31,16 +32,6 @@ public static class MainStandalone
         public static OscMain OscMain;
         public static UnifiedConfig unifiedConfig = new UnifiedConfig();
 
-        private static List<byte[]> ConstructMessages(IEnumerable<OSCParams.BaseParam> parameters) =>
-            parameters.Where(p => p.NeedsSend).Select(param =>
-            {
-                param.NeedsSend = false;
-                return new OscMessage(param.OutputInfo.address, param.OscType, param.ParamValue);
-            }).ToList();
-
-        private static IEnumerable<OSCParams.BaseParam> _relevantParams;
-        private static int _relevantParamsCount = 416;
-
         public static readonly CancellationTokenSource MasterCancellationTokenSource = new CancellationTokenSource();
 
         public static void Teardown()
@@ -60,6 +51,7 @@ public static void Teardown()
 
         public static void Initialize()
         {
+            var test2 = BitConverter.GetBytes(69.42);
             Logger.Msg("VRCFT Initializing!");
 
             // Parse Arguments
@@ -95,50 +87,38 @@ public static void Initialize()
             if (!bindResults.senderSuccess)
                 Logger.Error("Socket failed to bind to sender port, please ensure it's not already in use by another program or specify a different one instead.");
 
-            var _relevantParams_v1 = UnifiedTracking.AllParameters_v1.SelectMany(p => p.GetBase()).Where(param => param.Relevant);
-            var _relevantParams_v2 = UnifiedTracking.AllParameters_v2.SelectMany(p => p.GetBase()).Where(param => param.Relevant);
-            _relevantParams = _relevantParams_v1.Concat(_relevantParams_v2);
-
-            ConfigParser.OnConfigLoaded += () =>
+            ConfigParser.OnConfigLoaded += (count) =>
             {
-                _relevantParams_v1 = UnifiedTracking.AllParameters_v1.SelectMany(p => p.GetBase())
-                    .Where(param => param.Relevant);
-                _relevantParams_v2 = UnifiedTracking.AllParameters_v2.SelectMany(p => p.GetBase())
-                    .Where(param => param.Relevant);
-
-                _relevantParams = _relevantParams_v1.Concat(_relevantParams_v2);
-
-                Logger.Msg("Config file parsed successfully! " + _relevantParams.Count() + " parameters loaded.");
-                
-                if (_relevantParams_v1.Count() > 0)
-                    Logger.Warning(_relevantParams_v1.Count() + " legacy parameters loaded. These are undocumented and outdated parameters.");
+                    Logger.Warning(count + " legacy parameters loaded. These are undocumented and outdated parameters.");
             };
 
             // Begin main OSC update loop
             Utils.TimeBeginPeriod(1);
+            byte[] buffer = new byte[4096];
             while (!MasterCancellationTokenSource.IsCancellationRequested)
             {
                 Thread.Sleep(10);
 
-                if (_relevantParamsCount <= 0)
-                    continue;
+                //if (_relevantParamsCount <= 0)
+                //    continue;
 
                 UnifiedTracking.UpdateData();
-
-                var messages = ConstructMessages(_relevantParams);
-                while (messages.Count > 0)
+
+                // Send all messages in OSCParams.SendQueue
+                if (OSCParams.SendQueue.Count <= 0) continue;
+
+                var relevantMessages = OSCParams.SendQueue.ToArray();
+                int messageIndex = 0;
+                while (messageIndex < relevantMessages.Length)
                 {
-                    var msgCount = 16;
-                    var msgList = new List<OscMessage>();
-                    while (messages.Count > 0 && msgCount+messages[0].Data.Length+4 < 4096)
-                    {
-                        msgList.Add(messages[0]);
-                        msgCount += messages[0].Data.Length+4;
-                        messages.RemoveAt(0);
-                    }
-                    var bundle = new OscBundle(msgList);
-                    OscMain.Send(bundle.Data);
+                    var length = RustLib.create_osc_bundle(buffer, relevantMessages, relevantMessages.Length,
+                        ref messageIndex);
+                    if (length > 4096)
+                        throw new Exception("Bundle size is too large! This should never happen.");
+
+                    OscMain.Send(buffer, length);
                 }
+                OSCParams.SendQueue.Clear();
             }
         }
     }

diff --git a/VRCFaceTracking/OSC/OSCBundle.cs b/VRCFaceTracking/OSC/OSCBundle.cs
diff --git a/VRCFaceTracking/OSC/OSCMain.cs b/VRCFaceTracking/OSC/OSCMain.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Net;
 using System.Net.Sockets;
+using System.Runtime.InteropServices;
 using System.Threading;
 
 namespace VRCFaceTracking.OSC
@@ -48,7 +49,7 @@ private void Recv()
                 // Ignore as this is most likely a timeout exception
                 return;
             }
-            var newMsg = new OscMessage<object>(buffer);
+            var newMsg = new OscMessage(buffer);
             switch (newMsg.Address)
             {
                 case "/avatar/change":
@@ -74,6 +75,6 @@ private void Recv()
             }
         }
 
-        public void Send(byte[] data) => SenderClient.Send(data, data.Length, SocketFlags.None);
+        public void Send(byte[] data, int length) => SenderClient.Send(data, length, SocketFlags.None);
     }
 }