Add gamepad binding, slim down knuckles binding, prevent viewfinder i…

…n dashboard Update EasyOpenVR
BOLL7708 · Jul 28, 2020 · 8c9f74b · 8c9f74b
1 parent a818a4a
commit 8c9f74b
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 99 deletions.
diff --git a/SuperScreenShotterVR/EasyOpenVR b/SuperScreenShotterVR/EasyOpenVR
diff --git a/SuperScreenShotterVR/MainController.cs b/SuperScreenShotterVR/MainController.cs
@@ -104,11 +104,11 @@ private void WorkerThread()
                         // TODO: After restart these do not get registered again??!!??
                         _ovr.RegisterDigitalAction(
                             "/actions/screenshots/in/take_screenshot",
-                            (data, handle) => { if (data.bState) ScreenshotTriggered(); }
+                            (data, handle) => { if (data.bState && !OpenVR.Overlay.IsDashboardVisible()) ScreenshotTriggered(); }
                         );
                         _ovr.RegisterDigitalAction(
                             "/actions/screenshots/in/show_viewfinder",
-                            (data, handle) => { ToggleViewfinder(data.bState); }
+                            (data, handle) => { ToggleViewfinder(data.bState && !OpenVR.Overlay.IsDashboardVisible()); }
                         );
                         _notificationOverlayHandle = _ovr.InitNotificationOverlay("SuperScreenShotterVR");
                         _currentAppId = _ovr.GetRunningApplicationId();
@@ -160,6 +160,10 @@ private void WorkerThread()
                             // (as well as other settings)
                             UpdateDisplayFrequency();
                         });
+                        _ovr.RegisterEvent(EVREventType.VREvent_DashboardActivated, (data) =>
+                        {
+                            ToggleViewfinder(false);
+                        });
                         Debug.WriteLine("Init complete.");
                     }
                     else

diff --git a/SuperScreenShotterVR/Properties/Resources.Designer.cs b/SuperScreenShotterVR/Properties/Resources.Designer.cs
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>v0.39</value>
+    <value>v0.40</value>
   </data>
 </root>
diff --git a/SuperScreenShotterVR/SuperScreenShotterVR.csproj b/SuperScreenShotterVR/SuperScreenShotterVR.csproj
@@ -126,6 +126,9 @@
     <None Include="app.vrmanifest">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="bindings_gamepad.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="bindings_knuckles.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

diff --git a/SuperScreenShotterVR/actions.json b/SuperScreenShotterVR/actions.json
@@ -3,6 +3,10 @@
 		{
 			"controller_type": "knuckles",
 			"binding_url": "bindings_knuckles.json"
+		},
+		{
+			"controller_type": "gamepad",
+			"binding_url": "bindings_gamepad.json"
 		}
 	],
 	"actions": [

diff --git a/SuperScreenShotterVR/bindings_gamepad.json b/SuperScreenShotterVR/bindings_gamepad.json
@@ -0,0 +1,36 @@
+{
+   "action_manifest_version" : 0,
+   "alias_info" : {},
+   "app_key" : "boll7708.superscreenshottervr",
+   "bindings" : {
+      "/actions/screenshots" : {
+         "chords" : [
+            {
+               "inputs" : [
+                  [ "/user/gamepad/input/start", "click" ],
+                  [ "/user/gamepad/input/back", "click" ]
+               ],
+               "output" : "/actions/screenshots/in/take_screenshot"
+            }
+         ],
+         "sources" : [
+            {
+               "inputs" : {},
+               "mode" : "button",
+               "path" : "/user/gamepad/input/start"
+            },
+            {
+               "inputs" : {},
+               "mode" : "button",
+               "path" : "/user/gamepad/input/back"
+            }
+         ]
+      }
+   },
+   "category" : "steamvr_input",
+   "controller_type" : "gamepad",
+   "description" : "Default Gamepad Bindings",
+   "name" : "Default SuperScreenShotterVR configuration for Gamepad",
+   "options" : {},
+   "simulated_actions" : []
+}
diff --git a/SuperScreenShotterVR/bindings_knuckles.json b/SuperScreenShotterVR/bindings_knuckles.json
@@ -21,125 +21,33 @@
             }
          ],
          "sources" : [
-            {
-               "inputs" : {},
-               "mode" : "button",
-               "path" : "/user/hand/left/input/b"
-            },
             {
                "inputs" : {},
                "mode" : "button",
                "path" : "/user/hand/left/input/trigger"
             },
-            {
-               "inputs" : {},
-               "mode" : "button",
-               "path" : "/user/hand/right/input/b"
-            },
             {
                "inputs" : {},
                "mode" : "button",
                "path" : "/user/hand/right/input/trigger"
             },
-            {
-               "inputs" : {},
-               "mode" : "button",
-               "path" : "/user/hand/right/input/a"
-            },
-            {
-               "inputs" : {},
-               "mode" : "button",
-               "path" : "/user/hand/left/input/a"
-            },
-            {
+             {
                "inputs" : {},
                "mode" : "button",
                "path" : "/user/hand/left/input/system"
             },
-            {
-               "inputs" : {},
-               "mode" : "button",
-               "path" : "/user/hand/left/input/trackpad"
-            },
-            {
-               "inputs" : {},
-               "mode" : "dpad",
-               "parameters" : {
-                  "sub_mode" : "click"
-               },
-               "path" : "/user/hand/left/input/trackpad"
-            },
-            {
-               "inputs" : {},
-               "mode" : "button",
-               "path" : "/user/hand/left/input/thumbstick"
-            },
-            {
-               "inputs" : {},
-               "mode" : "dpad",
-               "parameters" : {
-                  "sub_mode" : "touch"
-               },
-               "path" : "/user/hand/left/input/thumbstick"
-            },
-            {
-               "inputs" : {},
-               "mode" : "grab",
-               "path" : "/user/hand/left/input/grip"
-            },
-            {
-               "inputs" : {},
-               "mode" : "grab",
-               "path" : "/user/hand/left/input/pinch"
-            },
             {
                "inputs" : {},
                "mode" : "button",
                "path" : "/user/hand/right/input/system"
-            },
-            {
-               "inputs" : {},
-               "mode" : "button",
-               "path" : "/user/hand/right/input/trackpad"
-            },
-            {
-               "inputs" : {},
-               "mode" : "dpad",
-               "parameters" : {
-                  "sub_mode" : "click"
-               },
-               "path" : "/user/hand/right/input/trackpad"
-            },
-            {
-               "inputs" : {},
-               "mode" : "button",
-               "path" : "/user/hand/right/input/thumbstick"
-            },
-            {
-               "inputs" : {},
-               "mode" : "dpad",
-               "parameters" : {
-                  "sub_mode" : "touch"
-               },
-               "path" : "/user/hand/right/input/thumbstick"
-            },
-            {
-               "inputs" : {},
-               "mode" : "grab",
-               "path" : "/user/hand/right/input/grip"
-            },
-            {
-               "inputs" : {},
-               "mode" : "grab",
-               "path" : "/user/hand/right/input/pinch"
             }
          ]
       }
    },
    "category" : "steamvr_input",
    "controller_type" : "knuckles",
    "description" : "Default Index Controller Bindings",
-   "name" : "SuperScreenShotterVR configuration for Index Controller",
+   "name" : "Default SuperScreenShotterVR configuration for Index Controller",
    "options" : {},
    "simulated_actions" : []
 }