Merge pull request #2937 from keveleigh/CameraSolverFlipRevert

Prevent solver targets from rotating when the target is the head

Author: David Kline

Assets/HoloToolkit-Examples/Utilities/Scenes/SolverExamples.unity

@@ -1700,6 +1700,11 @@ Prefab:
       propertyPath: hideThisObject
       value: 
       objectReference: {fileID: 37845493}
+    - target: {fileID: 114459743357777030, guid: 687094229f7a92743bd68e3e190259ae,
+        type: 2}
+      propertyPath: updateSolverTargetToClickSource
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 687094229f7a92743bd68e3e190259ae, type: 2}
   m_IsPrefabParent: 0

Assets/HoloToolkit/Utilities/Scripts/Editor/SolverHandlerEditor.cs

@@ -50,13 +50,13 @@ public override void OnInspectorGUI()
 
             serializedObject.ApplyModifiedProperties();
 
-            if (trackedObjectChanged)
+            if (Application.isPlaying && trackedObjectChanged)
             {
                 solverHandler.TransformTarget = null;
                 solverHandler.AttachToNewTrackedObject();
             }
 
-            if (additionalOffsetChanged)
+            if (Application.isPlaying && additionalOffsetChanged)
             {
                 solverHandler.AdditionalOffset = additionalOffsetProperty.vector3Value;
                 solverHandler.AdditionalRotation = additionalRotationProperty.vector3Value;

Assets/HoloToolkit/Utilities/Scripts/Solvers/SolverHandler.cs

@@ -216,8 +216,12 @@ private Transform MakeOffsetTransform(Transform parentTransform)
             transformWithOffset.transform.localPosition = AdditionalOffset;
             transformWithOffset.transform.localRotation = Quaternion.Euler(AdditionalRotation);
             transformWithOffset.name = string.Format("{0} on {1} with offset {2}, {3}", gameObject.name, TrackedObjectToReference.ToString(), AdditionalOffset, AdditionalRotation);
-            // In order to account for the reversed normals due to the glTF coordinate system change, we need to provide rotated attachment points.
-            transformWithOffset.transform.Rotate(0, 180, 0);
+
+            if (TrackedObjectToReference != TrackedObjectToReferenceEnum.Head)
+            {
+                // In order to account for the reversed normals due to the glTF coordinate system change, we need to provide rotated attachment points.
+                transformWithOffset.transform.Rotate(0, 180, 0);
+            }
 
             return transformWithOffset.transform;
         }