Merge pull request #6909 from thalbern/user/bethalha/fixes_for_merge_to_dev

thalbern · web-flow · commit 8ff669894cd7 · 2019-12-16T08:49:39.000-08:00
fixed tests in ux_refactor / adjusted namespaces and file locations
diff --git a/Assets/MixedRealityToolkit.Examples/Experimental/Demos/UX/BoundsControl/Scripts/BoundsControlRuntimeExample.cs b/Assets/MixedRealityToolkit.Examples/Experimental/Demos/UX/BoundsControl/Scripts/BoundsControlRuntimeExample.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.MixedReality.Toolkit.Input;
 using Microsoft.MixedReality.Toolkit.UI;
-using Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControl;
+using Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl;
 using Microsoft.MixedReality.Toolkit.Utilities;
 using System.Collections;
 using System.Text;
@@ -67,7 +67,7 @@ private IEnumerator Sequence()
                 SetStatus("Instantiate BoundsControl");
                 bbox = cube.AddComponent<BoundsControl>();
                 bbox.HideElementsInInspector = false;
-                bbox.BoundsControlActivation = UI.Experimental.BoundsControlTypes.BoundsControlActivationType.ActivateOnStart;
+                bbox.BoundsControlActivation = Toolkit.Experimental.UI.BoundsControlTypes.BoundsControlActivationType.ActivateOnStart;
                 var mh = cube.AddComponent<ManipulationHandler>();
                 yield return WaitForSpeechCommand();
 
@@ -98,15 +98,15 @@ private IEnumerator Sequence()
                 yield return WaitForSpeechCommand();
 
                 SetStatus("FlattenX");
-                bbox.FlattenAxis = UI.Experimental.BoundsControlTypes.FlattenModeType.FlattenX;
+                bbox.FlattenAxis = Toolkit.Experimental.UI.BoundsControlTypes.FlattenModeType.FlattenX;
                 yield return WaitForSpeechCommand();
 
                 SetStatus("FlattenY");
-                bbox.FlattenAxis = UI.Experimental.BoundsControlTypes.FlattenModeType.FlattenY;
+                bbox.FlattenAxis = Toolkit.Experimental.UI.BoundsControlTypes.FlattenModeType.FlattenY;
                 yield return WaitForSpeechCommand();
 
                 SetStatus("FlattenNone");
-                bbox.FlattenAxis = UI.Experimental.BoundsControlTypes.FlattenModeType.DoNotFlatten;
+                bbox.FlattenAxis = Toolkit.Experimental.UI.BoundsControlTypes.FlattenModeType.DoNotFlatten;
                 yield return WaitForSpeechCommand();
 
                 SetStatus("ShowWireframe false");
@@ -170,7 +170,7 @@ private IEnumerator Sequence()
                 yield return WaitForSpeechCommand();
 
                 SetStatus("Wireframe shape cylinder");
-                bbox.LinksConfiguration.WireframeShape = UI.Experimental.BoundsControlTypes.WireframeType.Cylindrical;
+                bbox.LinksConfiguration.WireframeShape = Toolkit.Experimental.UI.BoundsControlTypes.WireframeType.Cylindrical;
                 yield return WaitForSpeechCommand();
 
                 Destroy(cube);
@@ -199,7 +199,7 @@ private IEnumerator Sequence()
                 }
 
                 bbox = multiRoot.AddComponent<BoundsControl>();
-                bbox.BoundsControlActivation = UI.Experimental.BoundsControlTypes.BoundsControlActivationType.ActivateOnStart;
+                bbox.BoundsControlActivation = Toolkit.Experimental.UI.BoundsControlTypes.BoundsControlActivationType.ActivateOnStart;
                 bbox.HideElementsInInspector = false;
                 bbox.LinksConfiguration.WireframeEdgeRadius = .05f;
                 multiRoot.AddComponent<ManipulationHandler>();
diff --git a/Assets/MixedRealityToolkit.Examples/Experimental/Demos/UX/ObjectManipulator/Scripts/ReturnToBounds.cs b/Assets/MixedRealityToolkit.Examples/Experimental/Demos/UX/ObjectManipulator/Scripts/ReturnToBounds.cs
@@ -1,8 +1,6 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 
 namespace Microsoft.MixedReality.Toolkit.Examples.Experimental.Demos
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/BoundsControl.cs b/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/BoundsControl.cs
@@ -7,10 +7,11 @@
 using UnityEngine.Events;
 using UnityEngine.Serialization;
 using UnityPhysics = UnityEngine.Physics;
-using Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControlTypes;
+using Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControlTypes;
 using Microsoft.MixedReality.Toolkit.Utilities;
+using Microsoft.MixedReality.Toolkit.UI;
 
