Added object for visual display of wait for condition checkbox

Author: ashblue

Assets/AdncAnimatorVariableStates/Editor/Scripts/CustomEditors/AnimatorPlayback/AnimatorPlaybackEditor.cs

@@ -29,6 +29,11 @@ public override void OnInspectorGUI () {
 	        var propWait = serializedObject.FindProperty("waitForCondition");
 	        EditorGUILayout.PropertyField(propWait);
 
+	        if (propWait.boolValue) {
+		        var propCondition = serializedObject.FindProperty("conditions");
+		        EditorGUILayout.PropertyField(propCondition, true);
+	        }
+
             serializedObject.ApplyModifiedProperties();
         }
     }

Assets/AdncAnimatorVariableStates/Examples/Default/New Animator Controller.controller

@@ -0,0 +1,11 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: New Animator Controller
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers: []

Assets/AdncAnimatorVariableStates/Examples/Default/New Animator Controller.controller.meta

@@ -9,10 +9,22 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 44e34c91dd1d14d608614b6f9950223b, type: 3}
-  m_Name: AnimatorPlayback
+  m_Name: Playback
   m_EditorClassIdentifier: 
   bools: []
   floats: []
   ints: []
   triggers: []
   waitForCondition: 0
+  conditions:
+  - varType: 0
+    varBool:
+      name: 
+      value: 0
+    compareNumbers: 0
+    VarFloat:
+      name: 
+      value: 0
+    VarInt:
+      name: 
+      value: 0

Assets/AdncAnimatorVariableStates/Examples/Default/AnimatorPlayBack.asset renamed to Assets/AdncAnimatorVariableStates/Examples/Default/Playback.asset

@@ -1,7 +1,9 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using Adnc.AnimatorVariables.Conditions;
 using Adnc.AnimatorVariables.Variables;
+using Adnc.Utility;
 using UnityEngine;
 
 namespace Adnc.AnimatorVariables {
@@ -19,9 +21,14 @@ public class AnimatorPlayback : ScriptableObject {
 		[HideInInspector]
 		public List<VarTrigger> triggers = new List<VarTrigger>();
 
-		[Tooltip("If a condition is required to complete the animator playback")]
+		[Tooltip("If a condition is required to complete the animator playback. When the condition is met" +
+		         " a true event will be fired")]
 		public bool waitForCondition;
 
+		public List<Condition> conditions = new List<Condition> {
+			new Condition()
+		};
+
 		/// <summary>
 		/// Set the Animator variables
 		/// </summary>

Assets/AdncAnimatorVariableStates/Examples/Default/AnimatorPlayBack.asset.meta renamed to Assets/AdncAnimatorVariableStates/Examples/Default/Playback.asset.meta

@@ -0,0 +1,88 @@
+using System;
+using Adnc.AnimatorVariables.Variables;
+using Adnc.Utility;
+using UnityEngine;
+
+namespace Adnc.AnimatorVariables.Conditions {
+	[Serializable]
+	public class Condition {
+		const float FLOAT_POINT_COMPARE = 0.01f;
+		private const string VAR_TOOLTIP = "The variable data to compare against";
+		private const string COMPARE_TOOLTIP = "What is required when comparing to trigger a true event";
+
+		[Tooltip("The variable type to target")]
+		public ConditionVarType variableType;
+
+		// ***** Bools
+
+		[Tooltip(VAR_TOOLTIP)]
+		[ShowToggle("variableType", new []{0})]
+		public VarBool variableBool = new VarBool();
+
+		// ***** Numbers
+
+		[Tooltip("How should the animator value be compared to the declared value")]
+		[ShowToggle("variableType", new []{1,2})]
+		public OperatorAll compareValues;
+
+		[Tooltip(VAR_TOOLTIP)]
+		[ShowToggle("variableType", new []{1})]
+		public VarFloat variableFloat = new VarFloat();
+
+		[Tooltip(VAR_TOOLTIP)]
+		[ShowToggle("variableType", new []{2})]
+		public VarInt variableInt = new VarInt();
+
+		public bool IsConditionMet (Animator animator) {
+			switch (variableType) {
+				case ConditionVarType.Bool:
+					return animator.GetBool(variableBool.name) == variableBool.value;
+				case ConditionVarType.Float:
+					return AreEqual(compareValues, animator.GetFloat(variableFloat.name), variableFloat.value);
+				case ConditionVarType.Int:
+					return AreEqual(compareValues, animator.GetInteger(variableInt.name), variableInt.value);
+				default:
+					throw new ArgumentOutOfRangeException();
+			}
+		}
+
+		static bool AreEqual (OperatorAll operation, int a, int b) {
+			switch (operation) {
+				case OperatorAll.AreEqual:
+					return a == b;
+				case OperatorAll.AreNotEqual:
+					return a != b;
+				case OperatorAll.OriginalIsGreaterThan:
+					return a > b;
+				case OperatorAll.OriginalIsGreaterThanOrEqualTo:
+					return a >= b;
+				case OperatorAll.OriginalIsLessThan:
+					return a < b;
+				case OperatorAll.OriginalIsLessThanOrEqualTo:
+					return a <= b;
+				default:
+					throw new ArgumentOutOfRangeException("operation", operation, null);
+			}
+		}
+
+		static bool AreEqual (OperatorAll operation, float a, float b) {
+			switch (operation) {
+				case OperatorAll.AreEqual:
+					return Math.Abs(a - b) < FLOAT_POINT_COMPARE;
+				case OperatorAll.AreNotEqual:
+					return Math.Abs(a - b) > FLOAT_POINT_COMPARE;
+				case OperatorAll.OriginalIsGreaterThan:
+					return a > b;
+				case OperatorAll.OriginalIsGreaterThanOrEqualTo:
+					return a >= b;
+				case OperatorAll.OriginalIsLessThan:
+					return a < b;
+				case OperatorAll.OriginalIsLessThanOrEqualTo:
+					return a <= b;
+				default:
+					throw new ArgumentOutOfRangeException("operation", operation, null);
+			}
+		}
+	}
+}
+

Assets/AdncAnimatorVariableStates/Scripts/AnimatorPlayback/AnimatorPlayback.cs

@@ -0,0 +1,7 @@
+namespace Adnc.AnimatorVariables.Conditions {
+    public enum ConditionVarType {
+        Bool,
+        Float,
+        Int
+    }
+}