2.3.1b - Added no skeleton input fallback, bug fixes

Changes for 2.3.1b

 * Added legacy mixed reality camera mode (enabled by default). You can change this in SteamVR/Resources/SteamVR_Settings.

 * Fixing some errors for 2019.1

 * Removing an unused editor class

 * Added low fidelity fallback hand animation for when no skeleton data is available (WinMR)

 * Fixing OpenVR Package not required error for pre 2018.2 versions of unity

 * Fixed serializable event in Throwable

 * Fix for Custom Skeleton not getting initialized

 * Fix for a rare failure in action retrieval (#431)

 * Allowing folders in the action path. (#443)

 * Fix for multiple SteamVR_Behaviours initializing (#435)

 * Stop updating poses if they're not active

Author: keithbradner

Assets/SteamVR/Editor/SteamVR_AutoEnableVR.cs

@@ -23,7 +23,7 @@ static SteamVR_AutoEnableVR()
         protected const string openVRString = "OpenVR";
         protected const string openVRPackageString = "com.unity.xr.openvr.standalone";
 
-#if UNITY_2018_1_OR_NEWER
+#if UNITY_2018_2_OR_NEWER
         private enum PackageStates
         {
             None,
@@ -91,7 +91,7 @@ public static void Update()
                     Debug.Log("<b>[SteamVR Setup]</b> Added OpenVR to supported VR SDKs list.");
                 }
 
-#if UNITY_2018_1_OR_NEWER
+#if UNITY_2018_2_OR_NEWER
                 //2018+ requires us to manually add the OpenVR package
 
                 switch (packageState)

Assets/SteamVR/Editor/SteamVR_UnitySettingsWindow.cs

@@ -92,8 +92,10 @@ static void Update()
                     PlayerSettings.defaultScreenHeight != recommended_DefaultScreenHeight)) ||
                 (!EditorPrefs.HasKey(ignore + runInBackground) &&
                     PlayerSettings.runInBackground != recommended_RunInBackground) ||
+#if !UNITY_2019_1_OR_NEWER
                 (!EditorPrefs.HasKey(ignore + displayResolutionDialog) &&
                     PlayerSettings.displayResolutionDialog != recommended_DisplayResolutionDialog) ||
+#endif
                 (!EditorPrefs.HasKey(ignore + resizableWindow) &&
                     PlayerSettings.resizableWindow != recommended_ResizableWindow) ||
                 (!EditorPrefs.HasKey(ignore + visibleInBackground) &&
@@ -320,6 +322,7 @@ public void OnGUI()
                 GUILayout.EndHorizontal();
             }
 
+#if !UNITY_2019_1_OR_NEWER
             if (!EditorPrefs.HasKey(ignore + displayResolutionDialog) &&
                 PlayerSettings.displayResolutionDialog != recommended_DisplayResolutionDialog)
             {
@@ -343,6 +346,7 @@ public void OnGUI()
 
                 GUILayout.EndHorizontal();
             }
+#endif
 
             if (!EditorPrefs.HasKey(ignore + resizableWindow) &&
                 PlayerSettings.resizableWindow != recommended_ResizableWindow)
@@ -593,8 +597,10 @@ public void OnGUI()
                     }
                     if (!EditorPrefs.HasKey(ignore + runInBackground))
                         PlayerSettings.runInBackground = recommended_RunInBackground;
+#if !UNITY_2019_1_OR_NEWER
                     if (!EditorPrefs.HasKey(ignore + displayResolutionDialog))
                         PlayerSettings.displayResolutionDialog = recommended_DisplayResolutionDialog;
+#endif
                     if (!EditorPrefs.HasKey(ignore + resizableWindow))
                         PlayerSettings.resizableWindow = recommended_ResizableWindow;
                     if (!EditorPrefs.HasKey(ignore + visibleInBackground))
@@ -648,8 +654,10 @@ public void OnGUI()
                             EditorPrefs.SetBool(ignore + defaultScreenSize, true);
                         if (PlayerSettings.runInBackground != recommended_RunInBackground)
                             EditorPrefs.SetBool(ignore + runInBackground, true);
+#if !UNITY_2019_1_OR_NEWER
                         if (PlayerSettings.displayResolutionDialog != recommended_DisplayResolutionDialog)
                             EditorPrefs.SetBool(ignore + displayResolutionDialog, true);
+#endif
                         if (PlayerSettings.resizableWindow != recommended_ResizableWindow)
                             EditorPrefs.SetBool(ignore + resizableWindow, true);
                         if (PlayerSettings.visibleInBackground != recommended_VisibleInBackground)

