[2017.2.1.4] Fix building on Unity 5.6 and 2017.1

Assets/HoloToolkit/Common/Scripts/Extensions/InteractionSourceExtensions.cs

@@ -28,13 +28,14 @@ namespace HoloToolkit.Unity
     /// </summary>
     public static class InteractionSourceExtensions
     {
+#if UNITY_2017_2_OR_NEWER
 #if UNITY_EDITOR_WIN && UNITY_WSA
         [DllImport("EditorMotionController")]
         private static extern bool StartHaptics([In] uint controllerId, [In] float intensity, [In] float durationInSeconds);
 
         [DllImport("EditorMotionController")]
         private static extern bool StopHaptics([In] uint controllerId);
-#endif
+#endif // UNITY_EDITOR_WIN && UNITY_WSA
 
         // This value is standardized according to www.usb.org/developers/hidpage/HUTRR63b_-_Haptics_Page_Redline.pdf
         private const ushort ContinuousBuzzWaveform = 0x1004;
@@ -52,7 +53,7 @@ public static void StartHaptics(this InteractionSource interactionSource, float
                 return;
             }
 
-#if !UNITY_EDITOR && UNITY_2017_2_OR_NEWER
+#if !UNITY_EDITOR
             UnityEngine.WSA.Application.InvokeOnUIThread(() =>
             {
                 IReadOnlyList<SpatialInteractionSourceState> sources = SpatialInteractionManager.GetForCurrentView().GetDetectedSourcesAtTimestamp(PerceptionTimestampHelper.FromHistoricalTargetTime(DateTimeOffset.Now));
@@ -80,9 +81,9 @@ public static void StartHaptics(this InteractionSource interactionSource, float
                     }
                 }
             }, true);
-#elif UNITY_EDITOR_WIN && UNITY_2017_2_OR_NEWER
+#elif UNITY_EDITOR_WIN
             StartHaptics(interactionSource.id, intensity, durationInSeconds);
-#endif
+#endif // !UNITY_EDITOR
         }
 
         public static void StopHaptics(this InteractionSource interactionSource)
@@ -92,7 +93,7 @@ public static void StopHaptics(this InteractionSource interactionSource)
                 return;
             }
 
-#if !UNITY_EDITOR && UNITY_2017_2_OR_NEWER
+#if !UNITY_EDITOR
             UnityEngine.WSA.Application.InvokeOnUIThread(() =>
             {
                 IReadOnlyList<SpatialInteractionSourceState> sources = SpatialInteractionManager.GetForCurrentView().GetDetectedSourcesAtTimestamp(PerceptionTimestampHelper.FromHistoricalTargetTime(DateTimeOffset.Now));
@@ -105,12 +106,12 @@ public static void StopHaptics(this InteractionSource interactionSource)
                     }
                 }
             }, true);
-#elif UNITY_EDITOR_WIN && UNITY_2017_2_OR_NEWER
+#elif UNITY_EDITOR_WIN
             StopHaptics(interactionSource.id);
-#endif
+#endif // !UNITY_EDITOR
         }
 
-#if !UNITY_EDITOR && UNITY_2017_2_OR_NEWER
+#if !UNITY_EDITOR
         public static IAsyncOperation<IRandomAccessStreamWithContentType> TryGetRenderableModelAsync(this InteractionSource interactionSource)
         {
             IAsyncOperation<IRandomAccessStreamWithContentType> returnValue = null;
@@ -133,7 +134,8 @@ public static IAsyncOperation<IRandomAccessStreamWithContentType> TryGetRenderab
 
             return returnValue;
         }
-#endif
-#endif
+#endif // !UNITY_EDITOR
+#endif // UNITY_WSA
+#endif // UNITY_2017_2_OR_NEWER
     }
 }

Assets/HoloToolkit/Input/Scripts/Focus/FocusManager.cs

@@ -347,7 +347,11 @@ public GameObject TryGetFocusedObject(BaseEventData eventData)
             TryGetPointingSource(eventData, out pointingSource);
             PointerInputEventData pointerInputEventData = GetSpecificPointerEventData(pointingSource);
 
-            Debug.Assert(pointerInputEventData != null);
+            // GetSpecificPointerEventData can return null. Be sure to handle that case.
+            if (pointerInputEventData == null)
+            {
+                return null;
+            }
             return pointerInputEventData.selectedObject;
         }
 

