2.6.1 - Excluding unused build target, SRP fix

Changes for 2.6.1

 * Updated sdk header to 1.13.10

 * Added support for Unity XR API

 * Added basic Universal Rendering Pipeline support

 * Added Exclusion for unused build targets

 * Fixed some error logging messages related to the old VR API.

 * Fixing obsolete API issue in unity 2020.2a

 * Moved System.ResetSeatedPosition to Chaperone.ResetZeroPosition(trackingUniverse)

 * Fixed some errors / warnings in 2020.1+

 * Fixed HDRP error that would cause SteamVR to not start. (still no hdrp support for the interaction system)

Author: keithbradner

Assets/SteamVR/Input/SteamVR_Input_ActionFile.cs

@@ -598,7 +598,7 @@ public class SteamVR_Input_Unity_AssemblyFile_Definition
         public string[] references = new string[] { "SteamVR" };
         public string[] optionalUnityReferences = new string[0];
         public string[] includePlatforms = new string[0];
-        public string[] excludePlatforms = new string[0];
+        public string[] excludePlatforms = new string[] { "Android" };
         public bool allowUnsafeCode = false;
         public bool overrideReferences = false;
         public string[] precompiledReferences = new string[0];

Assets/SteamVR/Scripts/SteamVR.cs

@@ -30,8 +30,13 @@ public static bool enabled
         {
             get
             {
+#if UNITY_2020_1_OR_NEWER || OPENVR_XR_API
+                if (XRSettings.supportedDevices.Length == 0)
+                    enabled = false;
+#else
                 if (!XRSettings.enabled)
                     enabled = false;
+#endif
                 return _enabled;
             }
             set

Assets/SteamVR/Scripts/SteamVR_Render.cs

@@ -406,43 +406,43 @@ void Update()
             if (SteamVR.active == false)
                 return;
 
-            UpdatePoses();
-
             // Dispatch any OpenVR events.
             var system = OpenVR.System;
-            if (system != null)
+            if (system == null)
+                return;
+
+            UpdatePoses();
+
+            var vrEvent = new VREvent_t();
+            var size = (uint)System.Runtime.InteropServices.Marshal.SizeOf(typeof(VREvent_t));
+            for (int i = 0; i < 64; i++)
             {
-                var vrEvent = new VREvent_t();
-                var size = (uint)System.Runtime.InteropServices.Marshal.SizeOf(typeof(VREvent_t));
-                for (int i = 0; i < 64; i++)
+                if (!system.PollNextEvent(ref vrEvent, size))
+                    break;
+
+                switch ((EVREventType)vrEvent.eventType)
                 {
-                    if (!system.PollNextEvent(ref vrEvent, size))
+                    case EVREventType.VREvent_InputFocusCaptured: // another app has taken focus (likely dashboard)
+                        if (vrEvent.data.process.oldPid == 0)
+                        {
+                            SteamVR_Events.InputFocus.Send(false);
+                        }
+                        break;
+                    case EVREventType.VREvent_InputFocusReleased: // that app has released input focus
+                        if (vrEvent.data.process.pid == 0)
+                        {
+                            SteamVR_Events.InputFocus.Send(true);
+                        }
+                        break;
+                    case EVREventType.VREvent_ShowRenderModels:
+                        SteamVR_Events.HideRenderModels.Send(false);
+                        break;
+                    case EVREventType.VREvent_HideRenderModels:
+                        SteamVR_Events.HideRenderModels.Send(true);
+                        break;
+                    default:
+                        SteamVR_Events.System((EVREventType)vrEvent.eventType).Send(vrEvent);
                         break;
-
-                    switch ((EVREventType)vrEvent.eventType)
-                    {
-                        case EVREventType.VREvent_InputFocusCaptured: // another app has taken focus (likely dashboard)
-                            if (vrEvent.data.process.oldPid == 0)
-                            {
-                                SteamVR_Events.InputFocus.Send(false);
-                            }
-                            break;
-                        case EVREventType.VREvent_InputFocusReleased: // that app has released input focus
-                            if (vrEvent.data.process.pid == 0)
-                            {
-                                SteamVR_Events.InputFocus.Send(true);
-                            }
-                            break;
-                        case EVREventType.VREvent_ShowRenderModels:
-                            SteamVR_Events.HideRenderModels.Send(false);
-                            break;
-                        case EVREventType.VREvent_HideRenderModels:
-                            SteamVR_Events.HideRenderModels.Send(true);
-                            break;
-                        default:
-                            SteamVR_Events.System((EVREventType)vrEvent.eventType).Send(vrEvent);
-                            break;
-                    }
                 }
             }
 
@@ -455,7 +455,7 @@ void Update()
             if (SteamVR.settings.lockPhysicsUpdateRateToRenderFrequency && Time.timeScale > 0.0f)
             {
                 var vr = SteamVR.instance;
-                if (vr != null)
+                if (vr != null && Application.isPlaying)
                 {
                     //var timing = new Compositor_FrameTiming();
                     //timing.m_nSize = (uint)System.Runtime.InteropServices.Marshal.SizeOf(typeof(Compositor_FrameTiming));

Assets/SteamVR/SteamVR.asmdef

@@ -6,7 +6,9 @@
         "UnityEngine.SpatialTracking"
     ],
     "includePlatforms": [],
-    "excludePlatforms": [],
+    "excludePlatforms": [
+        "Android"
+    ],
     "allowUnsafeCode": false,
     "overrideReferences": false,
     "precompiledReferences": [],

Assets/SteamVR/readme.txt

@@ -1,4 +1,4 @@
-# SteamVR Unity Plugin - v2.6.0b4 (sdk 1.13.10)
+# SteamVR Unity Plugin - v2.6.1 (sdk 1.13.10)
 
 Copyright (c) Valve Corporation, All rights reserved.
 
@@ -36,31 +36,25 @@ Input and Steam:
  If you publish your game to steam you can let users change their input bindings while the game is not running by setting the location of your action manifest. On the steamworks partner site go to the Application settings, and the Virtual Reality Section. At the bottom you'll see a radio button to designate your title as a SteamVR Input application. You then can set the location of your action manifest. In older versions of the plugin this was next to the executable. In versions 2.3.3 and above this is in [GameName]_Data/StreamingAssets/SteamVR/actions.json.
 
 
-Changes for 2.6.0b4
-
- * Fixing obsolete API issue in unity 2020.2a
- 
-Changes for 2.6.0b3
+Changes for 2.6.1
 
  * Updated sdk header to 1.13.10
 
- * Moved System.ResetSeatedPosition to Chaperone.ResetZeroPosition(trackingUniverse)
-
-Changes for 2.6.0b2
-
- * Updated sdk header to 1.12.5
+ * Added support for Unity XR API
 
  * Added basic Universal Rendering Pipeline support
 
- * Fixed some issues with Unity XR API
- 
-Changes for 2.6.0b1
+ * Added Exclusion for unused build targets
 
- * Updated sdk header to 1.11.11
+ * Fixed some error logging messages related to the old VR API.
 
- * Added support for Unity XR API
+ * Fixing obsolete API issue in unity 2020.2a
+
+ * Moved System.ResetSeatedPosition to Chaperone.ResetZeroPosition(trackingUniverse)
 
  * Fixed some errors / warnings in 2020.1+
+
+ * Fixed HDRP error that would cause SteamVR to not start. (still no hdrp support for the interaction system)
 
 Changes for 2.5.0