Merge pull request #57 from arimger/develop

Develop - 0.11.9

Author: arimger

Assets/Editor Toolbox/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.11.9 [22.10.2022]
+
+### Added:
+- ScriptableObjectCreationWizard (possibility to create multiple ScriptableObjects at once)
+
+### Changed:
+- Fix displaying empty fields marked with the [SerializeReference] attribute
+- Fix Scene data serialization in the SerializedScene class
+- Fix retrieving FieldInfo from nested [SerializeReference]-based fields
+
 ## 0.11.8 [15.09.2022]
 
 ### Added:

Assets/Editor Toolbox/Editor/Drawers/Regular/SerializedSceneDrawer.cs

@@ -103,16 +103,24 @@ public static SceneData GetSceneData(SerializedProperty property)
                 var sceneAsset = property.objectReferenceValue as SceneAsset;
                 var scenePath = AssetDatabase.GetAssetPath(sceneAsset);
                 var sceneGuid = AssetDatabase.AssetPathToGUID(scenePath);
+                var sceneIndex = -1;
                 for (var i = 0; i < EditorBuildSettings.scenes.Length; i++)
                 {
                     var sceneSettings = EditorBuildSettings.scenes[i];
+                    var isEnabled = sceneSettings.enabled;
+                    if (isEnabled)
+                    {
+                        sceneIndex++;
+                    }
+
                     var guid = sceneSettings.guid;
                     if (guid.Equals(new GUID(sceneGuid)))
                     {
-                        sceneData.index = i;
-                        sceneData.enabled = sceneSettings.enabled;
+                        sceneData.index = isEnabled ? sceneIndex : -1;
+                        sceneData.enabled = isEnabled;
                         sceneData.guid = guid;
                         sceneData.inBuild = true;
+                        break;
                     }
                 }
 

Assets/Editor Toolbox/Editor/Drawers/Toolbox/PropertySelf/ReferencePickerAttributeDrawer.cs

@@ -10,7 +10,6 @@ namespace Toolbox.Editor.Drawers
 
     public class ReferencePickerAttributeDrawer : ToolboxSelfPropertyDrawer<ReferencePickerAttribute>
     {
-        private const float neededLabelWidth = 100.0f;
         private const float labelWidthOffset = -80.0f;
 
         private static readonly TypeConstraintContext sharedConstraint = new TypeConstraintReference(null);
@@ -25,20 +24,21 @@ private void UpdateContexts(ReferencePickerAttribute attribute)
 
         private Type GetParentType(SerializedProperty property, ReferencePickerAttribute attribute)
         {
-            property.GetFieldInfo(out Type propertyType);
+            var fieldInfo = property.GetFieldInfo(out _);
+            var fieldType = property.GetProperType(fieldInfo);
             var candidateType = attribute.ParentType;
             if (candidateType != null)
             {
-                if (propertyType.IsAssignableFrom(candidateType))
+                if (fieldType.IsAssignableFrom(candidateType))
                 {
                     return candidateType;
                 }
 
                 ToolboxEditorLog.AttributeUsageWarning(attribute, property,
-                    $"Provided {nameof(attribute.ParentType)} ({candidateType}) cannot be used because it's not assignable from: '{propertyType}'");
+                    $"Provided {nameof(attribute.ParentType)} ({candidateType}) cannot be used because it's not assignable from: '{fieldType}'");
             }
 
-            return propertyType;
+            return fieldType;
         }
 
         private void CreateTypeProperty(Rect position, SerializedProperty property, Type parentType)