Assets/SteamVR/Extras/SteamVR_LaserPointer.unity

@@ -102,7 +102,6 @@ GameObject:
   - 135: {fileID: 24851823}
   - 23: {fileID: 24851822}
   - 54: {fileID: 24851821}
-  - 114: {fileID: 24851826}
   m_Layer: 0
   m_Name: Sphere
   m_TagString: Untagged
@@ -186,47 +185,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 3
---- !u!114 &24851826
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 24851820}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 23cd37f308d6fc040873615e9982a85e, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!21 &274413288
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: Sprites/Default
-  m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 5
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  m_SavedProperties:
-    serializedVersion: 2
-    m_TexEnvs:
-    - first:
-        name: _MainTex
-      second:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - first:
-        name: PixelSnap
-      second: 0
-    m_Colors:
-    - first:
-        name: _Color
-      second: {r: 1, g: 1, b: 1, a: 1}
---- !u!43 &907364991
+--- !u!43 &33627688
 Mesh:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
@@ -354,6 +313,35 @@ Mesh:
   m_BakedConvexCollisionMesh: 
   m_BakedTriangleCollisionMesh: 
   m_MeshOptimized: 0
+--- !u!21 &1231479188
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Sprites/Default
+  m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 5
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  m_SavedProperties:
+    serializedVersion: 2
+    m_TexEnvs:
+    - first:
+        name: _MainTex
+      second:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - first:
+        name: PixelSnap
+      second: 0
+    m_Colors:
+    - first:
+        name: _Color
+      second: {r: 1, g: 1, b: 1, a: 1}
 --- !u!1001 &1474170597
 Prefab:
   m_ObjectHideFlags: 0
@@ -396,11 +384,11 @@ Prefab:
     - target: {fileID: 3380982, guid: 4d293c8e162f3874b982baadd71153d2, type: 2}
       propertyPath: m_Mesh
       value: 
-      objectReference: {fileID: 907364991}
+      objectReference: {fileID: 33627688}
     - target: {fileID: 2348914, guid: 4d293c8e162f3874b982baadd71153d2, type: 2}
       propertyPath: m_Materials.Array.data[0]
       value: 
-      objectReference: {fileID: 274413288}
+      objectReference: {fileID: 1231479188}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 4d293c8e162f3874b982baadd71153d2, type: 2}
   m_IsPrefabParent: 0
@@ -424,9 +412,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   pose: {fileID: 0}
-  interactWithUI:
-    actionPath: /actions/default/in/InteractUI
-    needsReinit: 0
+  interactWithUI: {fileID: 11400000, guid: 4a1ec738249f25e4f824949a16c0b085, type: 2}
   active: 1
   color: {r: 0, g: 0, b: 0, a: 0}
   thickness: 0.002
@@ -447,9 +433,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   pose: {fileID: 0}
-  interactWithUI:
-    actionPath: /actions/default/in/InteractUI
-    needsReinit: 0
+  interactWithUI: {fileID: 11400000, guid: 4a1ec738249f25e4f824949a16c0b085, type: 2}
   active: 1
   color: {r: 0, g: 0, b: 0, a: 0}
   thickness: 0.002

Assets/SteamVR/Input/Editor/SteamVR_Input_PostProcessBuild.cs

@@ -14,7 +14,7 @@ public static void OnPostprocessBuild(BuildTarget target, string pathToBuiltProj
             SteamVR_Input.InitializeFile();
 
             FileInfo fileInfo = new FileInfo(pathToBuiltProject);
-            string buildPath = fileInfo.Directory.FullName;
+            string buildPath = Path.Combine(fileInfo.Directory.FullName, Path.GetDirectoryName(SteamVR_Settings.instance.actionsFilePath));
 
             bool overwrite = EditorPrefs.GetBool(SteamVR_Input_Generator.steamVRInputOverwriteBuildKey);
 

Assets/SteamVR/Input/SteamVR_Action_Pose.cs

@@ -572,8 +572,11 @@ public virtual void UpdateValue(bool skipStateAndEventUpdates)
                 Debug.LogError("<b>[SteamVR]</b> GetPoseActionData error (" + fullPath + "): " + err.ToString() + " Handle: " + handle.ToString() + ". Input source: " + inputSource.ToString());
             }
 
-            SetCacheVariables();
-            changed = GetChanged();
+            if (active)
+            {
+                SetCacheVariables();
+                changed = GetChanged();
+            }
 
             if (changed)
                 changedTime = updateTime;