Merge pull request #9478 from keveleigh/2.6.1-cherrypicks

keveleigh · web-flow · commit a12ccc33b5c6 · 2021-03-10T10:43:32.000-08:00
2.6.1 cherrypicks
diff --git a/Assets/MRTK/Core/Utilities/StandardShader/ClippingPrimitive.cs b/Assets/MRTK/Core/Utilities/StandardShader/ClippingPrimitive.cs
@@ -84,16 +84,19 @@ public bool UseOnPreRender
                     cameraMethods = CameraCache.Main.gameObject.EnsureComponent<CameraEventRouter>();
                 }
 
-                if (value)
+                if (useOnPreRender != value)
                 {
-                    cameraMethods.OnCameraPreRender += OnCameraPreRender;
-                }
-                else
-                {
-                    cameraMethods.OnCameraPreRender -= OnCameraPreRender;
-                }
+                    if (value)
+                    {
+                        cameraMethods.OnCameraPreRender += OnCameraPreRender;
+                    }
+                    else if (!value)
+                    {
+                        cameraMethods.OnCameraPreRender -= OnCameraPreRender;
+                    }
 
-                useOnPreRender = value;
+                    useOnPreRender = value;
+                }
             }
         }
 
@@ -240,7 +243,7 @@ protected void OnDisable()
 
             if (cameraMethods != null)
             {
-                cameraMethods.OnCameraPreRender -= OnCameraPreRender;
+                UseOnPreRender = false;
             }
         }
 
