Merge pull request #2791 from keveleigh/SolverHandlerMultiple

[Solver PR 3.5] SolverHandler bug fixes

Author: SimonDarksideJ

Assets/MixedRealityToolkit-SDK/Features/Utilities/Solvers/SolverHandler.cs

@@ -11,7 +11,6 @@ namespace Microsoft.MixedReality.Toolkit.SDK.Utilities.Solvers
     /// <summary>
     /// This class handles the solver components that are attached to this <see cref="GameObject"/>
     /// </summary>
-    [DisallowMultipleComponent]
     public class SolverHandler : MonoBehaviour
     {
         [SerializeField]
@@ -29,8 +28,7 @@ public TrackedObjectType TrackedObjectToReference
                 if (trackedObjectToReference != value)
                 {
                     trackedObjectToReference = value;
-                    TransformTarget = null;
-                    AttachToNewTrackedObject();
+                    RefreshTrackedObject();
                 }
             }
         }
@@ -176,6 +174,15 @@ protected void OnDestroy()
 
         #endregion MonoBehaviour Implementation
 
+        /// <summary>
+        /// Clears the transform target and attaches to the current <see cref="TrackedObjectToReference"/>.
+        /// </summary>
+        public void RefreshTrackedObject()
+        {
+            transformTarget = null;
+            AttachToNewTrackedObject();
+        }
+
         protected virtual void AttachToNewTrackedObject()
         {
             switch (TrackedObjectToReference)
@@ -200,7 +207,7 @@ private Transform MakeOffsetTransform(Transform parentTransform)
                 transformWithOffset.transform.parent = parentTransform;
             }
 
-            transformWithOffset.transform.localPosition = AdditionalOffset;
+            transformWithOffset.transform.localPosition = Vector3.Scale(AdditionalOffset, transformWithOffset.transform.localScale);
             transformWithOffset.transform.localRotation = Quaternion.Euler(AdditionalRotation);
             transformWithOffset.name = string.Format("{0} on {1} with offset {2}, {3}", gameObject.name, TrackedObjectToReference.ToString(), AdditionalOffset, AdditionalRotation);
             return transformWithOffset.transform;