[email protected]

## [1.2.8] - 2021-07-29 * Fixed an issue that was causing Oculus Android OpenGL builds to stop working after v31 of the oculus software was installed. * Fixed a bug that would cause Asset Bundles to fail building in some circumstances when OpenXR was included in the project. * Fixed a crash that would occur if XR was shut down from within a Feature callback. * Fixed a bug that was causing duplicate entries in the OpenXR Package Settings file. * Fixed a bug causing angular velocities on both the HMD and controllers to have the wrong sign when compared to the other Unity XR plugins
needle-mirror · Jul 29, 2021 · 0abaa89 · 0abaa89
1 parent 87d0c03
commit 0abaa89
Show file tree

Hide file tree

Showing 103 changed files with 173 additions and 96 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.2.8] - 2021-07-29
+* Fixed an issue that was causing Oculus Android OpenGL builds to stop working after v31 of the oculus software was installed.
+* Fixed a bug that would cause Asset Bundles to fail building in some circumstances when OpenXR was included in the project.
+* Fixed a crash that would occur if XR was shut down from within a Feature callback.
+* Fixed a bug that was causing duplicate entries in the OpenXR Package Settings file.
+* Fixed a bug causing angular velocities on both the HMD and controllers to have the wrong sign when compared to the other Unity XR plugins
+
 ## [1.2.3] - 2021-06-17
 * Updated OpenXR Loader to 1.0.17 
 * Fixed missing haptic output on HTC Vive controller profile

diff --git a/ConformanceAutomation/android.meta b/ConformanceAutomation/android.meta
diff --git a/ConformanceAutomation/android/arm64.meta b/ConformanceAutomation/android/arm64.meta
diff --git a/ConformanceAutomation/android/arm64/ConformanceAutomationExt.so.meta b/ConformanceAutomation/android/arm64/ConformanceAutomationExt.so.meta
diff --git a/ConformanceAutomation/universalwindows.meta b/ConformanceAutomation/universalwindows.meta
diff --git a/ConformanceAutomation/universalwindows/arm32.meta b/ConformanceAutomation/universalwindows/arm32.meta
diff --git a/ConformanceAutomation/universalwindows/arm32/ConformanceAutomationExt.dll b/ConformanceAutomation/universalwindows/arm32/ConformanceAutomationExt.dll
diff --git a/ConformanceAutomation/universalwindows/arm32/ConformanceAutomationExt.dll.meta b/ConformanceAutomation/universalwindows/arm32/ConformanceAutomationExt.dll.meta
diff --git a/ConformanceAutomation/universalwindows/arm64.meta b/ConformanceAutomation/universalwindows/arm64.meta
diff --git a/ConformanceAutomation/universalwindows/arm64/ConformanceAutomationExt.dll b/ConformanceAutomation/universalwindows/arm64/ConformanceAutomationExt.dll
diff --git a/ConformanceAutomation/universalwindows/arm64/ConformanceAutomationExt.dll.meta b/ConformanceAutomation/universalwindows/arm64/ConformanceAutomationExt.dll.meta
diff --git a/ConformanceAutomation/universalwindows/x64.meta b/ConformanceAutomation/universalwindows/x64.meta
diff --git a/ConformanceAutomation/universalwindows/x64/ConformanceAutomationExt.dll b/ConformanceAutomation/universalwindows/x64/ConformanceAutomationExt.dll
diff --git a/ConformanceAutomation/universalwindows/x64/ConformanceAutomationExt.dll.meta b/ConformanceAutomation/universalwindows/x64/ConformanceAutomationExt.dll.meta
diff --git a/ConformanceAutomation/windows.meta b/ConformanceAutomation/windows.meta
diff --git a/ConformanceAutomation/windows/x64.meta b/ConformanceAutomation/windows/x64.meta
diff --git a/ConformanceAutomation/windows/x64/ConformanceAutomationExt.dll b/ConformanceAutomation/windows/x64/ConformanceAutomationExt.dll
diff --git a/ConformanceAutomation/windows/x64/ConformanceAutomationExt.dll.meta b/ConformanceAutomation/windows/x64/ConformanceAutomationExt.dll.meta
diff --git a/Editor/FeatureSupport/FeatureHelpers.cs b/Editor/FeatureSupport/FeatureHelpers.cs
@@ -141,7 +141,6 @@ public static AllFeatureInfo GetAllFeatureInfo(BuildTargetGroup group)
             var openXrSettings = OpenXRPackageSettings.GetOrCreateInstance().GetSettingsForBuildTargetGroup(group);
             if (openXrSettings == null)
             {
-                Debug.LogError("Invalid OpenXR Settings");
                 return ret;
             }
 

