Merge branch '22022025' into 1e3de80

BasisVR · Feb 21, 2025 · 7bccea1 · 7bccea1
2 parents 1e3de80 + 6d08755
commit 7bccea1
Show file tree

Hide file tree

Showing 8 changed files with 345 additions and 90 deletions.
diff --git a/Basis/Assets/Basis/Settings/InputActions/InputAction.inputactions b/Basis/Assets/Basis/Settings/InputActions/InputAction.inputactions
@@ -342,6 +342,17 @@
                     "isComposite": false,
                     "isPartOfComposite": false
                 },
+                {
+                    "name": "",
+                    "id": "d00b0952-966b-4182-930e-abd4b219cdf8",
+                    "path": "<Gamepad>/buttonSouth",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "Jump",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
                 {
                     "name": "",
                     "id": "f2e78f9f-6b38-4981-9d67-a04d8dc17a76",
@@ -386,6 +397,17 @@
                     "isComposite": false,
                     "isPartOfComposite": false
                 },
+                {
+                    "name": "",
+                    "id": "6e4ca21b-30ca-4e5e-be2a-226b643c368f",
+                    "path": "<Gamepad>/start",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "Escape",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
                 {
                     "name": "",
                     "id": "439b6574-6177-4be8-a26a-799ae0e364e5",

diff --git a/Basis/Assets/StreamingAssets/SteamVR/bindings_knuckles.json b/Basis/Assets/StreamingAssets/SteamVR/bindings_knuckles.json
@@ -86,9 +86,6 @@
                "inputs" : {
                   "pull" : {
                      "output" : "/actions/default/in/handtrigger"
-                  },
-                  "touch" : {
-                     "output" : "/actions/default/in/grip"
                   }
                },
                "mode" : "trigger",
@@ -137,9 +134,6 @@
                "inputs" : {
                   "pull" : {
                      "output" : "/actions/default/in/handtrigger"
-                  },
-                  "touch" : {
-                     "output" : "/actions/default/in/grip"
                   }
                },
                "mode" : "trigger",
@@ -186,6 +180,34 @@
                },
                "mode" : "trigger",
                "path" : "/user/hand/right/input/trigger"
+            },
+            {
+               "inputs" : {
+                  "grab" : {
+                     "output" : "/actions/default/in/grip"
+                  }
+               },
+               "mode" : "grab",
+               "parameters" : {
+                  "force_hold_threshold" : "0.15",
+                  "value_hold_threshold" : "1.1",
+                  "value_release_threshold" : "0.65"
+               },
+               "path" : "/user/hand/left/input/grip"
+            },
+            {
+               "inputs" : {
+                  "grab" : {
+                     "output" : "/actions/default/in/grip"
+                  }
+               },
+               "mode" : "grab",
+               "parameters" : {
+                  "force_hold_threshold" : "0.15",
+                  "value_hold_threshold" : "1.1",
+                  "value_release_threshold" : "0.65"
+               },
+               "path" : "/user/hand/right/input/grip"
             }
          ]
       },

diff --git a/Basis/Assets/StreamingAssets/SteamVR/bindings_oculus_touch.json b/Basis/Assets/StreamingAssets/SteamVR/bindings_oculus_touch.json
@@ -1,7 +1,7 @@
 {
    "action_manifest_version" : 0,
    "alias_info" : {},
-   "app_key" : "application.generated.unity.basis.exe",
+   "app_key" : "application.generated.unity.basisunity.exe",
    "bindings" : {
       "/actions/buggy" : {
          "chords" : [],
@@ -168,6 +168,42 @@
                },
                "mode" : "button",
                "path" : "/user/hand/right/input/y"
+            },
+            {
+               "inputs" : {
+                  "click" : {
+                     "output" : "/actions/default/in/grip"
+                  }
+               },
+               "mode" : "button",
+               "path" : "/user/hand/left/input/grip"
+            },
+            {
+               "inputs" : {
+                  "click" : {
+                     "output" : "/actions/default/in/grip"
+                  }
+               },
+               "mode" : "button",
+               "path" : "/user/hand/right/input/grip"
+            },
+            {
+               "inputs" : {
+                  "pull" : {
+                     "output" : "/actions/default/in/handtrigger"
+                  }
+               },
+               "mode" : "trigger",
+               "path" : "/user/hand/left/input/grip"
+            },
+            {
+               "inputs" : {
+                  "pull" : {
+                     "output" : "/actions/default/in/handtrigger"
+                  }
+               },
+               "mode" : "trigger",
+               "path" : "/user/hand/right/input/grip"
             }
          ]
       },
@@ -183,7 +219,7 @@
    "controller_type" : "oculus_touch",
    "description" : "",
    "interaction_profile" : "",
-   "name" : "My [Testing] Basis configuration for Oculus Touch Controller",
+   "name" : "Basis configuration for Oculus Touch Controller",
    "options" : {},
    "simulated_actions" : []
 }