Merge branch 'master' into feat/better-errors

Author: regzo2

.gitignore

@@ -0,0 +1,50 @@
+# VSCode Files
+.vscode/
+
+# Visual Studio files
+.vs/
+bin/
+obj/
+*.exe
+*.pdb
+*.dll
+*.user
+*.suo
+*.cache
+*.log
+*.vspscc
+*.vssscc
+*.psess
+*.dbmdl
+*.dbproj*
+*.VC.db
+*.csproj.user
+*.bak
+*.cache
+*.sln.docstates
+*.sln.ide-shadows
+[Tt]humbs.db
+*.dbmdl
+*.dbproj*
+*.VC.db
+*.csproj.user
+*.bak
+*.cache
+*.sln.docstates
+*.sln.ide-shadows
+[Tt]humbs.db
+
+# JetBrains Rider files
+.idea/
+*.iml
+*.ipr
+*.iws
+.idea_modules/
+
+# Build results
+bin/
+obj/
+
+# Ignore files in the SRanipalExtTrackingModule folder
+/SRanipalExtTrackingModule/bin/
+/SRanipalExtTrackingModule/obj/

SRanipalExtTrackingModule/SRanipalTrackingInterface.cs

@@ -28,10 +28,17 @@ public class SRanipalExtTrackingInterface : ExtTrackingModule
         internal static Process? _process;
         internal static IntPtr _processHandle;
         internal static IntPtr _offset;
-
+        
+        LipData_v2 lipData;
+        EyeData_v2 eyeData;
+        
+        private static byte[] eyeImageCache, lipImageCache;
+        
+        // Kernel32 SetDllDirectory
         [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
         private static extern bool SetDllDirectory(string lpPathName);
-        internal static bool Attach()
+        
+        private static bool Attach()
         {
             var processes = Process.GetProcessesByName("sr_runtime");
             if (processes.Length <= 0) return false;
@@ -42,13 +49,13 @@ internal static bool Attach()
             return true;
         }
 
-        internal static byte[] ReadMemory(int size) {
-            var buffer = new byte[size];
-
+        private static byte[] ReadMemory(IntPtr offset, ref byte[] buf) {
             var bytesRead = 0;
-            Utils.ReadProcessMemory((int) _processHandle, _offset, buffer, size, ref bytesRead);
+            var size = buf.Length;
+            
+            Utils.ReadProcessMemory((int) _processHandle, offset, buf, size, ref bytesRead);
 
-            return bytesRead != size ? null : buffer;
+            return bytesRead != size ? null : buf;
         }
 
         public override (bool SupportsEye, bool SupportsExpression) Supported => (true, true);
@@ -65,6 +72,28 @@ public override (bool eyeSuccess, bool expressionSuccess) Initialize(bool eyeAva
             // Get the directory of the sr_runtime.exe program from our start menu shortcut. This is where the SRanipal dlls are located.
             var srInstallDir = (string) Registry.LocalMachine.OpenSubKey(@"Software\VIVE\SRWorks\SRanipal")?.GetValue("ModuleFileName");
 
+            // Dang you SRanipal
+            var localAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+            var srLogsDirectory = Path.Combine(localAppData + @"Low\HTC Corporation\SR_Logs\SRAnipal_Logs");
+            
+            // Get logs that should be yeeted.
+            string[] srLogFiles = Directory.GetFiles(srLogsDirectory);
+        
+            foreach (string logFile in srLogFiles)
+            {
+                try {
+                    using (var stream = File.Open(logFile, FileMode.Open, FileAccess.Write, FileShare.ReadWrite))
+                    {
+                        Logger.LogDebug($"Clearing \"{logFile}\"");
+                        stream.SetLength(0);
+                        stream.Close();
+                    }
+                }
+                catch {
+                    Logger.LogWarning($"Failed to delete log file \"{logFile}\"");
+                }
+            }
+
             if (srInstallDir == null)
             {
                 Logger.LogError("Bruh, SRanipal not installed. Assuming default path");
@@ -128,17 +157,19 @@ public override (bool eyeSuccess, bool expressionSuccess) Initialize(bool eyeAva
                         }
 
                     UnifiedTracking.EyeImageData.ImageSize = (200, 100);
+                    UnifiedTracking.EyeImageData.ImageData = new byte[200 * 100 * 4];
+                    eyeImageCache = new byte[200 * 100];
                 }
             }
 
             if (lipEnabled)
             {
                 UnifiedTracking.LipImageData.SupportsImage = true;
                 UnifiedTracking.LipImageData.ImageSize = (SRanipal_Lip_v2.ImageWidth, SRanipal_Lip_v2.ImageHeight);
-                UnifiedTracking.LipImageData.ImageData = new byte[UnifiedTracking.LipImageData.ImageSize.x *
-                                                                  UnifiedTracking.LipImageData.ImageSize.y];
                 lipData.image = Marshal.AllocCoTaskMem(UnifiedTracking.LipImageData.ImageSize.x *
                                                        UnifiedTracking.LipImageData.ImageSize.x);
+
+                lipImageCache = new byte[SRanipal_Lip_v2.ImageWidth * SRanipal_Lip_v2.ImageHeight];
             }
 
             ModuleInformation = new ModuleMetadata()
@@ -194,13 +225,13 @@ public override void Update()
             if (lipEnabled && !UpdateMouth())
             {
                 Logger.LogError("An error has occured when updating tracking. Reinitializing needed runtimes.");
-                //SRanipal_API.InitialRuntime();
+                SRanipal_API.InitialRuntime();
                 InitTracker(SRanipal_Lip_v2.ANIPAL_TYPE_LIP_V2, "Lip");
             }
             if (eyeEnabled && !UpdateEye())
             {
                 Logger.LogError("An error has occured when updating tracking. Reinitializing needed runtimes.");
-                //SRanipal_API.InitialRuntime();
+                SRanipal_API.InitialRuntime();
                 InitTracker(SRanipal_Eye_v2.ANIPAL_TYPE_EYE_V2, "Eye");
             }
         }
@@ -217,7 +248,7 @@ private bool UpdateEye()
                 return true;
 
             // Read 20000 image bytes from the predefined offset. 10000 bytes per eye.
-            var imageBytes = ReadMemory(20000);
+            var imageBytes = ReadMemory(_offset, ref eyeImageCache);
 
             // Concatenate the two images side by side instead of one after the other
             byte[] leftEye = new byte[10000];
@@ -234,9 +265,21 @@ private bool UpdateEye()
                 // Add 100 bytes from the right eye to the right side of the image
                 Array.Copy(rightEye, i*100, imageBytes, leftIndex + 100, 100);
             }
