[email protected]

## [1.2.3] - 2021-06-17
needle-mirror · Jun 17, 2021 · 87d0c03 · 87d0c03
1 parent fc2c8fa
commit 87d0c03
Show file tree

Hide file tree

Showing 107 changed files with 1,433 additions and 330 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,14 @@ 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.3] - 2021-06-17
+* Updated OpenXR Loader to 1.0.17 
+* Fixed missing haptic output on HTC Vive controller profile
+* Fixed bug that caused `ThumbstickTouched` binding on the `ValveIndex` controller profile to not work.
+* Changed `feature set` text to `feature group` in the top level XR-Management list
+* Fixed issue that would cause the app to not exit when closed by the runtime
+* Ensured a deterministic order of features within the OpenXR Settings
+
 ## [1.2.2] - 2021-06-01
 * Fixed a bug when using SteamVR runtime that would cause the view to stop rendering and input to stop tracking if the main thread stalled for too long.
 * Fixed bug with feature sets that could cause the XR Management check box to be out of sync with the checkbox on the OpenXR Settings page.

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 b/ConformanceAutomation/android/arm64/ConformanceAutomationExt.so
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
@@ -222,7 +222,7 @@ public static AllFeatureInfo GetAllFeatureInfo(BuildTargetGroup group)
                 }
             }
 
-            openXrSettings.features = all.ToArray();
+            openXrSettings.features = all.OrderBy(f => f.name).ToArray();
 
 #if UNITY_EDITOR
             // Ensure the settings are saved after the features are populated

diff --git a/Editor/FeatureSupport/OpenXRFeatureSetManager.cs b/Editor/FeatureSupport/OpenXRFeatureSetManager.cs
@@ -140,11 +140,11 @@ static void FillKnownFeatureSets(bool addTestFeatureSet = false)
                             isEnabled = false,
                             name = "Known Test",
                             featureSetId = "com.unity.xr.test.featureset",
-                            description = "Known Test feature set.",
+                            description = "Known Test feature group.",
                             downloadText = "Click here to go to the Unity main website.",
                             downloadLink = Constants.k_DocumentationURL,
                             uiName = new GUIContent("Known Test"),
-                            uiDescription = new GUIContent("Known Test feature set."),
+                            uiDescription = new GUIContent("Known Test feature group."),
                             helpIcon = new GUIContent("", CommonContent.k_HelpIcon.image, "Click here to go to the Unity main website."),
                         });
                     }
@@ -168,7 +168,7 @@ static void FillKnownFeatureSets(bool addTestFeatureSet = false)
                             downloadText = featureSet.downloadText,
                             downloadLink = featureSet.downloadLink,
                             uiName = new GUIContent(featureSet.name),
-                            uiLongName = new GUIContent($"{featureSet.name} feature set"),
+                            uiLongName = new GUIContent($"{featureSet.name} feature group"),
                             uiDescription = new GUIContent(featureSet.description),
                             helpIcon = new GUIContent("", CommonContent.k_HelpIcon.image, featureSet.downloadText),
                         });
@@ -232,7 +232,7 @@ internal static void InitializeFeatureSets(bool addTestFeatureSet)
                             defaultFeatureIds = featureSetAttr.DefaultFeatureIds,
                             isInstalled = true,
                             uiName = new GUIContent(featureSetAttr.UiName),
-                            uiLongName = new GUIContent($"{featureSetAttr.UiName} feature set"),
+                            uiLongName = new GUIContent($"{featureSetAttr.UiName} feature group"),
                             uiDescription = new GUIContent(featureSetAttr.Description),
                             helpIcon = String.IsNullOrEmpty(featureSetAttr.Description) ? null : new GUIContent("", CommonContent.k_HelpIcon.image, featureSetAttr.Description),
                         };

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/Interactions/HTCViveControllerProfile.cs b/Runtime/Features/Interactions/HTCViveControllerProfile.cs
@@ -460,6 +460,22 @@ protected override void RegisterActionMapsWithRuntime()
                                 interactionProfileName = profile,
                             }
                         }
+                    },
+                    // Haptics
+                    new ActionConfig()
+                    {
+                        name = "haptic",
+                        localizedName = "Haptic Output",
+                        type = ActionType.Vibrate,
+                        usages = new List<string>() { "Haptic" },
+                        bindings = new List<ActionBinding>()
+                        {
+                            new ActionBinding()
+                            {
+                                interactionPath = haptic,
+                                interactionProfileName = profile,
+                            }
+                        }
                     }
                 }
             };

diff --git a/Runtime/Features/Interactions/ValveIndexControllerProfile.cs b/Runtime/Features/Interactions/ValveIndexControllerProfile.cs
@@ -618,7 +618,7 @@ protected override void RegisterActionMapsWithRuntime()
                     },
                     new ActionConfig()
                     {
-                        name = "thumbstickTouch",
+                        name = "thumbstickTouched",
                         localizedName = "Thumbstick Touched",
                         type = ActionType.Binary,
                         usages = new List<string>()

diff --git a/Runtime/OpenXRRestarter.cs b/Runtime/OpenXRRestarter.cs
@@ -59,7 +59,7 @@ IEnumerator Restart(OpenXRLoaderBase loader, bool shouldRestart, Action shutdown
             else
             {
 
-                if (ShouldCancelQuit != null && ShouldCancelQuit.Invoke())
+                if (ShouldCancelQuit == null || ShouldCancelQuit.Invoke())
                 {
 #if UNITY_EDITOR
                     if (EditorApplication.isPlaying || EditorApplication.isPaused)

diff --git a/Runtime/UnitySubsystemsManifest.json b/Runtime/UnitySubsystemsManifest.json
@@ -1,6 +1,6 @@
 {
         "name": "OpenXR XR Plugin",
-        "version": "1.2.2",
+        "version": "1.2.3",
         "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