diff --git a/Assets/MRTK/Examples/Demos/UX/Dialog/Scripts/DialogExampleController.cs b/Assets/MRTK/Examples/Demos/UX/Dialog/Scripts/DialogExampleController.cs
@@ -56,15 +56,15 @@ public GameObject DialogPrefabSmall
         /// </summary>
         public void OpenConfirmationDialogLarge()
         {
-            Dialog.Open(DialogPrefabLarge, DialogButtonType.OK, "Confirmation Dialog, Large, Far", "This is an example of a large dialog with only one button, placed at near interaction range", false);
+            Dialog.Open(DialogPrefabLarge, DialogButtonType.OK, "Confirmation Dialog, Large, Far", "This is an example of a large dialog with only one button, placed at far interaction range", false);
         }
 
         /// <summary>
         /// Opens choice dialog example
         /// </summary>
         public void OpenChoiceDialogLarge()
         {
-            Dialog myDialog = Dialog.Open(DialogPrefabLarge, DialogButtonType.Yes | DialogButtonType.No, "Choice Dialog, Large, Near", "This is an example of a large dialog with a choice message for the user, placed at far interaction range", true);
+            Dialog myDialog = Dialog.Open(DialogPrefabLarge, DialogButtonType.Yes | DialogButtonType.No, "Choice Dialog, Large, Near", "This is an example of a large dialog with a choice message for the user, placed at near interaction range", true);
             if (myDialog != null)
             {
                 myDialog.OnClosed += OnClosedDialogEvent;
@@ -96,15 +96,15 @@ public void OpenChoiceDialogMedium()
         /// </summary>
         public void OpenConfirmationDialogSmall()
         {
-            Dialog.Open(DialogPrefabSmall, DialogButtonType.OK, "Confirmation Dialog, Small, Far", "This is an example of a small dialog with only one button, placed at near interaction range", false);
+            Dialog.Open(DialogPrefabSmall, DialogButtonType.OK, "Confirmation Dialog, Small, Far", "This is an example of a small dialog with only one button, placed at far interaction range", false);
         }
 
         /// <summary>
         /// Opens choice dialog example
         /// </summary>
         public void OpenChoiceDialogSmall()
         {
-            Dialog myDialog = Dialog.Open(DialogPrefabSmall, DialogButtonType.Yes | DialogButtonType.No, "Choice Dialog, Small, Near", "This is an example of a small dialog with a choice message for the user, placed at far interaction range", true);
+            Dialog myDialog = Dialog.Open(DialogPrefabSmall, DialogButtonType.Yes | DialogButtonType.No, "Choice Dialog, Small, Near", "This is an example of a small dialog with a choice message for the user, placed at near interaction range", true);
             if (myDialog != null)
             {
                 myDialog.OnClosed += OnClosedDialogEvent;
diff --git a/Assets/MRTK/Providers/OpenXR/Scripts/OpenXRDeviceManager.cs b/Assets/MRTK/Providers/OpenXR/Scripts/OpenXRDeviceManager.cs
@@ -41,7 +41,7 @@ private bool IsActiveLoader
 #if UNITY_OPENXR
                 if (!isActiveLoader.HasValue)
                 {
-                    isActiveLoader = IsLoaderActive<OpenXRLoader>();
+                    isActiveLoader = IsLoaderActive<OpenXRLoaderBase>();
                 }
 #endif // UNITY_OPENXR
 
diff --git a/Assets/MRTK/Tests/PlayModeTests/ScrollViewTests.cs b/Assets/MRTK/Tests/PlayModeTests/ScrollViewTests.cs
@@ -1478,6 +1478,43 @@ public IEnumerator ScrollAmountHasCorrectDamp()
             Assert.AreEqual((handTouchDelta - scrollView.HandDeltaScrollThreshold) / newScale, scrollView.ScrollContainerPosition.y, 0.005, "Scroll drag amount was not 1:1");
         }
 
+        /// <summary>
+        /// Tests that no errors are raised after the scrolling object collection is removed from the scene
+        /// </summary>
+        [UnityTest]
+        public IEnumerator ScrollViewCleanup()
+        {
+            // Setting up a vertical 1x2 scroll view with three pressable buttons items
+            var contentItems = InstantiatePrefabItems(AssetDatabase.GUIDToAssetPath(PressableHololens2PrefabGuid), 3);
+
+            GridObjectCollection objectCollection = InstantiateObjectCollection(contentItems,
+                                                                                LayoutOrder.ColumnThenRow,
+                                                                                LayoutAnchor.UpperLeft,
+                                                                                1,
+                                                                                Vector3.forward,
+                                                                                Quaternion.identity,
+                                                                                0.032f,
+                                                                                0.032f);
+
+            ScrollingObjectCollection scrollView = InstantiateScrollView(1,
+                                                                         2,
+                                                                         objectCollection.CellWidth,
+                                                                         objectCollection.CellHeight,
+                                                                         0.016f,
+                                                                         Vector3.forward,
+                                                                         Quaternion.identity);
+            scrollView.AddContent(objectCollection.gameObject);
+
+            PressableButton button1Component = contentItems[0].GetComponentInChildren<PressableButton>();
+
+            Assert.IsNotNull(button1Component);
+            yield return PlayModeTestUtilities.WaitForInputSystemUpdate();
+
+            Object.Destroy(scrollView.gameObject);
+
+            yield return PlayModeTestUtilities.WaitForInputSystemUpdate();
+        }
+
         #endregion Tests
 
         #region Utilities

Original file line number	Diff line number	Diff line change
`@@ -84,16 +84,19 @@ public bool UseOnPreRender`
`84`	`84`	`cameraMethods = CameraCache.Main.gameObject.EnsureComponent<CameraEventRouter>();`
`85`	`85`	`}`
`86`	`86`
`87`		`- if (value)`
	`87`	`+ if (useOnPreRender != value)`
`88`	`88`	`{`
`89`		`- cameraMethods.OnCameraPreRender += OnCameraPreRender;`
`90`		`- }`
`91`		`- else`
`92`		`- {`
`93`		`- cameraMethods.OnCameraPreRender -= OnCameraPreRender;`
`94`		`- }`
	`89`	`+ if (value)`
	`90`	`+ {`
	`91`	`+ cameraMethods.OnCameraPreRender += OnCameraPreRender;`
	`92`	`+ }`
	`93`	`+ else if (!value)`
	`94`	`+ {`
	`95`	`+ cameraMethods.OnCameraPreRender -= OnCameraPreRender;`
	`96`	`+ }`
`95`	`97`
`96`		`- useOnPreRender = value;`
	`98`	`+ useOnPreRender = value;`
	`99`	`+ }`
`97`	`100`	`}`
`98`	`101`	`}`
`99`	`102`
`@@ -240,7 +243,7 @@ protected void OnDisable()`
`240`	`243`
`241`	`244`	`if (cameraMethods != null)`
`242`	`245`	`{`
`243`		`- cameraMethods.OnCameraPreRender -= OnCameraPreRender;`
	`246`	`+ UseOnPreRender = false;`
`244`	`247`	`}`
`245`	`248`	`}`
`246`	`249`
Original file line number	Diff line number	Diff line change
`@@ -56,15 +56,15 @@ public GameObject DialogPrefabSmall`
`56`	`56`	`/// </summary>`
`57`	`57`	`public void OpenConfirmationDialogLarge()`
`58`	`58`	`{`
`59`		`- Dialog.Open(DialogPrefabLarge, DialogButtonType.OK, "Confirmation Dialog, Large, Far", "This is an example of a large dialog with only one button, placed at near interaction range", false);`
	`59`	`+ Dialog.Open(DialogPrefabLarge, DialogButtonType.OK, "Confirmation Dialog, Large, Far", "This is an example of a large dialog with only one button, placed at far interaction range", false);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`/// <summary>`
`63`	`63`	`/// Opens choice dialog example`
`64`	`64`	`/// </summary>`
`65`	`65`	`public void OpenChoiceDialogLarge()`
`66`	`66`	`{`
`67`		`- Dialog myDialog = Dialog.Open(DialogPrefabLarge, DialogButtonType.Yes \| DialogButtonType.No, "Choice Dialog, Large, Near", "This is an example of a large dialog with a choice message for the user, placed at far interaction range", true);`
	`67`	`+ Dialog myDialog = Dialog.Open(DialogPrefabLarge, DialogButtonType.Yes \| DialogButtonType.No, "Choice Dialog, Large, Near", "This is an example of a large dialog with a choice message for the user, placed at near interaction range", true);`
`68`	`68`	`if (myDialog != null)`
`69`	`69`	`{`
`70`	`70`	`myDialog.OnClosed += OnClosedDialogEvent;`
`@@ -96,15 +96,15 @@ public void OpenChoiceDialogMedium()`
`96`	`96`	`/// </summary>`
`97`	`97`	`public void OpenConfirmationDialogSmall()`
`98`	`98`	`{`
`99`		`- Dialog.Open(DialogPrefabSmall, DialogButtonType.OK, "Confirmation Dialog, Small, Far", "This is an example of a small dialog with only one button, placed at near interaction range", false);`
	`99`	`+ Dialog.Open(DialogPrefabSmall, DialogButtonType.OK, "Confirmation Dialog, Small, Far", "This is an example of a small dialog with only one button, placed at far interaction range", false);`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`/// <summary>`
`103`	`103`	`/// Opens choice dialog example`
`104`	`104`	`/// </summary>`
`105`	`105`	`public void OpenChoiceDialogSmall()`
`106`	`106`	`{`
`107`		`- Dialog myDialog = Dialog.Open(DialogPrefabSmall, DialogButtonType.Yes \| DialogButtonType.No, "Choice Dialog, Small, Near", "This is an example of a small dialog with a choice message for the user, placed at far interaction range", true);`
	`107`	`+ Dialog myDialog = Dialog.Open(DialogPrefabSmall, DialogButtonType.Yes \| DialogButtonType.No, "Choice Dialog, Small, Near", "This is an example of a small dialog with a choice message for the user, placed at near interaction range", true);`
`108`	`108`	`if (myDialog != null)`
`109`	`109`	`{`
`110`	`110`	`myDialog.OnClosed += OnClosedDialogEvent;`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ private bool IsActiveLoader`
`41`	`41`	`#if UNITY_OPENXR`
`42`	`42`	`if (!isActiveLoader.HasValue)`
`43`	`43`	`{`
`44`		`- isActiveLoader = IsLoaderActive<OpenXRLoader>();`
	`44`	`+ isActiveLoader = IsLoaderActive<OpenXRLoaderBase>();`
`45`	`45`	`}`
`46`	`46`	`#endif // UNITY_OPENXR`
`47`	`47`