-
-            // Write the image to the latest eye data
-            UnifiedTracking.EyeImageData.ImageData = imageBytes;
+            
+            for (int y = 0; y < 100; y++)
+            {
+                for (int x = 0; x < 200; x++)
+                {
+                    byte grayscaleValue = imageBytes[y * 200 + x];
+
+                    // Set the R, G, B, and A channels to the grayscale value
+                    int index = (y * 200 + x) * 4;
+                    UnifiedTracking.EyeImageData.ImageData[index + 0] = grayscaleValue; // R
+                    UnifiedTracking.EyeImageData.ImageData[index + 1] = grayscaleValue; // G
+                    UnifiedTracking.EyeImageData.ImageData[index + 2] = grayscaleValue; // B
+                    UnifiedTracking.EyeImageData.ImageData[index + 3] = 255; // A (fully opaque)
+                }
+            }
 
             return true;
         }
@@ -325,8 +368,23 @@ private bool UpdateMouth()
             if (lipData.image == IntPtr.Zero || !UnifiedTracking.LipImageData.SupportsImage) 
                 return true;
 
-            Marshal.Copy(lipData.image, UnifiedTracking.LipImageData.ImageData, 0, UnifiedTracking.LipImageData.ImageSize.x *
+            Marshal.Copy(lipData.image, lipImageCache, 0, UnifiedTracking.LipImageData.ImageSize.x *
             UnifiedTracking.LipImageData.ImageSize.y);
+            
+            for (int y = 0; y < 400; y++)
+            {
+                for (int x = 0; x < 800; x++)
+                {
+                    byte grayscaleValue = lipImageCache[y * 800 + x];
+
+                    // Set the R, G, B, and A channels to the grayscale value
+                    int index = (y * 800 + x) * 4;
+                    UnifiedTracking.LipImageData.ImageData[index + 0] = grayscaleValue; // R
+                    UnifiedTracking.LipImageData.ImageData[index + 1] = grayscaleValue; // G
+                    UnifiedTracking.LipImageData.ImageData[index + 2] = grayscaleValue; // B
+                    UnifiedTracking.LipImageData.ImageData[index + 3] = 255; // A (fully opaque)
+                }
+            }
 
             return true;
         }