diff --git a/Editor/FeatureSupport/OpenXRChooseRuntimeLibraries.cs b/Editor/FeatureSupport/OpenXRChooseRuntimeLibraries.cs
@@ -109,5 +109,20 @@ public void OnPreprocessBuild(BuildReport report)
                 }
             }
         }
+
+        [InitializeOnLoadMethod]
+        static void InitializeOnLoad ()
+        {
+            var importers = PluginImporter.GetAllImporters();
+
+            // fixes asset bundle building since IPreProcessBuildWithReport isn't called
+            foreach (var importer in importers)
+            {
+                if (importer.assetPath.Contains("openxr_loader"))
+                {
+                    importer.SetIncludeInBuildDelegate(path => false);
+                }
+            }
+        }
     }
 }
diff --git a/Editor/FeatureSupport/OpenXRFeatureSetManager.cs b/Editor/FeatureSupport/OpenXRFeatureSetManager.cs
@@ -18,22 +18,17 @@ namespace UnityEditor.XR.OpenXR.Features
     [InitializeOnLoad]
     public static class OpenXRFeatureSetManager
     {
-
-        static OpenXRFeatureSetManager()
-        {
-            OpenXRFeature.canSetFeatureDisabled = CanFeatureBeDisabled;
-            AssemblyReloadEvents.afterAssemblyReload += OnAssemblyReload;
-        }
-
-        static void OnAssemblyReload()
+        [InitializeOnLoadMethod]
+        static void InitializeOnLoad ()
         {
-            InitializeFeatureSets();
-        }
+            void OnFirstUpdate()
+            {
+                EditorApplication.update -= OnFirstUpdate;
+                InitializeFeatureSets();
+            }
 
-        internal static void FirstRunInitOfFeatureSets()
-        {
-            EditorApplication.update -= FirstRunInitOfFeatureSets;
-            InitializeFeatureSets();
+            OpenXRFeature.canSetFeatureDisabled = CanFeatureBeDisabled;
+            EditorApplication.update += OnFirstUpdate;
         }
 
         /// <summary>

diff --git a/Editor/OpenXRPackageSettings.cs b/Editor/OpenXRPackageSettings.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using UnityEditor.XR.OpenXR.Features;
 using UnityEditor.Build;
+using UnityEditor.Experimental;
 using UnityEngine;
 using UnityEngine.XR.Management;
 using UnityEngine.XR.OpenXR;
@@ -100,12 +102,23 @@ public string GetActiveLoaderLibraryPath()
             return OpenXRChooseRuntimeLibraries.GetLoaderLibraryPath();
         }
 