-namespace Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControl
+namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl
 {
     /// <summary>
     /// Bounds Control allows to transform objects (rotate and scale) and draws a cube around the object to visualize 
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/BoundsControlTypes.cs b/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/BoundsControlTypes.cs
@@ -1,5 +1,5 @@
 ﻿
-namespace Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControlTypes
+namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControlTypes
 {
     /// <summary>
     /// Enum which describes how an object's bounds control is to be flattened.
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/BoxDisplay.cs b/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/BoxDisplay.cs
@@ -1,10 +1,10 @@
-﻿using Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControlTypes;
+﻿using Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControlTypes;
 using System;
 
 using UnityEngine;
 using UnityEngine.Events;
 
-namespace Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControl
+namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl
 {
     /// <summary> 
     /// BoxDisplay can be used to attach a solid box visualization to a <see cref="BoundsControl"/>
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/Configuration/BoxDisplayConfiguration.cs b/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/Configuration/BoxDisplayConfiguration.cs
@@ -1,7 +1,7 @@
 ﻿using UnityEngine;
 using UnityEngine.Events;
 
-namespace Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControl
+namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl
 {
     /// <summary> 
     /// Shareable configuration for the <see cref="BoxDisplay" /> of <see cref="BoundsControl"/>
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/Configuration/HandlesBaseConfiguration.cs b/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/Configuration/HandlesBaseConfiguration.cs
@@ -1,7 +1,7 @@
 ﻿using UnityEngine;
 using UnityEngine.Events;
 
-namespace Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControl
+namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl
 {
     /// <summary>
     /// Configuration base class for any <see cref="BoundsControl"/> handle type deriving from <see cref="HandlesBase"/>
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/Configuration/LinksConfiguration.cs b/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/Configuration/LinksConfiguration.cs
@@ -1,9 +1,9 @@
 ﻿
-using Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControlTypes;
+using Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControlTypes;
 using UnityEngine;
 using UnityEngine.Events;
 
-namespace Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControl
+namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl
 {
     /// <summary>
     /// Configuration for <see cref="Links"/> used in <see cref="BoundsControl"/>
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/Configuration/RotationHandlesConfiguration.cs b/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/Configuration/RotationHandlesConfiguration.cs
@@ -1,7 +1,7 @@
-﻿using Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControlTypes;
+﻿using Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControlTypes;
 using UnityEngine;
 
-namespace Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControl
+namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl
 {
     /// <summary>
     /// Configuration for <see cref="RotationHandles"/> used in <see cref="BoundsControl"/>
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/Configuration/ScaleHandlesConfiguration.cs b/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/Configuration/ScaleHandlesConfiguration.cs
@@ -1,7 +1,7 @@
 ﻿
 using UnityEngine;
 
-namespace Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControl
+namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl
 {
     /// <summary>
     /// Configuration for <see cref="ScaleHandles"/> used in <see cref="BoundsControl"/>
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/HandlesBase.cs b/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/HandlesBase.cs
@@ -1,11 +1,11 @@
-﻿using Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControlTypes;
+﻿using Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControlTypes;
 using Microsoft.MixedReality.Toolkit.Utilities;
 using System;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Events;
 
-namespace Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControl
+namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl
 {
     /// <summary>
     /// Base class for any type of <see cref="BoundsControl"/> handle.
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/Links.cs b/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/Links.cs
@@ -1,9 +1,9 @@
 ﻿
-using Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControlTypes;
+using Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControlTypes;
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControl
+namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl
 {
     /// <summary>
     /// Links that are rendered in between the corners of <see cref="BoundsControl"/>
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/ProximityEffect/IProximityEffectObjectProvider.cs b/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/ProximityEffect/IProximityEffectObjectProvider.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using UnityEngine;
 
-namespace Microsoft.MixedReality.Toolkit.UI.Experimental
+namespace Microsoft.MixedReality.Toolkit.Experimental.UI
 {
     /// <summary>
     /// Interface for defining a proximity object provider used in <see cref="ProximityEffect" /> of <see cref="BoundsControl" />
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/ProximityEffect/ProximityEffect.cs b/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/ProximityEffect/ProximityEffect.cs
@@ -5,7 +5,7 @@
 using System.Runtime.CompilerServices;
 
 
-namespace Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControl
+namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl
 {
     /// <summary>
     /// ProximityEffect scales and switches out materials for registered objects whenever a pointer is in proximity.
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/ProximityEffect/ProximityEffectConfiguration.cs b/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/ProximityEffect/ProximityEffectConfiguration.cs
@@ -1,6 +1,6 @@
 ﻿using UnityEngine;
 
-namespace Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControl
+namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl
 {
     /// <summary>
     /// Shareable configuration for a proximity effect that can be used with BoundsControl
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/RotationHandles.cs b/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/RotationHandles.cs
@@ -1,10 +1,10 @@
 ﻿using Microsoft.MixedReality.Toolkit.Input;
-using Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControlTypes;
+using Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControlTypes;
 using System;
 using UnityEngine;
 using UnityEngine.Events;
 
-namespace Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControl
+namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl
 {
     /// <summary>
     /// Rotation handles for <see cref="BoundsControl"/> that are used for rotating the
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/ScaleHandles.cs b/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/ScaleHandles.cs
@@ -1,10 +1,10 @@
 ﻿
 using Microsoft.MixedReality.Toolkit.Input;
-using Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControlTypes;
+using Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControlTypes;
 using System;
 using UnityEngine;
 
-namespace Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControl
+namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl
 {
     /// <summary>
     /// Scale handles for <see cref="BoundsControl"/> that are used for scaling the
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/VisualUtils.cs b/Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/VisualUtils.cs
@@ -1,9 +1,9 @@
 ﻿using Microsoft.MixedReality.Toolkit.Input;
-using Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControlTypes;
+using Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControlTypes;
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControl
+namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl
 {
     /// <summary>
     /// Helper class providing some static utility functions for <see cref="BoundsControl"/> <see cref="BoundsControlHandlesBase">handles</see>/>
diff --git a/Assets/MixedRealityToolkit.Tests/PlayModeTests/Experimental/BoundsControlTests.cs b/Assets/MixedRealityToolkit.Tests/PlayModeTests/Experimental/BoundsControlTests.cs
@@ -18,7 +18,7 @@
 using Microsoft.MixedReality.Toolkit.Input;
 using Microsoft.MixedReality.Toolkit.Utilities;
 using Assert = UnityEngine.Assertions.Assert;
-using Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControl;
+using Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl;
 
 namespace Microsoft.MixedReality.Toolkit.Tests.Experimental
 {
@@ -105,7 +105,7 @@ public IEnumerator BBoxOverride()
         {
             BoundsControl bbox = InstantiateSceneAndDefaultBbox();
             yield return VerifyInitialBoundsCorrect(bbox);
-            bbox.BoundsControlActivation = UI.Experimental.BoundsControlTypes.BoundsControlActivationType.ActivateOnStart;
+            bbox.BoundsControlActivation = Toolkit.Experimental.UI.BoundsControlTypes.BoundsControlActivationType.ActivateOnStart;
             bbox.HideElementsInInspector = false;
             yield return null;
 
diff --git a/Assets/MixedRealityToolkit.Tests/PlayModeTests/Experimental/ObjectManipulatorTests.cs b/Assets/MixedRealityToolkit.Tests/PlayModeTests/Experimental/ObjectManipulatorTests.cs
@@ -21,7 +21,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.MixedReality.Toolkit.Tests
+namespace Microsoft.MixedReality.Toolkit.Tests.Experimental
 {
     public class ObjectManipulatorTests
     {
@@ -898,6 +898,10 @@ public IEnumerator ObjectManipulatorPositionlessController()
             Assert.AreEqual(expectedDist, Vector3.Distance(testObject.transform.position, CameraCache.Main.transform.position), 0.02f);
 
             yield return hand.SetGesture(ArticulatedHandPose.GestureId.Pinch);
+
+            // Apply correction delta again as we have changed hand pose
+            correction = CameraCache.Main.transform.position - hand.GetPointer<GGVPointer>().Position;
+            yield return hand.Move(correction, numHandSteps);
             yield return null;
 
             Assert.AreEqual(expectedDist, Vector3.Distance(testObject.transform.position, CameraCache.Main.transform.position), 0.02f);
diff --git a/Assets/MixedRealityToolkit.Tests/PlayModeTests/Experimental/ObjectManipulatorTests.cs.meta b/Assets/MixedRealityToolkit.Tests/PlayModeTests/Experimental/ObjectManipulatorTests.cs.meta

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`
`2`		`-namespace Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControlTypes`
	`2`	`+namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControlTypes`
`3`	`3`	`{`
`4`	`4`	`/// <summary>`
`5`	`5`	`/// Enum which describes how an object's bounds control is to be flattened.`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using UnityEngine;`
`2`	`2`	`using UnityEngine.Events;`
`3`	`3`
`4`		`-namespace Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControl`
	`4`	`+namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl`
`5`	`5`	`{`
`6`	`6`	`/// <summary>`
`7`	`7`	`/// Shareable configuration for the <see cref="BoxDisplay" /> of <see cref="BoundsControl"/>`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-using Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControlTypes;`
	`1`	`+using Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControlTypes;`
`2`	`2`	`using UnityEngine;`
`3`	`3`
`4`		`-namespace Microsoft.MixedReality.Toolkit.UI.Experimental.BoundsControl`
	`4`	`+namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl`
`5`	`5`	`{`
`6`	`6`	`/// <summary>`
`7`	`7`	`/// Configuration for <see cref="RotationHandles"/> used in <see cref="BoundsControl"/>`