Merge branch 'mrtk_development' into users/trferrel/fix-spatial-observer-cycle

Author: Troy-Ferrell

Assets/MixedRealityToolkit.Examples/Demos/UX/ManipulationHandler/Scenes/ManipulationHandlerExample.unity

@@ -1,6 +1,7 @@
 
 using UnityEngine;
 using Microsoft.MixedReality.Toolkit.UI;
+using Microsoft.MixedReality.Toolkit.Experimental.UI;
 
 namespace Microsoft.MixedReality.Toolkit.Examples.Demos
 {
@@ -10,7 +11,7 @@ namespace Microsoft.MixedReality.Toolkit.Examples.Demos
     [AddComponentMenu("Scripts/MRTK/Examples/ChangeManipulation")]
     public class ChangeManipulation : MonoBehaviour
     {
-        public ManipulationHandler manipulatedObject;
+        public GameObject manipulatedObject;
         public Collider collisionTrigger;
 
         private Collider manipulatedObjCollider;
@@ -32,14 +33,27 @@ public void TryStopManipulation()
         {
             if (manipulatedObject != null && collisionTrigger != null && manipulatedObjCollider != null)
             {
-                if (collisionTrigger.bounds.Intersects(manipulatedObjCollider.bounds))
+                if (!collisionTrigger.bounds.Intersects(manipulatedObjCollider.bounds))
                 {
-                    manipulatedObject.ForceEndManipulation();
+                    return;
+                }
+
+                var manipulationHandler = manipulatedObject.GetComponent<ManipulationHandler>();
+                var objectManipulator = manipulatedObject.GetComponent<ObjectManipulator>();
+                if (manipulationHandler != null || objectManipulator != null)
+                {
+                    if (manipulationHandler != null)
+                    {
+                        manipulationHandler.ForceEndManipulation();
+                    }
+                    else
+                    {
+                        objectManipulator.ForceEndManipulation();
+                    }
 
                     // move the object slightly away from the collision point so we can manipulate it again after this
                     Vector3 direction = collisionTrigger.bounds.center - manipulatedObjCollider.bounds.center;
                     manipulatedObject.transform.Translate(direction.normalized * 0.01f);
-
                 }
             }
         }