2.6.0b2 (sdk 1.12.5) - Basic URP support, Unity XR fixes

Author: keithbradner

Assets/SteamVR/Editor/SteamVR_AutoEnableVR.cs

@@ -22,7 +22,7 @@ static SteamVR_AutoEnableVR()
 
         protected const string openVRString = "OpenVR";
         protected const string openVRPackageString = "com.unity.xr.openvr.standalone";
-        protected const string valveOpenVRPackageString = "com.valve.openvr";
+        protected const string valveOpenVRPackageString = "com.valvesoftware.unity.openvr";
         protected const string valveOpenVRGitURL = "https://github.com/ValveSoftware/steamvr_unity_plugin.git#UnityXRPlugin";
 
 #if UNITY_2018_2_OR_NEWER

Assets/SteamVR/Editor/SteamVR_Editor.asmdef

@@ -1,7 +1,8 @@
 {
     "name": "SteamVR_Editor",
     "references": [
-        "SteamVR"
+        "SteamVR",
+        "Unity.XR.OpenVR"
     ],
     "includePlatforms": [
         "Editor"
@@ -14,7 +15,7 @@
     "defineConstraints": [],
     "versionDefines": [
         {
-            "name": "com.valve.openvr",
+            "name": "com.valvesoftware.unity.openvr",
             "expression": "",
             "define": "OPENVR_XR_API"
         },

Assets/SteamVR/Extras/SteamVR_CameraHelper.cs

@@ -0,0 +1,18 @@
+using UnityEngine;
+using System.Collections;
+
+namespace Valve.VR
+{
+	public class SteamVR_CameraHelper : MonoBehaviour
+	{
+		void Start()
+		{
+#if OPENVR_XR_API && UNITY_LEGACY_INPUT_HELPERS
+			if (this.gameObject.GetComponent<UnityEngine.SpatialTracking.TrackedPoseDriver>() == null)
+			{
+				this.gameObject.AddComponent<UnityEngine.SpatialTracking.TrackedPoseDriver>();
+			}
+#endif
+		}
+	}
+}

Assets/SteamVR/Extras/SteamVR_CameraHelper.cs.meta

@@ -1,9 +1,9 @@
 {
     "name": "SteamVR_Input_Editor",
     "references": [
-        "SteamVR"
+        "SteamVR",
+        "Unity.XR.OpenVR"
     ],
-    "optionalUnityReferences": [],
     "includePlatforms": [
         "Editor"
     ],
@@ -12,5 +12,7 @@
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": true,
-    "defineConstraints": []
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

Assets/SteamVR/Input/Editor/SteamVR_Input_Editor.asmdef

@@ -149,6 +149,16 @@ public void ForceAddSourceToUpdateList(SteamVR_Input_Sources inputSource)
         {
             sourceMap.ForceAddSourceToUpdateList(inputSource);
         }
+
+        /// <summary>
+        /// Returns a string for the type of controller that was being used the last time the action was triggered. Common types: 
+        /// vive_controller, oculus_touch, knuckles, vive_cosmos_controller, logitech_stylus
+        /// </summary>
+        /// <param name="inputSource">The device you would like to get data from. Any if the action is not device specific.</param>
+        public string GetControllerType(SteamVR_Input_Sources inputSource)
+        {
+            return SteamVR.instance.GetStringProperty(ETrackedDeviceProperty.Prop_ControllerType_String, GetDeviceIndex(inputSource));
+        }
     }
 
     public class SteamVR_Action_In_Source_Map<SourceElement> : SteamVR_Action_Source_Map<SourceElement>