@@ -89,12 +89,9 @@ private Rect PrepareTypePropertyPosition(in Rect labelPosition, in Rect inputPos
             if (isPropertyExpanded)
             {
                 //property is expanded and we have place to move it to the next row
-                if (labelWidth < neededLabelWidth)
-                {
-                    position = EditorGUILayout.GetControlRect(false, EditorGUIUtility.singleLineHeight);
-                    position = EditorGUI.IndentedRect(position);
-                    return position;
-                }
+                position = EditorGUILayout.GetControlRect(false, EditorGUIUtility.singleLineHeight);
+                position = EditorGUI.IndentedRect(position);
+                return position;
             }
 
             //adjust position to already rendered label

Assets/Editor Toolbox/Editor/Internal/PropertyScope.cs

@@ -33,19 +33,22 @@ private void HandleEvents(Rect rect)
 
         private void TryDrawLabel(Rect rect, GUIContent label)
         {
-            LabelRect = rect;
             InputRect = rect;
-            if (property.hasChildren)
+            var size = EditorStyles.label.CalcSize(label);
+            rect.xMax = rect.xMin + size.x;
+            rect.xMax += EditorGuiUtility.IndentSize;
+            rect.xMax += EditorGuiUtility.SpacingSize;
+            LabelRect = rect;
+            if (property.hasVisibleChildren)
             {
-                var size = EditorStyles.label.CalcSize(label);
-                size.x = Mathf.Max(EditorGuiUtility.FoldoutOffset, size.x);
-                rect.xMax = rect.xMin + size.x;
-                LabelRect = rect;
-                property.isExpanded = EditorGUI.Foldout(rect, property.isExpanded, label, true);
+                var labelRect = LabelRect;
+                labelRect.xMax += EditorGuiUtility.FoldoutSize;
+                LabelRect = labelRect;
+                property.isExpanded = EditorGUI.Foldout(labelRect, property.isExpanded, label, true);
             }
             else
             {
-                EditorGUI.LabelField(rect, label);
+                EditorGUI.LabelField(LabelRect, label);
             }
         }
 

Assets/Editor Toolbox/Editor/ToolboxEditorGui.cs

@@ -2,6 +2,7 @@
 
 using UnityEditor;
 using UnityEngine;
+using Object = UnityEngine.Object;
 
 namespace Toolbox.Editor
 {
@@ -206,16 +207,16 @@ public static void DrawMinMaxSlider(Rect rect, string label, ref float xValue, r
         public static void DrawMinMaxSlider(Rect rect, GUIContent label, ref float xValue, ref float yValue, float minValue, float maxValue)
         {
             rect = EditorGUI.PrefixLabel(rect, label);
- 
+
             var fieldWidth = EditorGUIUtility.fieldWidth;
             var minFieldRect = new Rect(rect.xMin, rect.y, fieldWidth, rect.height);
             var maxFieldRect = new Rect(rect.xMax - fieldWidth, rect.y, fieldWidth, rect.height);
 
             //set slider rect between min and max fields + additional padding
             var spacing = 8.0f;
             var sliderRect = Rect.MinMaxRect(minFieldRect.xMax + spacing,
-                                             rect.yMin, 
-                                             maxFieldRect.xMin - spacing, 
+                                             rect.yMin,
+                                             maxFieldRect.xMin - spacing,
                                              rect.yMax);
 
             EditorGUI.BeginChangeCheck();
@@ -604,5 +605,31 @@ public static void CloseProperty()
         {
             EditorGUI.EndProperty();
         }
+
+        /// <summary>
+        /// Displays all visible children (except the default script property) associated to the given <see cref="Object"/>.
+        /// This method doesn't support Toolbox-based features.
+        /// </summary>
+        public static void DrawObjectProperties(Object instance)
+        {
+            using (SerializedObject serializedObject = new SerializedObject(instance))
+            {
+                var property = serializedObject.GetIterator();
+                if (property.NextVisible(true))
+                {
+                    if (!PropertyUtility.IsDefaultScriptProperty(property))
+                    {
+                        DrawNativeProperty(property.Copy());
+                    }
+
+                    while (property.NextVisible(false))
+                    {
+                        DrawNativeProperty(property.Copy());
+                    }
+                }
+
+                serializedObject.ApplyModifiedProperties();
+            }
+        }
     }
 }

Assets/Editor Toolbox/Editor/ToolboxPropertyHandler.cs

@@ -286,11 +286,11 @@ private void DrawProperty(SerializedProperty property, GUIContent label)
                     //draw target property using the associated type drawer
                     ToolboxDrawerModule.GetTargetTypeDrawer(type)?.OnGui(property, label);
                 }
+
+                return;
             }
-            else
-            {
-                OnGuiDefault(property, label);
-            }
+
+            OnGuiDefault(property, label);
         }
 
         private void BeginDecoratorDrawers(PropertyCondition conditionState = PropertyCondition.Valid)

Assets/Editor Toolbox/Editor/Utilities/EditorGuiUtility.cs

@@ -12,6 +12,8 @@ namespace Toolbox.Editor
     /// </summary>
     internal static class EditorGuiUtility
     {
+        private const float indentPerLevel = 15.0f;
+
         private static readonly Dictionary<string, Texture2D> loadedTextures = new Dictionary<string, Texture2D>();
 
 
@@ -99,6 +101,9 @@ public static Texture GetHelpIcon(MessageType messageType)
         }
 
 
