Updates to EditorGUI Extensions in Utilities folder. (#410)

* Updated EditorGUILayoutExtensions to also handle ObjectFields with Material, SceneAssets, and Generic UnityEngine.Objects.
Cleaned up EditorGUIExtionsions and added SceneAsset and Material types to ObjectField

* EditorGUILayoutExtensions: Better GUIContent options.

Author: Stephen Hodgson

Assets/HoloToolkit/Utilities/Editor/EditorGUIExtensions.cs

@@ -29,20 +29,20 @@ public static float Indent
 
         public static bool Button(Rect position, string text)
         {
-            return EditorGUIExtensions.Button(position, new GUIContent(text));
+            return Button(position, new GUIContent(text));
         }
 
         public static bool Button(Rect position, GUIContent content)
         {
-            float indent = EditorGUIExtensions.Indent;
+            float indent = Indent;
             position.x += indent;
             position.width -= indent;
             return GUI.Button(position, content);
         }
 
         public static void Label(Rect position, string text)
         {
-            float indent = EditorGUIExtensions.Indent;
+            float indent = Indent;
             position.x += indent;
             position.width -= indent;
             GUI.Label(position, text);
@@ -52,21 +52,19 @@ public static void Label(Rect position, string text)
         // Doesn't handle serialized types with nested serialized children.
         public static float GetTypeHeight(bool hasLabel, Type valueType)
         {
-            if (valueType == typeof(Vector3) ||
-                valueType == typeof(Vector2))
+            if (valueType == typeof(Vector3) || valueType == typeof(Vector2))
             {
-                return (!hasLabel || EditorGUIUtility.wideMode ? 0f : EditorGUIUtility.singleLineHeight) +
-                    EditorGUIUtility.singleLineHeight;
+                return (!hasLabel || EditorGUIUtility.wideMode ? 0f : EditorGUIUtility.singleLineHeight) + EditorGUIUtility.singleLineHeight;
             }
-            else if (valueType == typeof(Rect))
+
+            if (valueType == typeof(Rect))
             {
-                return (!hasLabel || EditorGUIUtility.wideMode ? 0f : EditorGUIUtility.singleLineHeight) +
-                    EditorGUIUtility.singleLineHeight * 2;
+                return (!hasLabel || EditorGUIUtility.wideMode ? 0f : EditorGUIUtility.singleLineHeight) + EditorGUIUtility.singleLineHeight * 2;
             }
-            else if (valueType == typeof(Bounds))
+
+            if (valueType == typeof(Bounds))
             {
-                return (!hasLabel ? 0f : EditorGUIUtility.singleLineHeight) +
-                    EditorGUIUtility.singleLineHeight * 2;
+                return (!hasLabel ? 0f : EditorGUIUtility.singleLineHeight) + EditorGUIUtility.singleLineHeight * 2;
             }
 
             return EditorGUIUtility.singleLineHeight;
@@ -83,7 +81,7 @@ public static float GetTypeHeight(bool hasLabel, Type valueType)
         /// <returns>The new value.</returns>
         public static T ObjectField<T>(Rect position, GUIContent label, T value, bool allowSceneObjects)
         {
-            object objValue = (object)value;
+            object objValue = value;
 
             Type valueType = objValue.GetType();
             if (valueType == typeof(Bounds))
@@ -94,6 +92,10 @@ public static T ObjectField<T>(Rect position, GUIContent label, T value, bool al
             {
                 objValue = EditorGUI.ColorField(position, label, (Color)objValue);
             }
+            else if (valueType == typeof(Material))
+            {
+                objValue = EditorGUI.ObjectField(position, (Material)objValue, typeof(Material), allowSceneObjects);
+            }
             else if (valueType == typeof(AnimationCurve))
             {
                 objValue = EditorGUI.CurveField(position, label, (AnimationCurve)objValue);
@@ -151,6 +153,10 @@ public static T ObjectField<T>(Rect position, GUIContent label, T value, bool al
 
                 objValue = EditorGUI.Vector4Field(position, label.text, (Vector4)objValue);
             }
+            else if (Equals(objValue, typeof(SceneAsset)))
+            {
+                objValue = EditorGUI.ObjectField(position, (SceneAsset)objValue, typeof(SceneAsset), allowSceneObjects);
+            }
             else if (objValue is UnityEngine.Object)
             {
                 objValue = EditorGUI.ObjectField(position, label, (UnityEngine.Object)objValue, valueType, allowSceneObjects);

Assets/HoloToolkit/Utilities/Editor/EditorGUILayoutExtensions.cs

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+using System;
+using System.Globalization;
 using UnityEditor;
 using UnityEngine;
 
@@ -37,5 +39,35 @@ public static void Label(string text, GUIStyle style, params GUILayoutOption[] o
             GUILayout.Label(text, style, options);
             EditorGUILayout.EndHorizontal();
         }
+
+        public static T ObjectField<T>(GUIContent guiContent, T value, bool allowSceneObjects, GUILayoutOption[] guiLayoutOptions = null)
+        {
+            object objValue = value;
+
+            Type valueType = objValue.GetType();
+            if (valueType == typeof(Material))
+            {
+                objValue = EditorGUILayout.ObjectField(guiContent, (Material)objValue, typeof(Material), allowSceneObjects, guiLayoutOptions);
+            }
+            else if (valueType == typeof(SceneAsset))
+            {
+                objValue = EditorGUILayout.ObjectField(guiContent, (SceneAsset)objValue, typeof(SceneAsset), allowSceneObjects, guiLayoutOptions);
+            }
+            else if (objValue is UnityEngine.Object)
+            {
+                objValue = EditorGUILayout.ObjectField(guiContent, (UnityEngine.Object)objValue, valueType, allowSceneObjects, guiLayoutOptions);
+            }
+            else
+            {
+                throw new ArgumentException(
+                    string.Format(
+                        CultureInfo.InvariantCulture,
+                        "Unimplemented value type: {0}.",
+                        valueType),
+                    "value");
+            }
+
+            return (T)objValue;
+        }
     }
 }