Assets/HoloToolkit/UX/Scripts/BoundingBoxes/BoundingBoxGizmoHandle.cs

@@ -224,6 +224,7 @@ private void ApplyScale(Vector3 currentHandPosition)
         }
         private void ApplyRotation(Quaternion currentHandOrientation)
         {
+#if UNITY_2017_1_OR_NEWER
             Matrix4x4 m = Matrix4x4.Rotate(initialHandOrientation);
             Vector3 initRay = new Vector3(0, 0, 1);
             initRay = m.MultiplyPoint(initRay);
@@ -260,6 +261,9 @@ private void ApplyRotation(Quaternion currentHandOrientation)
                 transformToAffect.localRotation = initialRotation;
                 transformToAffect.Rotate(axis, angle * 5.0f);
             }
+#else
+#warning "ApplyRotation(Quaternion currentHandOrientation) is not supported on this version of Unity. Recommend updating to 2017.1 or newer."
+#endif // UNITY_2017_1_OR_NEWER
         }
         private void ApplyRotation(Vector3 currentHandPosition)
         {

Assets/HoloToolkit/UX/Scripts/BoundingBoxes/BoundingBoxRig.cs

@@ -489,13 +489,16 @@ private List<Vector3> GetBounds()
                 BoundingBox.GetMeshFilterBoundsPoints(clone, bounds, mask);
                 Vector3 centroid = boxInstance.TargetBoundsCenter;
                 GameObject.Destroy(clone);
+#if UNITY_2017_1_OR_NEWER
                 Matrix4x4 m = Matrix4x4.Rotate(objectToBound.transform.rotation);
                 for (int i = 0; i < bounds.Count; ++i)
                 {
                     bounds[i] = m.MultiplyPoint(bounds[i]);
                     bounds[i] += boxInstance.TargetBoundsCenter;
                 }
-
+#else
+#warning "GetBounds() using rotation is not supported on this version of Unity. Recommend updating to 2017.1 or newer."
+#endif // UNITY_2017_1_OR_NEWER
                 return bounds;
             }
 

Assets/HoloToolkit/Utilities/Scripts/AtlasReferenceUpdater/AtlasPrefabReference.cs

@@ -2,13 +2,17 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 using System.Collections.Generic;
 using UnityEngine;
+#if UNITY_2017_1_OR_NEWER
 using UnityEngine.U2D;
+#endif // UNITY_2017_1_OR_NEWER
 
 namespace HoloToolkit.Unity
 {
     public class AtlasPrefabReference : ScriptableObject
     {
+#if UNITY_2017_1_OR_NEWER
         [SerializeField] public List<GameObject> Prefabs;
         [SerializeField] public SpriteAtlas Atlas;
+#endif // UNITY_2017_1_OR_NEWER
     }
 }

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

@@ -11,6 +11,7 @@ namespace HoloToolkit.Unity
     [InitializeOnLoad]
     public class AtlasReferenceUpdater : UnityEditor.AssetModificationProcessor
     {
+#if UNITY_2017_1_OR_NEWER
         private static readonly List<AtlasPrefabReference> References = new List<AtlasPrefabReference>();
 
         static AtlasReferenceUpdater()
@@ -115,5 +116,6 @@ private static IEnumerable<Sprite> GetDistinctSprites(IEnumerable<GameObject> pr
             return prefabs.SelectMany(p => p.GetComponentsInChildren<Image>())
                 .Select(img => img.sprite).Where(img => img != null).Distinct();
         }
+#endif // UNITY_2017_1_OR_NEWER
     }
 }

Assets/HoloToolkit/Utilities/Scripts/AtlasReferenceUpdater/Editor/Extensions/SpriteAtlasExtensions.cs

@@ -9,6 +9,8 @@ namespace HoloToolkit.Unity
 {
     public static class SpriteAtlasExtensions
     {
+// SpriteAtlast requires Unity 2017.1 or later
+#if UNITY_2017_1_OR_NEWER
         public const string SpritePackables = "m_EditorData.packables";
 
         public static void SetSprites(this SpriteAtlas spriteAtlas, IList<Sprite> sprites)
@@ -31,5 +33,6 @@ public static bool ContainsSprite(this SpriteAtlas spriteAtlas, Sprite sprite)
             }
             return false;
         }
+#endif // UNITY_2017_1_OR_NEWER
     }
 }