-        public static float FoldoutOffset { get; internal set; } = 28.0f;
+        public static float FoldoutSize { get; internal set; } = 15.0f;
+        public static float SpacingSize => EditorGUIUtility.standardVerticalSpacing;
+        public static float HeightSize => EditorGUIUtility.singleLineHeight;
+        public static float IndentSize => EditorGUI.indentLevel * indentPerLevel;
     }
 }

Assets/Editor Toolbox/Editor/Utilities/PropertyUtility.cs

@@ -10,6 +10,12 @@ namespace Toolbox.Editor
 {
     public static partial class PropertyUtility
     {
+        //NOTE: last non-reflection implementation was ok but support for [SerializeReference] makes it a bit slow
+        // unfortunately UnityEditor.ScriptAttributeUtility.GetFieldInfoFromProperty is internal so we have to retrive it using reflection
+        private static readonly MethodInfo getGetFieldInfoFromPropertyMethod =
+            ReflectionUtility.GetEditorMethod("UnityEditor.ScriptAttributeUtility", "GetFieldInfoFromProperty",
+                BindingFlags.NonPublic | BindingFlags.Static);
+
         /// <summary>
         /// Indicates if the property has all changes applied and can be safely used for reflection-based features.
         /// </summary>
@@ -249,22 +255,20 @@ public static Type GetScriptTypeFromProperty(SerializedProperty property)
             return scriptInstance.GetClass();
         }
 
-
         public static FieldInfo GetFieldInfo(this SerializedProperty property)
         {
             return GetFieldInfo(property, out _);
         }
 
         public static FieldInfo GetFieldInfo(this SerializedProperty property, out Type propertyType)
         {
-            return GetFieldInfoFromProperty(property, out propertyType);
-        }
-
-        public static FieldInfo GetFieldInfo(this SerializedProperty property, out Type propertyType, Object target)
-        {
-            return GetFieldInfoFromProperty(property, out propertyType, target.GetType());
+            var parameters = new object[] { property, null };
+            var result = getGetFieldInfoFromPropertyMethod.Invoke(null, parameters) as FieldInfo;
+            propertyType = parameters[1] as Type;
+            return result;
         }
 
+        [Obsolete("This method is no longer safe, use GetFieldInfo() instead.")]
         public static FieldInfo GetFieldInfoFromProperty(SerializedProperty property, out Type type)
         {
             var classType = GetScriptTypeFromProperty(property);
@@ -277,8 +281,11 @@ public static FieldInfo GetFieldInfoFromProperty(SerializedProperty property, ou
             return GetFieldInfoFromProperty(property, out type, classType);
         }
 
+        [Obsolete("This method is no longer safe, use GetFieldInfo() instead.")]
         public static FieldInfo GetFieldInfoFromProperty(SerializedProperty property, out Type type, Type host)
         {
+            const BindingFlags fieldFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
+
             FieldInfo field = null;
             type = host;
 
@@ -297,7 +304,6 @@ public static FieldInfo GetFieldInfoFromProperty(SerializedProperty property, ou
                     continue;
                 }
 
-                const BindingFlags fieldFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
                 FieldInfo foundField = null;
                 for (var currentType = type; foundField == null && currentType != null; currentType = currentType.BaseType)
                 {
@@ -383,7 +389,7 @@ public static SerializedProperty GetSize(this SerializedProperty array)
 
         public static T GetAttribute<T>(SerializedProperty property) where T : Attribute
         {
-            return GetAttribute<T>(property, GetFieldInfoFromProperty(property, out _));
+            return GetAttribute<T>(property, GetFieldInfo(property, out _));
         }
 
         public static T GetAttribute<T>(SerializedProperty property, FieldInfo fieldInfo) where T : Attribute
@@ -393,7 +399,7 @@ public static T GetAttribute<T>(SerializedProperty property, FieldInfo fieldInfo
 
         public static T[] GetAttributes<T>(SerializedProperty property) where T : Attribute
         {
-            return GetAttributes<T>(property, GetFieldInfoFromProperty(property, out _));
+            return GetAttributes<T>(property, GetFieldInfo(property, out _));
         }
 
         public static T[] GetAttributes<T>(SerializedProperty property, FieldInfo fieldInfo) where T : Attribute