Added missing Pico2 button

Author: zezba9000

Assets/Reign/XRInput/API/Pico2VR.cs

@@ -9,6 +9,8 @@ namespace Reign.XR.API
 	#if !XRINPUT_DISABLE_PICO2
 	public sealed class Pico2VR : XRInputAPI
 	{
+		private bool handIndexSet;
+
 		public override bool GatherInput(XRControllerState[] state_controllers, out int controllerCount, out bool leftSet, out int leftSetIndex, out bool rightSet, out int rightSetIndex, out SideToSet sideToSet)
 		{
 			// defaults
@@ -19,8 +21,12 @@ public override bool GatherInput(XRControllerState[] state_controllers, out int
 				// force hand index
 				const int leftHandIndex = 0;
 				const int rightHandIndex = 1;
-				Controller.UPvr_SetHandNess(Pvr_Controller.UserHandNess.Left);
-				Controller.UPvr_SetMainHandNess(leftHandIndex);
+				if (!handIndexSet)
+				{
+					handIndexSet = true;
+					Controller.UPvr_SetHandNess(Pvr_Controller.UserHandNess.Left);
+					Controller.UPvr_SetMainHandNess(leftHandIndex);
+				}
 
 				// get hand index
 				//int mainControllerIndex = Controller.UPvr_GetMainHandNess();
@@ -71,6 +77,7 @@ private void GatherInputForController(int controllerIndex, XRControllerSide side
             state_controller.buttonTrigger.Update(Controller.UPvr_GetKey(controllerIndex, Pvr_KeyCode.TRIGGER));
 			bool gripOn = Controller.UPvr_GetKey(controllerIndex, side == XRControllerSide.Right ? Pvr_KeyCode.Right : Pvr_KeyCode.Left);
             state_controller.buttonGrip.Update(gripOn);
+			state_controller.buttonMenu.Update(Controller.UPvr_GetKey(controllerIndex, Pvr_KeyCode.APP));
 
             // analogs
             state_controller.trigger.Update(Controller.UPvr_GetControllerTriggerValue(controllerIndex) / 255.0f);

Assets/XR/Settings/Open XR Package Settings.asset

@@ -1452,6 +1452,7 @@ MonoBehaviour:
   - {fileID: -6208059066966475518}
   - {fileID: -504760844423562565}
   - {fileID: -8333506685063751720}
+  - {fileID: 5411322363352526692}
   - {fileID: 3790750328658821260}
   - {fileID: 7984533221296775907}
   - {fileID: 6958787096216914455}
@@ -4543,6 +4544,36 @@ MonoBehaviour:
   company: Oculus
   priority: 0
   required: 0
+--- !u!114 &5411322363352526692
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f647cc0545697264a9878224faada6d5, type: 3}
+  m_Name: MetaQuestFeature Android
+  m_EditorClassIdentifier: 
+  m_enabled: 0
+  nameUi: Meta Quest Support
+  version: 1.0.0
+  featureIdInternal: com.unity.openxr.feature.metaquest
+  openxrExtensionStrings: XR_OCULUS_android_initialize_loader
+  company: Unity
+  priority: 0
+  required: 0
+  targetDevices:
+  - visibleName: Quest
+    manifestName: quest
+    enabled: 1
+  - visibleName: Quest 2
+    manifestName: quest2
+    enabled: 1
+  - visibleName: Quest Pro
+    manifestName: cambria
+    enabled: 1
 --- !u!114 &5435099724440967521
 MonoBehaviour:
   m_ObjectHideFlags: 0

Packages/manifest.json

@@ -21,7 +21,7 @@
     "com.unity.xr.management": "4.2.1",
     "com.unity.xr.mock-hmd": "1.3.1-preview.1",
     "com.unity.xr.oculus": "3.2.2",
-    "com.unity.xr.openxr": "1.5.3",
+    "com.unity.xr.openxr": "1.6.0",
     "com.valvesoftware.unity.openvr": "file:../ExternalPackages/com.valvesoftware.unity.openvr-1.1.4.tgz",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",

Packages/packages-lock.json

@@ -143,7 +143,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.xr.core-utils": {
-      "version": "2.0.0",
+      "version": "2.0.1",
       "depth": 2,
       "source": "registry",
       "dependencies": {
@@ -152,7 +152,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.xr.interaction.toolkit": {
-      "version": "2.0.4",
+      "version": "2.2.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -208,13 +208,13 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.xr.openxr": {
-      "version": "1.5.3",
+      "version": "1.6.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.xr.management": "4.0.1",
         "com.unity.xr.legacyinputhelpers": "2.1.2",
-        "com.unity.inputsystem": "1.4.2"
+        "com.unity.inputsystem": "1.4.4"
       },
       "url": "https://packages.unity.com"
     },

ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.16f1
-m_EditorVersionWithRevision: 2021.3.16f1 (4016570cf34f)
+m_EditorVersion: 2021.3.18f1
+m_EditorVersionWithRevision: 2021.3.18f1 (3129e69bc0c7)