diff --git a/CHANGELOG.md b/CHANGELOG.md index c8c511e..1a12175 100644 --- 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 index 1956a72..bc25424 100644 --- a/ConformanceAutomation/android.meta +++ b/ConformanceAutomation/android.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a0d0e2b426744d7ea6944dcfaa6cf27d +guid: 1f52cd0d4b6446c7bf8d693801c00c92 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/ConformanceAutomation/android/arm64.meta b/ConformanceAutomation/android/arm64.meta index a0b4a9a..ff7c4bc 100644 --- a/ConformanceAutomation/android/arm64.meta +++ b/ConformanceAutomation/android/arm64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5482e40c06504862a0ab9af2951d7043 +guid: 9401590f41ee497a8a2c859bb9b69349 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/ConformanceAutomation/android/arm64/ConformanceAutomationExt.so.meta b/ConformanceAutomation/android/arm64/ConformanceAutomationExt.so.meta index 72c9742..dcc0cd5 100644 --- a/ConformanceAutomation/android/arm64/ConformanceAutomationExt.so.meta +++ b/ConformanceAutomation/android/arm64/ConformanceAutomationExt.so.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a84e0574211940c4bc5b073827b30726 +guid: cfd194b205c94ef19795b88365fc935d PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/ConformanceAutomation/universalwindows.meta b/ConformanceAutomation/universalwindows.meta index ea2936f..274f1ed 100644 --- a/ConformanceAutomation/universalwindows.meta +++ b/ConformanceAutomation/universalwindows.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4b4a5fe4532e4526a38e9f97e2f91379 +guid: 37bcdcaeed26491f93217465d8955c06 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/ConformanceAutomation/universalwindows/arm32.meta b/ConformanceAutomation/universalwindows/arm32.meta index 888a244..cd3fc9b 100644 --- a/ConformanceAutomation/universalwindows/arm32.meta +++ b/ConformanceAutomation/universalwindows/arm32.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 41048c1af6504741ae4718108c039180 +guid: 6c9822c47f674464a024dbfe861ec702 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/ConformanceAutomation/universalwindows/arm32/ConformanceAutomationExt.dll b/ConformanceAutomation/universalwindows/arm32/ConformanceAutomationExt.dll index 9801c91..bed228a 100644 Binary files a/ConformanceAutomation/universalwindows/arm32/ConformanceAutomationExt.dll and b/ConformanceAutomation/universalwindows/arm32/ConformanceAutomationExt.dll differ diff --git a/ConformanceAutomation/universalwindows/arm32/ConformanceAutomationExt.dll.meta b/ConformanceAutomation/universalwindows/arm32/ConformanceAutomationExt.dll.meta index 9671f28..3fc2f4a 100644 --- a/ConformanceAutomation/universalwindows/arm32/ConformanceAutomationExt.dll.meta +++ b/ConformanceAutomation/universalwindows/arm32/ConformanceAutomationExt.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: eec95efe79f749539ef541b6af0faabd +guid: 93b662ef01974753aa6120b2f698f2e6 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/ConformanceAutomation/universalwindows/arm64.meta b/ConformanceAutomation/universalwindows/arm64.meta index e4f723f..3fae95e 100644 --- a/ConformanceAutomation/universalwindows/arm64.meta +++ b/ConformanceAutomation/universalwindows/arm64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a1bc197469554d0ba7dcb81d71bfd328 +guid: 3f4a6053d7e94a37bd15e1bf1935786c folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/ConformanceAutomation/universalwindows/arm64/ConformanceAutomationExt.dll b/ConformanceAutomation/universalwindows/arm64/ConformanceAutomationExt.dll index 494abf5..b8a47ee 100644 Binary files a/ConformanceAutomation/universalwindows/arm64/ConformanceAutomationExt.dll and b/ConformanceAutomation/universalwindows/arm64/ConformanceAutomationExt.dll differ diff --git a/ConformanceAutomation/universalwindows/arm64/ConformanceAutomationExt.dll.meta b/ConformanceAutomation/universalwindows/arm64/ConformanceAutomationExt.dll.meta index 7a31c74..099a555 100644 --- a/ConformanceAutomation/universalwindows/arm64/ConformanceAutomationExt.dll.meta +++ b/ConformanceAutomation/universalwindows/arm64/ConformanceAutomationExt.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a8697ce9a9b545beb373f3a347f38c2e +guid: ccc1b8ba221344a4b8e52f88bb396a9a PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/ConformanceAutomation/universalwindows/x64.meta b/ConformanceAutomation/universalwindows/x64.meta index added12..eea855c 100644 --- a/ConformanceAutomation/universalwindows/x64.meta +++ b/ConformanceAutomation/universalwindows/x64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 076416c27e104da8ab0c83b9ec706992 +guid: 587b8c866c6344f183ebfdcf86a128e1 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/ConformanceAutomation/universalwindows/x64/ConformanceAutomationExt.dll b/ConformanceAutomation/universalwindows/x64/ConformanceAutomationExt.dll index c71b752..bddbd39 100644 Binary files a/ConformanceAutomation/universalwindows/x64/ConformanceAutomationExt.dll and b/ConformanceAutomation/universalwindows/x64/ConformanceAutomationExt.dll differ diff --git a/ConformanceAutomation/universalwindows/x64/ConformanceAutomationExt.dll.meta b/ConformanceAutomation/universalwindows/x64/ConformanceAutomationExt.dll.meta index c81c6c2..4ccd678 100644 --- a/ConformanceAutomation/universalwindows/x64/ConformanceAutomationExt.dll.meta +++ b/ConformanceAutomation/universalwindows/x64/ConformanceAutomationExt.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: eea334ccb4a74004ab2c3e7540a64dbe +guid: 6813936421b94d82a8bfdb0147a74c3a PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/ConformanceAutomation/windows.meta b/ConformanceAutomation/windows.meta index b5f2108..2834d5d 100644 --- a/ConformanceAutomation/windows.meta +++ b/ConformanceAutomation/windows.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2ba8039a177744ed9b94fce23921e9e2 +guid: 4f9b25da9eaa4751a252a76c557b0664 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/ConformanceAutomation/windows/x64.meta b/ConformanceAutomation/windows/x64.meta index 8e04fcf..f761959 100644 --- a/ConformanceAutomation/windows/x64.meta +++ b/ConformanceAutomation/windows/x64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3c157d0e48284f72a140cc0a91efb4d0 +guid: 1bda32222ff04c39b21161724bd289bf folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/ConformanceAutomation/windows/x64/ConformanceAutomationExt.dll b/ConformanceAutomation/windows/x64/ConformanceAutomationExt.dll index 10e60a9..a00de61 100644 Binary files a/ConformanceAutomation/windows/x64/ConformanceAutomationExt.dll and b/ConformanceAutomation/windows/x64/ConformanceAutomationExt.dll differ diff --git a/ConformanceAutomation/windows/x64/ConformanceAutomationExt.dll.meta b/ConformanceAutomation/windows/x64/ConformanceAutomationExt.dll.meta index 3f20166..1bbcc8d 100644 --- a/ConformanceAutomation/windows/x64/ConformanceAutomationExt.dll.meta +++ b/ConformanceAutomation/windows/x64/ConformanceAutomationExt.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 78f206e486414733a6bc183a38b23de3 +guid: 9de947cdea2a45e1ab724b8ea1f26ffd PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Editor/FeatureSupport/FeatureHelpers.cs b/Editor/FeatureSupport/FeatureHelpers.cs index a6fd639..a8749c5 100644 --- 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 index a1cb451..721f0ee 100644 --- 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 index a4dc42e..631876b 100644 --- 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; } /// diff --git a/Editor/OpenXRPackageSettings.cs b/Editor/OpenXRPackageSettings.cs index 06ed0b0..d8e620f 100644 --- 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().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(); if (Settings.ContainsKey(buildTargetGroup)) { diff --git a/MockDriver/windows.meta b/MockDriver/windows.meta index 8c2f6bf..446ad07 100644 --- a/MockDriver/windows.meta +++ b/MockDriver/windows.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4a37aeff29c4409c939f3992ef2febbe +guid: f405f81821834d20814bdc4cd10b8b66 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/MockDriver/windows/x64.meta b/MockDriver/windows/x64.meta index c1c4144..c83a1bd 100644 --- a/MockDriver/windows/x64.meta +++ b/MockDriver/windows/x64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9d24f06c8a9a412ea2c8e0fca091008e +guid: c2f3c78b211c4b12a0ef1c5a520e961f folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/MockDriver/windows/x64/mock_driver.dll b/MockDriver/windows/x64/mock_driver.dll index a458884..1b0345d 100644 Binary files a/MockDriver/windows/x64/mock_driver.dll and b/MockDriver/windows/x64/mock_driver.dll differ diff --git a/MockDriver/windows/x64/mock_driver.dll.meta b/MockDriver/windows/x64/mock_driver.dll.meta index eabf0fd..7e7ae2c 100644 --- a/MockDriver/windows/x64/mock_driver.dll.meta +++ b/MockDriver/windows/x64/mock_driver.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: be0ba1f5294b4ecdb9a93a4292d693a9 +guid: 4639d3bada184a1896d64fc5b095ec5a PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/MockRuntime/windows.meta b/MockRuntime/windows.meta index 9d0ba6d..e634210 100644 --- a/MockRuntime/windows.meta +++ b/MockRuntime/windows.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4960d7811c41479a85e1beabf36e03d0 +guid: 7468c4fe10eb4dbd9b0ce755edfa5e7a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/MockRuntime/windows/x64.meta b/MockRuntime/windows/x64.meta index f60ef50..ac755fe 100644 --- a/MockRuntime/windows/x64.meta +++ b/MockRuntime/windows/x64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ff003243c0b1475c91e4b118d0b01ebe +guid: ce2b0cb136d644d4868fb4a5dbae3764 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/MockRuntime/windows/x64/openxr_loader.dll b/MockRuntime/windows/x64/openxr_loader.dll index 56deff3..2930f5f 100644 Binary files a/MockRuntime/windows/x64/openxr_loader.dll and b/MockRuntime/windows/x64/openxr_loader.dll differ diff --git a/MockRuntime/windows/x64/openxr_loader.dll.meta b/MockRuntime/windows/x64/openxr_loader.dll.meta index fc74237..34ee812 100644 --- a/MockRuntime/windows/x64/openxr_loader.dll.meta +++ b/MockRuntime/windows/x64/openxr_loader.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7b0924814a4a43f59d38662a0532c4ce +guid: 1f1b2884912e476b84b5901e6b52d041 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Runtime/Features/OpenXRFeature.cs b/Runtime/Features/OpenXRFeature.cs index fef2a50..9848c41 100644 --- a/Runtime/Features/OpenXRFeature.cs +++ b/Runtime/Features/OpenXRFeature.cs @@ -376,7 +376,6 @@ internal static void GetValidationList(List 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 index 0b8d419..133bb26 100644 --- 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 index d115a5e..c28d319 100644 --- a/Runtime/android.meta +++ b/Runtime/android.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 06cdd88730ef46659516afd577056c06 +guid: 701e122c7d384cc2959784ca63952ef4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/android/arm64.meta b/Runtime/android/arm64.meta index 0a213fe..994527a 100644 --- a/Runtime/android/arm64.meta +++ b/Runtime/android/arm64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1353eadf04b64e93ad676ea1e9a7101e +guid: ff165657e73c4ed18ee5415c31183f87 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/android/arm64/libUnityOpenXR.so b/Runtime/android/arm64/libUnityOpenXR.so index 80567b6..b89c0a7 100644 Binary files a/Runtime/android/arm64/libUnityOpenXR.so and b/Runtime/android/arm64/libUnityOpenXR.so differ diff --git a/Runtime/android/arm64/libUnityOpenXR.so.meta b/Runtime/android/arm64/libUnityOpenXR.so.meta index 3568f01..af446f7 100644 --- a/Runtime/android/arm64/libUnityOpenXR.so.meta +++ b/Runtime/android/arm64/libUnityOpenXR.so.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b4e2d562671044768654a683819aef90 +guid: 8163d60d78d04e38889b2e07ec28049e PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Runtime/universalwindows.meta b/Runtime/universalwindows.meta index 9f1fb71..077f4bc 100644 --- a/Runtime/universalwindows.meta +++ b/Runtime/universalwindows.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d0ff383edaeb48089efb319a481cbbb0 +guid: f8572798b57e4190b874b78994e40060 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/universalwindows/arm32.meta b/Runtime/universalwindows/arm32.meta index 8d787c6..5eb5afa 100644 --- a/Runtime/universalwindows/arm32.meta +++ b/Runtime/universalwindows/arm32.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8c4d19d21b694d01847e086d791947f6 +guid: f12aa730d6e54bbfa31cee62d7769b5e folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/universalwindows/arm32/UnityOpenXR.dll b/Runtime/universalwindows/arm32/UnityOpenXR.dll index d02a519..259db97 100644 Binary files a/Runtime/universalwindows/arm32/UnityOpenXR.dll and b/Runtime/universalwindows/arm32/UnityOpenXR.dll differ diff --git a/Runtime/universalwindows/arm32/UnityOpenXR.dll.meta b/Runtime/universalwindows/arm32/UnityOpenXR.dll.meta index a24a7e0..2028dbf 100644 --- a/Runtime/universalwindows/arm32/UnityOpenXR.dll.meta +++ b/Runtime/universalwindows/arm32/UnityOpenXR.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0ffcadfe0f094b9da4803b86b4cb3fc7 +guid: 7d2e9c39fe824966ac27308cc57ae16b PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Runtime/universalwindows/arm64.meta b/Runtime/universalwindows/arm64.meta index 8fa2c55..59323d3 100644 --- a/Runtime/universalwindows/arm64.meta +++ b/Runtime/universalwindows/arm64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 63d36e9d16b54899977d4d5e8b3c0eee +guid: 0db52525fb7541b7add63544b40d5761 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/universalwindows/arm64/UnityOpenXR.dll b/Runtime/universalwindows/arm64/UnityOpenXR.dll index de0a377..3784dbb 100644 Binary files a/Runtime/universalwindows/arm64/UnityOpenXR.dll and b/Runtime/universalwindows/arm64/UnityOpenXR.dll differ diff --git a/Runtime/universalwindows/arm64/UnityOpenXR.dll.meta b/Runtime/universalwindows/arm64/UnityOpenXR.dll.meta index 0fec524..f1f0bd7 100644 --- a/Runtime/universalwindows/arm64/UnityOpenXR.dll.meta +++ b/Runtime/universalwindows/arm64/UnityOpenXR.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7ecd3d5b4e334440b226d06e03a34a24 +guid: 8d187bc31e5643d183783195aa0ef47e PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Runtime/universalwindows/x64.meta b/Runtime/universalwindows/x64.meta index 8056460..3a94e46 100644 --- a/Runtime/universalwindows/x64.meta +++ b/Runtime/universalwindows/x64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a6d6f6ca25a24fe29522385831c3686e +guid: 10d9053652a042868b8aafe7804b43b2 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/universalwindows/x64/UnityOpenXR.dll b/Runtime/universalwindows/x64/UnityOpenXR.dll index 1967062..538d577 100644 Binary files a/Runtime/universalwindows/x64/UnityOpenXR.dll and b/Runtime/universalwindows/x64/UnityOpenXR.dll differ diff --git a/Runtime/universalwindows/x64/UnityOpenXR.dll.meta b/Runtime/universalwindows/x64/UnityOpenXR.dll.meta index 69e918e..a87e332 100644 --- a/Runtime/universalwindows/x64/UnityOpenXR.dll.meta +++ b/Runtime/universalwindows/x64/UnityOpenXR.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 59044b66b87c45a0ae772c7a9a9b2a1f +guid: 7541b038a2ca4795acf65d75d926f604 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Runtime/windows.meta b/Runtime/windows.meta index 553e2cf..51d4021 100644 --- a/Runtime/windows.meta +++ b/Runtime/windows.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 451961f63ebf47928affcadd3f113403 +guid: d8d54563b62a4ecb9cb1e0c1477f10fe folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/windows/x64.meta b/Runtime/windows/x64.meta index 93adc6e..98e6ee3 100644 --- a/Runtime/windows/x64.meta +++ b/Runtime/windows/x64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 86363599a86741b2830e2a79ae9dbb2a +guid: 061aaa4ccbc54c479907f7a7443fe4d0 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/windows/x64/UnityOpenXR.dll b/Runtime/windows/x64/UnityOpenXR.dll index 660ef97..c5fa1b5 100644 Binary files a/Runtime/windows/x64/UnityOpenXR.dll and b/Runtime/windows/x64/UnityOpenXR.dll differ diff --git a/Runtime/windows/x64/UnityOpenXR.dll.meta b/Runtime/windows/x64/UnityOpenXR.dll.meta index 3b1da5d..8e20a92 100644 --- a/Runtime/windows/x64/UnityOpenXR.dll.meta +++ b/Runtime/windows/x64/UnityOpenXR.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f18e04e1625744dc99a2f583832084a5 +guid: da87a00b6509464d9e85146f1d53dfb5 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/RuntimeDebugger/android.meta b/RuntimeDebugger/android.meta index 66aa421..8297e2e 100644 --- a/RuntimeDebugger/android.meta +++ b/RuntimeDebugger/android.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6e57248d19d44c4cb8c08dfacbf9cdf1 +guid: 0f44819b48ac49c6aa5bbf3ec6a88c6a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/RuntimeDebugger/android/arm64.meta b/RuntimeDebugger/android/arm64.meta index 0b7e050..b910ddd 100644 --- a/RuntimeDebugger/android/arm64.meta +++ b/RuntimeDebugger/android/arm64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d5b7e6f3583e4f22b322d0655fce803a +guid: 629e0c7f40b44d5fbdfbf894ac14e718 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/RuntimeDebugger/android/arm64/libopenxr_runtime_debugger.so.meta b/RuntimeDebugger/android/arm64/libopenxr_runtime_debugger.so.meta index 3e6fb84..33af655 100644 --- a/RuntimeDebugger/android/arm64/libopenxr_runtime_debugger.so.meta +++ b/RuntimeDebugger/android/arm64/libopenxr_runtime_debugger.so.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 15b86871d9b24eaea21276d25469802f +guid: b0371371e28848f895c5de8aad2de6c1 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/RuntimeDebugger/universalwindows.meta b/RuntimeDebugger/universalwindows.meta index ad6c9da..4bd06f7 100644 --- a/RuntimeDebugger/universalwindows.meta +++ b/RuntimeDebugger/universalwindows.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2b541655ff0348ca9d81ac1a12650dca +guid: b98ba768ef354a4f9e2a242915acfe2f folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/RuntimeDebugger/universalwindows/arm32.meta b/RuntimeDebugger/universalwindows/arm32.meta index d8a7c04..bd0120c 100644 --- a/RuntimeDebugger/universalwindows/arm32.meta +++ b/RuntimeDebugger/universalwindows/arm32.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5f018d32d9e0404db96a5d37f5b763ca +guid: ff23edb96b784224837cc743d57aa6b8 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/RuntimeDebugger/universalwindows/arm32/openxr_runtime_debugger.dll b/RuntimeDebugger/universalwindows/arm32/openxr_runtime_debugger.dll index b2d0d5e..b1b6dde 100644 Binary files a/RuntimeDebugger/universalwindows/arm32/openxr_runtime_debugger.dll and b/RuntimeDebugger/universalwindows/arm32/openxr_runtime_debugger.dll differ diff --git a/RuntimeDebugger/universalwindows/arm32/openxr_runtime_debugger.dll.meta b/RuntimeDebugger/universalwindows/arm32/openxr_runtime_debugger.dll.meta index 26895ea..9078832 100644 --- a/RuntimeDebugger/universalwindows/arm32/openxr_runtime_debugger.dll.meta +++ b/RuntimeDebugger/universalwindows/arm32/openxr_runtime_debugger.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6f65000aaf46434ca5062bb6a2d7a330 +guid: 239aeff87d444d9bb89c6f3cdb928237 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/RuntimeDebugger/universalwindows/arm64.meta b/RuntimeDebugger/universalwindows/arm64.meta index 4a02f65..a2d4e4d 100644 --- a/RuntimeDebugger/universalwindows/arm64.meta +++ b/RuntimeDebugger/universalwindows/arm64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c9ba42662aec406586dc9e7325ab8657 +guid: b9418df954c64b9ab2219af31cc0483c folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/RuntimeDebugger/universalwindows/arm64/openxr_runtime_debugger.dll b/RuntimeDebugger/universalwindows/arm64/openxr_runtime_debugger.dll index 53a2524..9afc051 100644 Binary files a/RuntimeDebugger/universalwindows/arm64/openxr_runtime_debugger.dll and b/RuntimeDebugger/universalwindows/arm64/openxr_runtime_debugger.dll differ diff --git a/RuntimeDebugger/universalwindows/arm64/openxr_runtime_debugger.dll.meta b/RuntimeDebugger/universalwindows/arm64/openxr_runtime_debugger.dll.meta index 8ece206..317ffd1 100644 --- a/RuntimeDebugger/universalwindows/arm64/openxr_runtime_debugger.dll.meta +++ b/RuntimeDebugger/universalwindows/arm64/openxr_runtime_debugger.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 71f7b34531674e1cb84254fbe2dfc326 +guid: 03d71212c20f4eec902fcb867c88c3a0 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/RuntimeDebugger/universalwindows/x64.meta b/RuntimeDebugger/universalwindows/x64.meta index ff6e6cc..e036582 100644 --- a/RuntimeDebugger/universalwindows/x64.meta +++ b/RuntimeDebugger/universalwindows/x64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c61b4a64234f40f6aba4b266bbde6e06 +guid: 5a5e8c6875aa41e69d7353d0809e64c0 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/RuntimeDebugger/universalwindows/x64/openxr_runtime_debugger.dll b/RuntimeDebugger/universalwindows/x64/openxr_runtime_debugger.dll index c1f114e..eec1fb1 100644 Binary files a/RuntimeDebugger/universalwindows/x64/openxr_runtime_debugger.dll and b/RuntimeDebugger/universalwindows/x64/openxr_runtime_debugger.dll differ diff --git a/RuntimeDebugger/universalwindows/x64/openxr_runtime_debugger.dll.meta b/RuntimeDebugger/universalwindows/x64/openxr_runtime_debugger.dll.meta index 9f50164..a3a3aba 100644 --- a/RuntimeDebugger/universalwindows/x64/openxr_runtime_debugger.dll.meta +++ b/RuntimeDebugger/universalwindows/x64/openxr_runtime_debugger.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 18ace27e0d4442a186ed6f6606c0bc70 +guid: d9543b53ea684f53896868df4f3a07c8 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/RuntimeDebugger/windows.meta b/RuntimeDebugger/windows.meta index dff4da4..f3a122c 100644 --- a/RuntimeDebugger/windows.meta +++ b/RuntimeDebugger/windows.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bb6ee7d0bb804380a4574a16940c5480 +guid: e61bb235972b4a99b5646249f7373f96 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/RuntimeDebugger/windows/x64.meta b/RuntimeDebugger/windows/x64.meta index aa0ec4f..9f2c025 100644 --- a/RuntimeDebugger/windows/x64.meta +++ b/RuntimeDebugger/windows/x64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ae2bf0901abb4071973a548919796c84 +guid: 6fcda7eddb814e1783349ee6688de04d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/RuntimeDebugger/windows/x64/openxr_runtime_debugger.dll b/RuntimeDebugger/windows/x64/openxr_runtime_debugger.dll index 98ba8c8..9c29425 100644 Binary files a/RuntimeDebugger/windows/x64/openxr_runtime_debugger.dll and b/RuntimeDebugger/windows/x64/openxr_runtime_debugger.dll differ diff --git a/RuntimeDebugger/windows/x64/openxr_runtime_debugger.dll.meta b/RuntimeDebugger/windows/x64/openxr_runtime_debugger.dll.meta index 13ac93b..9a8bcac 100644 --- a/RuntimeDebugger/windows/x64/openxr_runtime_debugger.dll.meta +++ b/RuntimeDebugger/windows/x64/openxr_runtime_debugger.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 468dbd7b1fd241a88f913b6edf916356 +guid: db138a8dec7c44299868d542dc7c275f PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/RuntimeLoaders/universalwindows.meta b/RuntimeLoaders/universalwindows.meta index f72b968..01f0523 100644 --- a/RuntimeLoaders/universalwindows.meta +++ b/RuntimeLoaders/universalwindows.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7510c9f2d2844e9998fa7c90b782233d +guid: f8fc3a9927e4476c9065b0528aebc5da folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/RuntimeLoaders/universalwindows/arm32.meta b/RuntimeLoaders/universalwindows/arm32.meta index fbc0a83..7dae3b6 100644 --- a/RuntimeLoaders/universalwindows/arm32.meta +++ b/RuntimeLoaders/universalwindows/arm32.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 83de39182c4b4af5bd4f49b07fa94956 +guid: 42f73b0091664a03833b4d8ea1bab7b4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/RuntimeLoaders/universalwindows/arm32/openxr_loader.dll.meta b/RuntimeLoaders/universalwindows/arm32/openxr_loader.dll.meta index 24e8422..aa91fa1 100644 --- a/RuntimeLoaders/universalwindows/arm32/openxr_loader.dll.meta +++ b/RuntimeLoaders/universalwindows/arm32/openxr_loader.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 259c79bf050f422aafaaefb1d5f53acf +guid: 3d82b076d978462c88a59abc9b69e169 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/RuntimeLoaders/universalwindows/arm64.meta b/RuntimeLoaders/universalwindows/arm64.meta index 38df46c..238207e 100644 --- a/RuntimeLoaders/universalwindows/arm64.meta +++ b/RuntimeLoaders/universalwindows/arm64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8583151bb1854fec967dacd6847b4eeb +guid: 07d0e3a7a01d436fbdab45db5818ff36 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/RuntimeLoaders/universalwindows/arm64/openxr_loader.dll.meta b/RuntimeLoaders/universalwindows/arm64/openxr_loader.dll.meta index 3d1bbec..49be8f5 100644 --- a/RuntimeLoaders/universalwindows/arm64/openxr_loader.dll.meta +++ b/RuntimeLoaders/universalwindows/arm64/openxr_loader.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6bddd7ab03b6468b95b6d666f7cb4001 +guid: e531563ab2e3446f8934ff57c22ec614 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/RuntimeLoaders/universalwindows/x64.meta b/RuntimeLoaders/universalwindows/x64.meta index dbfdff1..db1a998 100644 --- a/RuntimeLoaders/universalwindows/x64.meta +++ b/RuntimeLoaders/universalwindows/x64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8a69bfdd10bb42588d9f618340259f02 +guid: 67183789bb41484c80eabcac37c83f29 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/RuntimeLoaders/universalwindows/x64/openxr_loader.dll.meta b/RuntimeLoaders/universalwindows/x64/openxr_loader.dll.meta index 7ca5c60..ce01ed2 100644 --- a/RuntimeLoaders/universalwindows/x64/openxr_loader.dll.meta +++ b/RuntimeLoaders/universalwindows/x64/openxr_loader.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a4b9c67e63044c0d82956dcf87504ba6 +guid: 0549026dd5f04c0895f99e422782f55e PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/RuntimeLoaders/windows.meta b/RuntimeLoaders/windows.meta index 5b79abe..a61e555 100644 --- a/RuntimeLoaders/windows.meta +++ b/RuntimeLoaders/windows.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cb4dfe99806746618446e83ba58d339b +guid: 430de85fc1b04a1bbffc541e26a26b67 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/RuntimeLoaders/windows/x64.meta b/RuntimeLoaders/windows/x64.meta index 897daf8..2250b3c 100644 --- a/RuntimeLoaders/windows/x64.meta +++ b/RuntimeLoaders/windows/x64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8a9b2e82f975488b90cfe63b52478298 +guid: 7e9f05f77fe5486ca793afb93489cf51 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/RuntimeLoaders/windows/x64/openxr_loader.dll.meta b/RuntimeLoaders/windows/x64/openxr_loader.dll.meta index 9034fe7..9984872 100644 --- a/RuntimeLoaders/windows/x64/openxr_loader.dll.meta +++ b/RuntimeLoaders/windows/x64/openxr_loader.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1ff6b29e8bd546f39966321d0fa28033 +guid: 02de100493974aa29de4466c0fb0e266 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Samples~/InterceptFeature/InterceptFeaturePlugin/android.meta b/Samples~/InterceptFeature/InterceptFeaturePlugin/android.meta index 854150e..222fd24 100644 --- a/Samples~/InterceptFeature/InterceptFeaturePlugin/android.meta +++ b/Samples~/InterceptFeature/InterceptFeaturePlugin/android.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8889aeece1284725a301c38eb80fa7de +guid: 8630f1bbf7f843cf80e4c237ade5214b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Samples~/InterceptFeature/InterceptFeaturePlugin/android/arm64.meta b/Samples~/InterceptFeature/InterceptFeaturePlugin/android/arm64.meta index 9a280bb..ea08757 100644 --- a/Samples~/InterceptFeature/InterceptFeaturePlugin/android/arm64.meta +++ b/Samples~/InterceptFeature/InterceptFeaturePlugin/android/arm64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 905450fa8b9a4c7fb4bbff9ed4f9ebba +guid: 3802f1ce80ef4165baf7c688cf0a3035 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Samples~/InterceptFeature/InterceptFeaturePlugin/universalwindows.meta b/Samples~/InterceptFeature/InterceptFeaturePlugin/universalwindows.meta index 9864adb..3ce798c 100644 --- a/Samples~/InterceptFeature/InterceptFeaturePlugin/universalwindows.meta +++ b/Samples~/InterceptFeature/InterceptFeaturePlugin/universalwindows.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3a49ed3fe3664bf8b64d27d88fcfd0ca +guid: 7c797e8224ac4df2a68c2cd62c546537 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Samples~/InterceptFeature/InterceptFeaturePlugin/universalwindows/arm32.meta b/Samples~/InterceptFeature/InterceptFeaturePlugin/universalwindows/arm32.meta index 45da3b4..0d59221 100644 --- a/Samples~/InterceptFeature/InterceptFeaturePlugin/universalwindows/arm32.meta +++ b/Samples~/InterceptFeature/InterceptFeaturePlugin/universalwindows/arm32.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 048bcf909aae4aecb6b16755f511ab61 +guid: d07d2a49de0e423da4b922e29de60bff folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Samples~/InterceptFeature/InterceptFeaturePlugin/universalwindows/arm64.meta b/Samples~/InterceptFeature/InterceptFeaturePlugin/universalwindows/arm64.meta index 1597baf..0855ae4 100644 --- a/Samples~/InterceptFeature/InterceptFeaturePlugin/universalwindows/arm64.meta +++ b/Samples~/InterceptFeature/InterceptFeaturePlugin/universalwindows/arm64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 211b234edaa94208bfbadf5d85415ffb +guid: d8a676bd6f08423e8dc6304df56d465a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Samples~/InterceptFeature/InterceptFeaturePlugin/universalwindows/x64.meta b/Samples~/InterceptFeature/InterceptFeaturePlugin/universalwindows/x64.meta index 266de80..7a50f54 100644 --- a/Samples~/InterceptFeature/InterceptFeaturePlugin/universalwindows/x64.meta +++ b/Samples~/InterceptFeature/InterceptFeaturePlugin/universalwindows/x64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 44aedf5c59be421e8a0d7d3cf651120c +guid: 0d698801a9914618977b416d44c371f3 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Samples~/InterceptFeature/InterceptFeaturePlugin/windows.meta b/Samples~/InterceptFeature/InterceptFeaturePlugin/windows.meta index dc8d0fd..f339021 100644 --- a/Samples~/InterceptFeature/InterceptFeaturePlugin/windows.meta +++ b/Samples~/InterceptFeature/InterceptFeaturePlugin/windows.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d2bf6495debf4b7c85617662fd647697 +guid: 333e58f4e2d041e098026019e51c50f4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Samples~/InterceptFeature/InterceptFeaturePlugin/windows/x64.meta b/Samples~/InterceptFeature/InterceptFeaturePlugin/windows/x64.meta index 2814f8f..1578884 100644 --- a/Samples~/InterceptFeature/InterceptFeaturePlugin/windows/x64.meta +++ b/Samples~/InterceptFeature/InterceptFeaturePlugin/windows/x64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 43b59e36cc474ba697d649841e75a520 +guid: cfe06baa9e51480b8e9b4f8c5ed6acc7 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Samples~/InterceptFeature/InterceptFeaturePlugin/windows/x64/InterceptFeaturePlugin.dll b/Samples~/InterceptFeature/InterceptFeaturePlugin/windows/x64/InterceptFeaturePlugin.dll index fff6765..3ae8884 100644 Binary files a/Samples~/InterceptFeature/InterceptFeaturePlugin/windows/x64/InterceptFeaturePlugin.dll and b/Samples~/InterceptFeature/InterceptFeaturePlugin/windows/x64/InterceptFeaturePlugin.dll differ diff --git a/Samples~/MeshingFeature/MeshingFeaturePlugin/android.meta b/Samples~/MeshingFeature/MeshingFeaturePlugin/android.meta index abbc01f..62a655a 100644 --- a/Samples~/MeshingFeature/MeshingFeaturePlugin/android.meta +++ b/Samples~/MeshingFeature/MeshingFeaturePlugin/android.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4a2450fd712644ed96727fe2154817e5 +guid: 5295840810ce4b2797781710c2fb5204 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Samples~/MeshingFeature/MeshingFeaturePlugin/android/arm64.meta b/Samples~/MeshingFeature/MeshingFeaturePlugin/android/arm64.meta index a4c18bf..f054399 100644 --- a/Samples~/MeshingFeature/MeshingFeaturePlugin/android/arm64.meta +++ b/Samples~/MeshingFeature/MeshingFeaturePlugin/android/arm64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ab4dc9b794e44db5bd90403f721505a6 +guid: c0a8948b0c85485382f86d52ff6cdf45 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Samples~/MeshingFeature/MeshingFeaturePlugin/android/arm64/libMeshingFeaturePlugin.so.meta b/Samples~/MeshingFeature/MeshingFeaturePlugin/android/arm64/libMeshingFeaturePlugin.so.meta index 58b969e..aefeaa4 100644 --- a/Samples~/MeshingFeature/MeshingFeaturePlugin/android/arm64/libMeshingFeaturePlugin.so.meta +++ b/Samples~/MeshingFeature/MeshingFeaturePlugin/android/arm64/libMeshingFeaturePlugin.so.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c8e3df0f41cb48c5924e91c46ff790ae +guid: 534652c2f6c4410e8a36065a15534b0e PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Samples~/MeshingFeature/MeshingFeaturePlugin/universalwindows.meta b/Samples~/MeshingFeature/MeshingFeaturePlugin/universalwindows.meta index 65bd74e..4834a1d 100644 --- a/Samples~/MeshingFeature/MeshingFeaturePlugin/universalwindows.meta +++ b/Samples~/MeshingFeature/MeshingFeaturePlugin/universalwindows.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 06ea878866ec49a78a13e611ec2d754a +guid: fe81258072fb4e48bed56ce86fa1c4be folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Samples~/MeshingFeature/MeshingFeaturePlugin/universalwindows/arm32.meta b/Samples~/MeshingFeature/MeshingFeaturePlugin/universalwindows/arm32.meta index 347425f..b3d2ffa 100644 --- a/Samples~/MeshingFeature/MeshingFeaturePlugin/universalwindows/arm32.meta +++ b/Samples~/MeshingFeature/MeshingFeaturePlugin/universalwindows/arm32.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c92a2be8881c4effbb0cfffcac881dbc +guid: 5c3eed47c2a44a0f8b8fcfa60c051316 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Samples~/MeshingFeature/MeshingFeaturePlugin/universalwindows/arm64.meta b/Samples~/MeshingFeature/MeshingFeaturePlugin/universalwindows/arm64.meta index 3c828a9..623d3e4 100644 --- a/Samples~/MeshingFeature/MeshingFeaturePlugin/universalwindows/arm64.meta +++ b/Samples~/MeshingFeature/MeshingFeaturePlugin/universalwindows/arm64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: afef796f5b9d47f98c76d0e07c91d815 +guid: 25a37d5425a34d878ce943bea98a14fe folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Samples~/MeshingFeature/MeshingFeaturePlugin/universalwindows/x64.meta b/Samples~/MeshingFeature/MeshingFeaturePlugin/universalwindows/x64.meta index d705687..cc1d50f 100644 --- a/Samples~/MeshingFeature/MeshingFeaturePlugin/universalwindows/x64.meta +++ b/Samples~/MeshingFeature/MeshingFeaturePlugin/universalwindows/x64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a2510000b8644a05b51a5576a04996c9 +guid: cdd504d340964dcabb755a14b87b894c folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Samples~/MeshingFeature/MeshingFeaturePlugin/universalwindows/x64/MeshingFeaturePlugin.dll b/Samples~/MeshingFeature/MeshingFeaturePlugin/universalwindows/x64/MeshingFeaturePlugin.dll index 9855a39..f1bb738 100644 Binary files a/Samples~/MeshingFeature/MeshingFeaturePlugin/universalwindows/x64/MeshingFeaturePlugin.dll and b/Samples~/MeshingFeature/MeshingFeaturePlugin/universalwindows/x64/MeshingFeaturePlugin.dll differ diff --git a/Samples~/MeshingFeature/MeshingFeaturePlugin/windows.meta b/Samples~/MeshingFeature/MeshingFeaturePlugin/windows.meta index a97598b..31f9a00 100644 --- a/Samples~/MeshingFeature/MeshingFeaturePlugin/windows.meta +++ b/Samples~/MeshingFeature/MeshingFeaturePlugin/windows.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0c3947e7b835491086070cbccaca4ebd +guid: 6c300a9ba7904ff3a2b527f7f19da278 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Samples~/MeshingFeature/MeshingFeaturePlugin/windows/x64.meta b/Samples~/MeshingFeature/MeshingFeaturePlugin/windows/x64.meta index 5314362..9106a49 100644 --- a/Samples~/MeshingFeature/MeshingFeaturePlugin/windows/x64.meta +++ b/Samples~/MeshingFeature/MeshingFeaturePlugin/windows/x64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8fd03fcdf56b4754a1531eb1b3c06f6a +guid: 20f7c6a7a61143919d75aee9e1c3ed77 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Samples~/MeshingFeature/MeshingFeaturePlugin/windows/x64/MeshingFeaturePlugin.dll b/Samples~/MeshingFeature/MeshingFeaturePlugin/windows/x64/MeshingFeaturePlugin.dll index c97b808..7e582df 100644 Binary files a/Samples~/MeshingFeature/MeshingFeaturePlugin/windows/x64/MeshingFeaturePlugin.dll and b/Samples~/MeshingFeature/MeshingFeaturePlugin/windows/x64/MeshingFeaturePlugin.dll differ diff --git a/Samples~/MeshingFeature/MeshingFeaturePlugin/windows/x64/MeshingFeaturePlugin.dll.meta b/Samples~/MeshingFeature/MeshingFeaturePlugin/windows/x64/MeshingFeaturePlugin.dll.meta index 34d8eea..5046a98 100644 --- a/Samples~/MeshingFeature/MeshingFeaturePlugin/windows/x64/MeshingFeaturePlugin.dll.meta +++ b/Samples~/MeshingFeature/MeshingFeaturePlugin/windows/x64/MeshingFeaturePlugin.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1ea671620832438c92eaf86933ea2703 +guid: f43442ee8cdf4827989fb933d5622031 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Tests/Editor/FeatureTests.cs b/Tests/Editor/FeatureTests.cs index 70a7f02..ee4add9 100644 --- a/Tests/Editor/FeatureTests.cs +++ b/Tests/Editor/FeatureTests.cs @@ -125,9 +125,10 @@ public void InteractionFeatureLayoutRegistration() var packageSettings = OpenXRSettings.GetPackageSettings(); Assert.IsNotNull(packageSettings); - // Test is not valid if there is not more than one interaction feature + // Ignore the test if there is not more than 1 build target. var features = packageSettings.GetFeatures().Select(f => f.feature).ToArray(); - Assert.IsTrue(features.Length > 0); + if(features.Length < 2) + return; // Disable all of the oculus interaction features foreach (var feature in features) diff --git a/Tests/Editor/aAssetBundleTests.cs b/Tests/Editor/aAssetBundleTests.cs new file mode 100644 index 0000000..df3a281 --- /dev/null +++ b/Tests/Editor/aAssetBundleTests.cs @@ -0,0 +1,45 @@ +using System.IO; +using NUnit.Framework; +using UnityEngine; +using UnityEngine.TestTools; +using UnityEditor.SceneManagement; + +[assembly:UnityPlatform(RuntimePlatform.WindowsEditor)] + +namespace UnityEditor.XR.OpenXR.Tests +{ + public class aAssetBundleTests + { + [Test] + public void BuildAssetBundle() + { +#if UNITY_EDITOR_WIN + var target = BuildTarget.StandaloneWindows64; +#elif UNITY_EDITOR_OSX + var target = BuildTarget.StandaloneOSX; +#else + var target = BuildTarget.NoTarget; +#endif + + // Test is only valid if we have a valid build target and that build target is available + if (target == BuildTarget.NoTarget || !BuildPipeline.IsBuildTargetSupported(BuildPipeline.GetBuildTargetGroup(target), target)) + return; + + // Create an asset and add it to an asset bundle + var scene = EditorSceneManager.NewScene(NewSceneSetup.DefaultGameObjects); + EditorSceneManager.SaveScene(scene, "Assets/abtest.unity"); + AssetDatabase.Refresh(); + var importer = AssetImporter.GetAtPath("Assets/abtest.unity"); + importer.assetBundleName = "mocktest"; + + if (!Directory.Exists("mocktest/ab")) + Directory.CreateDirectory("mocktest/ab"); + + // Build the asset bundle + BuildPipeline.BuildAssetBundles("mocktest/ab", BuildAssetBundleOptions.ForceRebuildAssetBundle, target); + + // Cleanup + AssetDatabase.DeleteAsset("Assets/abtest.unity"); + } + } +} \ No newline at end of file diff --git a/Tests/Editor/aAssetBundleTests.cs.meta b/Tests/Editor/aAssetBundleTests.cs.meta new file mode 100644 index 0000000..ba59b29 --- /dev/null +++ b/Tests/Editor/aAssetBundleTests.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3bfe33a5f8e944b0be093f643d913262 +timeCreated: 1625861611 \ No newline at end of file diff --git a/Tests/Editor/zBuildHookTests.cs b/Tests/Editor/zBuildHookTests.cs index 9d28cdb..9a0a1b4 100644 --- a/Tests/Editor/zBuildHookTests.cs +++ b/Tests/Editor/zBuildHookTests.cs @@ -55,7 +55,7 @@ public void PrePostCallbacksAreReceived() var result = BuildMockPlayer(); - if(Environment.GetEnvironmentVariable("UNITY_OPENXR_YAMATO") == "1") + if (Environment.GetEnvironmentVariable("UNITY_OPENXR_YAMATO") == "1") Assert.IsTrue(result.summary.result == BuildResult.Succeeded); else if (result.summary.result != BuildResult.Succeeded) return; diff --git a/package.json b/package.json index bfc6b2a..521b02e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.unity.xr.openxr", "displayName": "OpenXR Plugin", - "version": "1.2.3", + "version": "1.2.8", "unity": "2020.3", "unityRelease": "0b14", "description": "OpenXR is an open, royalty-free standard developed by Khronos that aims to simplify AR/VR development by allowing developers to target a wide range of AR/VR devices. Use this plug-in to enable OpenXR in XR Plug-in Management.", @@ -34,11 +34,11 @@ } ], "upmCi": { - "footprint": "bcea9c6d07f1d0da17b5851ab0fe03b2de57cebf" + "footprint": "359ec208a5cf45b33f1cf30c2d44d1239a41d226" }, "repository": { "url": "https://github.cds.internal.unity3d.com/unity/xr.sdk.openxr.git", "type": "git", - "revision": "683b7326f78d42b2fa865f94f5e1163d7ab0aa72" + "revision": "9c83bf2d4143ac7632a273fbc236ff5636d6fd71" } }