+        private bool IsValidBuildTargetGroup(BuildTargetGroup buildTargetGroup) =>
+            buildTargetGroup == BuildTargetGroup.Standalone ||
+            Enum.GetValues(typeof(BuildTarget)).Cast<BuildTarget>().Any(bt =>
+            {
+                var group = BuildPipeline.GetBuildTargetGroup(bt);
+                return group == buildTargetGroup && BuildPipeline.IsBuildTargetSupported(group, bt);
+            });
+
         public OpenXRSettings GetSettingsForBuildTargetGroup(BuildTargetGroup buildTargetGroup)
         {
             OpenXRSettings ret = null;
             Settings.TryGetValue(buildTargetGroup, out ret);
             if (ret == null)
             {
+                if (!IsValidBuildTargetGroup(buildTargetGroup))
+                    return null;
+
                 ret = ScriptableObject.CreateInstance<OpenXRSettings>();
                 if (Settings.ContainsKey(buildTargetGroup))
                 {

diff --git a/MockDriver/windows.meta b/MockDriver/windows.meta
diff --git a/MockDriver/windows/x64.meta b/MockDriver/windows/x64.meta
diff --git a/MockDriver/windows/x64/mock_driver.dll b/MockDriver/windows/x64/mock_driver.dll
diff --git a/MockDriver/windows/x64/mock_driver.dll.meta b/MockDriver/windows/x64/mock_driver.dll.meta
diff --git a/MockRuntime/windows.meta b/MockRuntime/windows.meta
diff --git a/MockRuntime/windows/x64.meta b/MockRuntime/windows/x64.meta
diff --git a/MockRuntime/windows/x64/openxr_loader.dll b/MockRuntime/windows/x64/openxr_loader.dll
diff --git a/MockRuntime/windows/x64/openxr_loader.dll.meta b/MockRuntime/windows/x64/openxr_loader.dll.meta
diff --git a/Runtime/Features/OpenXRFeature.cs b/Runtime/Features/OpenXRFeature.cs
@@ -376,7 +376,6 @@ internal static void GetValidationList(List<ValidationRule> rules, BuildTargetGr
             var openXrSettings = OpenXRSettings.GetSettingsForBuildTargetGroup(targetGroup);
             if (openXrSettings == null)
             {
-                Debug.LogError("Invalid OpenXR Settings");
                 return;
             }
 

diff --git a/Runtime/UnitySubsystemsManifest.json b/Runtime/UnitySubsystemsManifest.json
@@ -1,6 +1,6 @@
 {
         "name": "OpenXR XR Plugin",
-        "version": "1.2.3",
+        "version": "1.2.8",
         "libraryName": "UnityOpenXR",
         "displays": [
                 {

diff --git a/Runtime/android.meta b/Runtime/android.meta
diff --git a/Runtime/android/arm64.meta b/Runtime/android/arm64.meta
diff --git a/Runtime/android/arm64/libUnityOpenXR.so b/Runtime/android/arm64/libUnityOpenXR.so
diff --git a/Runtime/android/arm64/libUnityOpenXR.so.meta b/Runtime/android/arm64/libUnityOpenXR.so.meta
diff --git a/Runtime/universalwindows.meta b/Runtime/universalwindows.meta
diff --git a/Runtime/universalwindows/arm32.meta b/Runtime/universalwindows/arm32.meta
diff --git a/Runtime/universalwindows/arm32/UnityOpenXR.dll b/Runtime/universalwindows/arm32/UnityOpenXR.dll
diff --git a/Runtime/universalwindows/arm32/UnityOpenXR.dll.meta b/Runtime/universalwindows/arm32/UnityOpenXR.dll.meta
diff --git a/Runtime/universalwindows/arm64.meta b/Runtime/universalwindows/arm64.meta
diff --git a/Runtime/universalwindows/arm64/UnityOpenXR.dll b/Runtime/universalwindows/arm64/UnityOpenXR.dll
diff --git a/Runtime/universalwindows/arm64/UnityOpenXR.dll.meta b/Runtime/universalwindows/arm64/UnityOpenXR.dll.meta
diff --git a/Runtime/universalwindows/x64.meta b/Runtime/universalwindows/x64.meta
diff --git a/Runtime/universalwindows/x64/UnityOpenXR.dll b/Runtime/universalwindows/x64/UnityOpenXR.dll
diff --git a/Runtime/universalwindows/x64/UnityOpenXR.dll.meta b/Runtime/universalwindows/x64/UnityOpenXR.dll.meta
diff --git a/Runtime/windows.meta b/Runtime/windows.meta
diff --git a/Runtime/windows/x64.meta b/Runtime/windows/x64.meta
diff --git a/Runtime/windows/x64/UnityOpenXR.dll b/Runtime/windows/x64/UnityOpenXR.dll
diff --git a/Runtime/windows/x64/UnityOpenXR.dll.meta b/Runtime/windows/x64/UnityOpenXR.dll.meta
diff --git a/RuntimeDebugger/android.meta b/RuntimeDebugger/android.meta
diff --git a/RuntimeDebugger/android/arm64.meta b/RuntimeDebugger/android/arm64.meta
diff --git a/RuntimeDebugger/android/arm64/libopenxr_runtime_debugger.so.meta b/RuntimeDebugger/android/arm64/libopenxr_runtime_debugger.so.meta
diff --git a/RuntimeDebugger/universalwindows.meta b/RuntimeDebugger/universalwindows.meta
diff --git a/RuntimeDebugger/universalwindows/arm32.meta b/RuntimeDebugger/universalwindows/arm32.meta
diff --git a/RuntimeDebugger/universalwindows/arm32/openxr_runtime_debugger.dll b/RuntimeDebugger/universalwindows/arm32/openxr_runtime_debugger.dll
diff --git a/RuntimeDebugger/universalwindows/arm32/openxr_runtime_debugger.dll.meta b/RuntimeDebugger/universalwindows/arm32/openxr_runtime_debugger.dll.meta
diff --git a/RuntimeDebugger/universalwindows/arm64.meta b/RuntimeDebugger/universalwindows/arm64.meta
diff --git a/RuntimeDebugger/universalwindows/arm64/openxr_runtime_debugger.dll b/RuntimeDebugger/universalwindows/arm64/openxr_runtime_debugger.dll
-Original file line number
+Diff line change
@@ Expand Up @@
                 var openXrSettings = OpenXRSettings.GetSettingsForBuildTargetGroup(targetGroup);
                 if (openXrSettings == null)
                 {
-                    Debug.LogError("Invalid OpenXR Settings");
                     return;
                 }
@@ Expand Down @@