From febc453107b470d6a3e4543ab7276aaa4dd5bbc1 Mon Sep 17 00:00:00 2001 From: Kurtis Eveleigh Date: Thu, 3 May 2018 14:56:30 -0700 Subject: [PATCH] Updating scripts to 2017.3 --- .../SpatialMapping/Scripts/PlaneFindingTest.cs | 4 ++++ .../Editor/SurfaceMeshesToPlanesEditor.cs | 10 ++++++++++ .../Utilities/Scripts/Editor/EditorGUIExtensions.cs | 4 ++++ 3 files changed, 18 insertions(+) diff --git a/Assets/HoloToolkit-Examples/SpatialMapping/Scripts/PlaneFindingTest.cs b/Assets/HoloToolkit-Examples/SpatialMapping/Scripts/PlaneFindingTest.cs index e92003aeeeb..1db918e2fc7 100644 --- a/Assets/HoloToolkit-Examples/SpatialMapping/Scripts/PlaneFindingTest.cs +++ b/Assets/HoloToolkit-Examples/SpatialMapping/Scripts/PlaneFindingTest.cs @@ -111,7 +111,11 @@ private void OnDrawGizmosSelected() UnityEditor.Handles.DrawLine(corners[1], corners[2]); UnityEditor.Handles.DrawLine(corners[1], corners[3]); UnityEditor.Handles.DrawLine(corners[2], corners[3]); +#if UNITY_2017_3_OR_NEWER + UnityEditor.Handles.ArrowHandleCap(0, center, Quaternion.FromToRotation(Vector3.forward, normal), 0.4f, EventType.Ignore); +#else UnityEditor.Handles.ArrowHandleCap(0, center, Quaternion.FromToRotation(Vector3.forward, normal), 0.4f, EventType.ignore); +#endif // If this plane is currently in the center of the camera's field of view, highlight it by drawing a // solid rectangle, and display the important details about this plane. diff --git a/Assets/HoloToolkit/SpatialMapping/Scripts/SpatialProcessing/Editor/SurfaceMeshesToPlanesEditor.cs b/Assets/HoloToolkit/SpatialMapping/Scripts/SpatialProcessing/Editor/SurfaceMeshesToPlanesEditor.cs index 0466b91db92..4c392530ddd 100644 --- a/Assets/HoloToolkit/SpatialMapping/Scripts/SpatialProcessing/Editor/SurfaceMeshesToPlanesEditor.cs +++ b/Assets/HoloToolkit/SpatialMapping/Scripts/SpatialProcessing/Editor/SurfaceMeshesToPlanesEditor.cs @@ -25,11 +25,21 @@ public override void OnInspectorGUI() base.OnInspectorGUI(); serializedObject.Update(); +#if UNITY_2017_3_OR_NEWER + drawPlanesMask.intValue = (int)((PlaneTypes)EditorGUILayout.EnumFlagsField("Draw Planes", + (PlaneTypes)drawPlanesMask.intValue)); +#else drawPlanesMask.intValue = (int)((PlaneTypes)EditorGUILayout.EnumMaskField("Draw Planes", (PlaneTypes)drawPlanesMask.intValue)); +#endif +#if UNITY_2017_3_OR_NEWER + destroyPlanesMask.intValue = (int)((PlaneTypes)EditorGUILayout.EnumFlagsField("Destroy Planes", + (PlaneTypes)destroyPlanesMask.intValue)); +#else destroyPlanesMask.intValue = (int)((PlaneTypes)EditorGUILayout.EnumMaskField("Destroy Planes", (PlaneTypes)destroyPlanesMask.intValue)); +#endif serializedObject.ApplyModifiedProperties(); } diff --git a/Assets/HoloToolkit/Utilities/Scripts/Editor/EditorGUIExtensions.cs b/Assets/HoloToolkit/Utilities/Scripts/Editor/EditorGUIExtensions.cs index 4a152b25139..90ac723ecaf 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/Editor/EditorGUIExtensions.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/Editor/EditorGUIExtensions.cs @@ -116,7 +116,11 @@ public static T ObjectField(Rect position, GUIContent label, T value, bool al { if (valueType.GetCustomAttributes(typeof(FlagsAttribute), true).Length > 0) { +#if UNITY_2017_3_OR_NEWER + objValue = EditorGUI.EnumFlagsField(position, label, (Enum)objValue); +#else objValue = EditorGUI.EnumMaskField(position, label, (Enum)objValue); +#endif } else {