Rewrite all custom editor property drawers

Author: adamgraham

Editor/BitmaskPropertyDrawer.cs

@@ -0,0 +1,33 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace Zigurous.DataStructures.Editor
+{
+    [CustomPropertyDrawer(typeof(Bitmask))]
+    public class BitmaskPropertyDrawer : PropertyDrawer
+    {
+        public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
+        {
+            EditorGUI.BeginProperty(position, label, property);
+
+            position = EditorGUI.PrefixLabel(position, GUIUtility.GetControlID(FocusType.Passive), label);
+
+            int indentLevel = EditorGUI.indentLevel;
+            EditorGUI.indentLevel = 0;
+
+            EditorGUI.BeginChangeCheck();
+
+            SerializedProperty mask = property.FindPropertyRelative("mask");
+            int value = EditorGUI.IntField(position, mask.intValue);
+
+            if (EditorGUI.EndChangeCheck()) {
+                mask.intValue = value;
+            }
+
+            EditorGUI.indentLevel = indentLevel;
+            EditorGUI.EndProperty();
+        }
+
+    }
+
+}

Editor/PropertyDrawers/RangePropertyDrawer.cs.meta renamed to Editor/BitmaskPropertyDrawer.cs.meta

@@ -0,0 +1,46 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace Zigurous.DataStructures.Editor
+{
+    [CustomPropertyDrawer(typeof(Bool3))]
+    public class Bool3PropertyDrawer : PropertyDrawer
+    {
+        public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
+        {
+            EditorGUI.BeginProperty(position, label, property);
+
+            position = EditorGUI.PrefixLabel(position, GUIUtility.GetControlID(FocusType.Passive), label);
+
+            int indentLevel = EditorGUI.indentLevel;
+            EditorGUI.indentLevel = 0;
+
+            position = BoolField(position, property.FindPropertyRelative("x"));
+            position = BoolField(position, property.FindPropertyRelative("y"));
+            position = BoolField(position, property.FindPropertyRelative("z"));
+
+            EditorGUI.indentLevel = indentLevel;
+            EditorGUI.EndProperty();
+        }
+
+        private Rect BoolField(Rect position, SerializedProperty property)
+        {
+            Rect field = EditorGUIUtility.GetFieldRect(position, 3);
+            position.x += field.width + EditorGUIUtility.standardHorizontalSpacing;
+
+            EditorGUI.BeginChangeCheck();
+
+            bool value = EditorGUIUtility.FieldWrapper(property.displayName, (label) => {
+                return EditorGUI.Toggle(field, label, property.boolValue);
+            });
+
+            if (EditorGUI.EndChangeCheck()) {
+                property.boolValue = value;
+            }
+
+            return position;
+        }
+
+    }
+
+}

Editor/Bool3PropertyDrawer.cs

@@ -0,0 +1,83 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace Zigurous.DataStructures.Editor
+{
+    [CustomPropertyDrawer(typeof(ClampedRange))]
+    public class ClampedRangePropertyDrawer : PropertyDrawer
+    {
+        public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
+        {
+            return (EditorGUIUtility.singleLineHeight * 3f) +
+                   (EditorGUIUtility.standardVerticalSpacing * 2f);
+        }
+
+        public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
+        {
+            EditorGUI.BeginProperty(position, label, property);
+
+            position.height = EditorGUIUtility.singleLineHeight;
+            EditorGUI.PrefixLabel(position, GUIUtility.GetControlID(FocusType.Passive), label);
+
+            SerializedProperty range = property.FindPropertyRelative("range");
+            SerializedProperty clamp = property.FindPropertyRelative("clamp");
+
+            position = RangeProperty(position, range);
+            position = RangeProperty(position, clamp);
+
+            SerializedProperty rangeMin = range.FindPropertyRelative("_min");
+            SerializedProperty rangeMax = range.FindPropertyRelative("_max");
+
+            SerializedProperty clampMin = clamp.FindPropertyRelative("_min");
+            SerializedProperty clampMax = clamp.FindPropertyRelative("_max");
+
+            rangeMin.floatValue = Mathf.Clamp(rangeMin.floatValue, clampMin.floatValue, clampMax.floatValue);
+            rangeMax.floatValue = Mathf.Clamp(rangeMax.floatValue, clampMin.floatValue, clampMax.floatValue);
+
+            EditorGUI.EndProperty();
+        }
+
+        private Rect RangeProperty(Rect position, SerializedProperty property)
+        {
+            position.y += EditorGUIUtility.singleLineHeight;
+            position.y += EditorGUIUtility.standardVerticalSpacing;
+
+            EditorGUI.BeginProperty(position, new GUIContent(property.displayName), property);
+
+            int indentLevel = EditorGUI.indentLevel;
+            EditorGUI.indentLevel++;
+
+            Rect field = EditorGUI.PrefixLabel(position, GUIUtility.GetControlID(FocusType.Passive), new GUIContent(property.displayName));
+
+            EditorGUI.indentLevel = 0;
+
+            field = FloatField(field, property.FindPropertyRelative("_min"));
+            field = FloatField(field, property.FindPropertyRelative("_max"));
+
+            EditorGUI.indentLevel = indentLevel;
+            EditorGUI.EndProperty();
+
+            return position;
+        }
+
+        private Rect FloatField(Rect position, SerializedProperty property)
+        {
+            Rect field = EditorGUIUtility.GetFieldRect(position, 2);
+            position.x += field.width + EditorGUIUtility.standardHorizontalSpacing;
+
+            EditorGUI.BeginChangeCheck();
+
+            float value = EditorGUIUtility.FieldWrapper(property.displayName, (label) => {
+                return EditorGUI.FloatField(field, label, property.floatValue);
+            });
+
+            if (EditorGUI.EndChangeCheck()) {
+                property.floatValue = value;
+            }
+
+            return position;
+        }
+
+    }
+
+}

