Merge branch 'release/1.0'

Author: ashblue

Assets/AdncAnimatorHelpers.meta

@@ -0,0 +1,40 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace Adnc.AnimatorHelpers.Editors.CustomEditors {
+	[CustomEditor(typeof(AnimatorPlayback))]
+	public class AnimatorPlaybackEditor : Editor {
+		private SortableListAnimatorVariable _listBools;
+		private SortableListAnimatorVariable _listFloats;
+		private SortableListAnimatorVariable _listInts;
+		private SortableListAnimatorVariable _listTriggers;
+
+		private void OnEnable () {
+			_listBools = new SortableListAnimatorVariable(this, "bools", "Set Bools");
+			_listFloats = new SortableListAnimatorVariable(this, "floats", "Set Floats");
+			_listInts = new SortableListAnimatorVariable(this, "ints", "Set Ints");
+			_listTriggers = new SortableListAnimatorVariable(this, "triggers", "Set Triggers");
+		}
+
+        public override void OnInspectorGUI () {
+            serializedObject.Update();
+
+            _listBools.Update();
+            _listFloats.Update();
+            _listInts.Update();
+            _listTriggers.Update();
+
+	        var propWait = serializedObject.FindProperty("waitForCondition");
+	        EditorGUILayout.PropertyField(propWait);
+
+	        if (propWait.boolValue) {
+		        var propCondition = serializedObject.FindProperty("conditions");
+		        EditorGUILayout.PropertyField(propCondition, true);
+	        }
+
+            serializedObject.ApplyModifiedProperties();
+        }
+    }
+}

Assets/AdncAnimatorHelpers/Editor.meta

@@ -0,0 +1,33 @@
+using System.Collections;
+using System.Collections.Generic;
+using Adnc.Utility.Editors;
+using UnityEditor;
+using UnityEngine;
+
+namespace Adnc.AnimatorHelpers.Editors.CustomEditors {
+	public class SortableListAnimatorVariable : SortableListBase {
+		public SortableListAnimatorVariable (Editor editor, string property, string title) : base(editor, property, title) {
+			_list.drawElementCallback = (rect, index, active, focused) => {
+				var element = _serializedProp.GetArrayElementAtIndex(index);
+				var propName = element.FindPropertyRelative("name");
+				var propValue = element.FindPropertyRelative("value");
+
+				rect.height -= EditorGUIUtility.standardVerticalSpacing;
+
+				if (propValue != null) {
+					var col1 = rect;
+					col1.width /= 2;
+					col1.width -= EditorGUIUtility.standardVerticalSpacing;
+					EditorGUI.PropertyField(col1, propName, new GUIContent());
+
+					var col2 = col1;
+					col2.x += col1.width + EditorGUIUtility.standardVerticalSpacing;
+					EditorGUI.PropertyField(col2, propValue, new GUIContent());
+				} else {
+					EditorGUI.PropertyField(rect, propName, new GUIContent());
+				}
+			};
+		}
+	}
+}
+