Add VR path to remote response, allow image data to be skipped

BOLL7708 · Sep 2, 2024 · 8760e23 · 8760e23
1 parent 93d7302
commit 8760e23
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 11 deletions.
diff --git a/SuperScreenShotterVR/MainController.cs b/SuperScreenShotterVR/MainController.cs
@@ -571,9 +571,13 @@ private void ScreenShotTaken(VREvent_Data_t eventData)
                         var resIndex = _settings.ResponseResolution;
                         var res = MainWindow.ResMap.Length > resIndex ? MainWindow.ResMap[resIndex] : 256;
                         if (res < 0) res = image.Width;
-                        var bitmap = ResizeImage(image, res, res);
-                        SetAlpha(ref bitmap, 255);
-                        var imgb64data = GetBase64Bytes(bitmap);
+                        var imgb64data = "";
+                        if (res != 0)
+                        {
+                            var bitmap = ResizeImage(image, res, res);
+                            SetAlpha(ref bitmap, 255);
+                            imgb64data = GetBase64Bytes(bitmap);
+                        }
                         if (msg != null)
                         {
 
@@ -584,7 +588,8 @@ private void ScreenShotTaken(VREvent_Data_t eventData)
                                     imgb64data,
                                     image.Width,
                                     image.Height,
-                                    filePath
+                                    filePath,
+                                    filePathVr
                                 ), 
                                 JsonOptions.Get())
                             );
@@ -597,7 +602,8 @@ private void ScreenShotTaken(VREvent_Data_t eventData)
                                         imgb64data,
                                         image.Width,
                                         image.Height,
-                                        filePath
+                                        filePath,
+                                        filePathVr
                                     ), 
                                     JsonOptions.Get())
                             );

diff --git a/SuperScreenShotterVR/MainWindow.xaml b/SuperScreenShotterVR/MainWindow.xaml
@@ -63,6 +63,7 @@
                             <ComboBoxItem>512px</ComboBoxItem>
                             <ComboBoxItem>1024px</ComboBoxItem>
                             <ComboBoxItem>Original</ComboBoxItem>
+                            <ComboBoxItem>Skip</ComboBoxItem>
                         </ComboBox>
                     </StackPanel>
 

diff --git a/SuperScreenShotterVR/MainWindow.xaml.cs b/SuperScreenShotterVR/MainWindow.xaml.cs
@@ -493,13 +493,15 @@ private void ComboBox_ScreenshotHotkey_SelectionChanged(object sender, Selection
             _settings.Save();
             UpdateHotkey(HotkeyIdScreenshot);
         }
-        public static readonly int[] ResMap = {
+        public static readonly int[] ResMap =
+        [
             128,
             256,
             512,
             1024,
-            -1
-        };
+            -1,
+            0
+        ];
 
         private void CheckBox_ViewfinderHotkeyAlt_Checked(object sender, RoutedEventArgs e)
         {

diff --git a/SuperScreenShotterVR/Properties/Resources.resx b/SuperScreenShotterVR/Properties/Resources.resx
@@ -128,6 +128,6 @@
     <value>..\resources\logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Version" xml:space="preserve">
-    <value>v2.1.1</value>
+    <value>v2.2.0</value>
   </data>
 </root>
diff --git a/SuperScreenShotterVR/Remote/ScreenshotResponse.cs b/SuperScreenShotterVR/Remote/ScreenshotResponse.cs
@@ -7,18 +7,20 @@ class ScreenshotResponse
         public int Width = 0;
         public int Height = 0;
         public string FilePath = "";
+        public string FilePathVR = "";
         public string Message = "";
         public string Error = "";
 
-        public static ScreenshotResponse Create(string nonce, string image, int width, int height, string filePath)
+        public static ScreenshotResponse Create(string nonce, string image, int width, int height, string filePath, string filePathVR)
         {
             return new ScreenshotResponse()
             {
                 Nonce = nonce,
                 Image = image,
                 Width = width,
                 Height = height,
-                FilePath = filePath
+                FilePath = filePath,
+                FilePathVR = filePathVR
             };
         }