Refactored iterators

Author: DanielEverland

Assets/SO Architecture/Editor/Drawers/GenericPropertyDrawer.cs

@@ -0,0 +1,59 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+
+namespace ScriptableObjectArchitecture.Editor
+{
+    public abstract class BasePropertyDrawIterator : PropertyIterator, IPropertyDrawIterator
+    {
+        public BasePropertyDrawIterator(SerializedProperty property, bool drawLabel) : base(property)
+        {
+            this.drawLabel = drawLabel;
+            this.startIndentLevel = EditorGUI.indentLevel;
+            this.startDepth = iterator.depth;
+        }
+
+        protected readonly bool drawLabel;
+        protected readonly int startIndentLevel;
+        protected readonly int startDepth;
+
+        protected abstract void DrawProperty();
+        protected abstract void DrawPropertyWithLabel();
+
+        public virtual void Draw()
+        {
+            EditorGUI.indentLevel = GetIndent(iterator.depth);
+
+            if (IsCustom(iterator))
+            {
+                DrawPropertyWithLabel();
+            }
+            else
+            {
+                if(drawLabel)
+                {
+                    DrawPropertyWithLabel();
+                }
+                else
+                {
+                    DrawProperty();
+                }
+            }
+        }
+        public override void End()
+        {
+            base.End();
+
+            EditorGUI.indentLevel = startIndentLevel;
+        }
+        private int GetIndent(int depth)
+        {
+            return startIndentLevel + (depth - startDepth);
+        }
+        private bool IsCustom(SerializedProperty property)
+        {
+            return property.propertyType == SerializedPropertyType.Generic;
+        }
+    } 
+}

Assets/SO Architecture/Editor/Generic Property Drawer/BasePropertyDrawIterator.cs

@@ -0,0 +1,11 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace ScriptableObjectArchitecture.Editor
+{
+    public interface IPropertyDrawIterator : IPropertyIterator
+    {
+        void Draw();
+    } 
+}

Assets/SO Architecture/Editor/Generic Property Drawer/BasePropertyDrawIterator.cs.meta

@@ -0,0 +1,13 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace ScriptableObjectArchitecture.Editor
+{
+    public interface IPropertyIterator
+    {
+        bool Next();
+        void End();
+    }
+
+}

Assets/SO Architecture/Editor/Generic Property Drawer/IPropertyDrawIterator.cs

@@ -0,0 +1,39 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+
+namespace ScriptableObjectArchitecture.Editor
+{
+    public class PropertyDrawIterator : BasePropertyDrawIterator
+    {
+        public PropertyDrawIterator(Rect rect, SerializedProperty property, bool drawLabel) : base(property, drawLabel)
+        {
+            this.rect = rect;
+            this.rect.height = EditorGUIUtility.singleLineHeight;
+        }
+
+        private Rect rect;
+
+        public override void Draw()
+        {
+            base.Draw();
+
+            MoveRectDownOneLine();
+        }
+
+        protected override void DrawPropertyWithLabel()
+        {
+            EditorGUI.PropertyField(rect, iterator);
+        }
+        protected override void DrawProperty()
+        {
+            EditorGUI.PropertyField(rect, iterator, GUIContent.none);
+        }
+
+        private void MoveRectDownOneLine()
+        {
+            rect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
+        }
+    }
+}

Assets/SO Architecture/Editor/Generic Property Drawer/IPropertyDrawIterator.cs.meta

@@ -0,0 +1,23 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+
+namespace ScriptableObjectArchitecture.Editor
+{
+    public class PropertyDrawIteratorLayout : BasePropertyDrawIterator
+    {
+        public PropertyDrawIteratorLayout(SerializedProperty property, bool drawLabel) : base(property, drawLabel)
+        {
+        }
+
+        protected override void DrawPropertyWithLabel()
+        {
+            EditorGUILayout.PropertyField(iterator);
+        }
+        protected override void DrawProperty()
+        {
+            EditorGUILayout.PropertyField(iterator, GUIContent.none);
+        }
+    } 
+}