Editor/PropertyDrawers/Bool3PropertyDrawer.cs.meta renamed to Editor/Bool3PropertyDrawer.cs.meta

@@ -0,0 +1,45 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace Zigurous.DataStructures.Editor
+{
+    [CustomPropertyDrawer(typeof(ColorRange))]
+    public class ColorRangePropertyDrawer : PropertyDrawer
+    {
+        public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
+        {
+            EditorGUI.BeginProperty(position, label, property);
+
+            position = EditorGUI.PrefixLabel(position, GUIUtility.GetControlID(FocusType.Passive), label);
+
+            int indentLevel = EditorGUI.indentLevel;
+            EditorGUI.indentLevel = 0;
+
+            position = ColorField(position, property.FindPropertyRelative("_min"));
+            position = ColorField(position, property.FindPropertyRelative("_max"));
+
+            EditorGUI.indentLevel = indentLevel;
+            EditorGUI.EndProperty();
+        }
+
+        private Rect ColorField(Rect position, SerializedProperty property)
+        {
+            Rect field = EditorGUIUtility.GetFieldRect(position, 2);
+            position.x += field.width + EditorGUIUtility.standardHorizontalSpacing;
+
+            EditorGUI.BeginChangeCheck();
+
+            Color value = EditorGUIUtility.FieldWrapper(property.displayName, (label) => {
+                return EditorGUI.ColorField(field, label, property.colorValue);
+            });
+
+            if (EditorGUI.EndChangeCheck()) {
+                property.colorValue = value;
+            }
+
+            return position;
+        }
+
+    }
+
+}

Editor/ClampedRangePropertyDrawer.cs

@@ -0,0 +1,38 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace Zigurous.DataStructures.Editor
+{
+    internal static class EditorGUIUtility
+    {
+        internal const float standardHorizontalSpacing = 4f;
+
+        internal static float singleLineHeight => UnityEditor.EditorGUIUtility.singleLineHeight;
+        internal static float standardVerticalSpacing => UnityEditor.EditorGUIUtility.standardVerticalSpacing;
+
+        internal static Rect GetFieldRect(Rect position, int columns)
+        {
+            float spacing = standardHorizontalSpacing * (columns - 1);
+            position.width = (position.width - spacing) / columns;
+            return position;
+        }
+
+        internal static T FieldWrapper<T>(string label, System.Func<GUIContent, T> draw)
+        {
+            GUIContent content = new GUIContent(label);
+
+            float labelWidth = EditorStyles.label.CalcSize(content).x;
+            float originalWidth = UnityEditor.EditorGUIUtility.labelWidth;
+
+            UnityEditor.EditorGUIUtility.labelWidth = labelWidth;
+
+            T value = draw(content);
+
+            UnityEditor.EditorGUIUtility.labelWidth = originalWidth;
+
+            return value;
+        }
+
+    }
+
+}