Initial implementation of SetVariable custom editor

Assets/Fungus/Editor/SetVariableCommandEditor.cs

@@ -3,55 +3,102 @@ using UnityEngine;
 using System.Collections;
 using System.Collections.Generic;
 
-[CustomEditor (typeof(SetVariableCommand))]
-public class SetVariableCommandEditor : FungusCommandEditor 
+namespace Fungus
 {
-	public override void DrawCommandInspectorGUI()
-	{
-		SetVariableCommand t = target as SetVariableCommand;
 
-		SequenceController sc = t.GetParentSequenceController();
-		if (sc == null)
+	[CustomEditor (typeof(SetVariableCommand))]
+	public class SetVariableCommandEditor : FungusCommandEditor 
+	{
+		public override void DrawCommandInspectorGUI()
 		{
-			return;
-		}
+			SetVariableCommand t = target as SetVariableCommand;
 
-		int index = -1;
-		List<string> keys = new List<string>();
-		for (int i = 0; i < sc.variables.Count; ++i)
-		{
-			Variable v = sc.variables[i];
-			keys.Add(v.key);
-			if (v.key == t.variableKey &&
-			    index == -1)
+			SequenceController sc = t.GetParentSequenceController();
+			if (sc == null)
 			{
-				index = i;
+				return;
 			}
-		}
 
-		index = EditorGUILayout.Popup("Variable", index, keys.ToArray());
+			List<string> keys = new List<string>();
+			keys.Add("<None>");
+			int index = 0;
+			for (int i = 0; i < sc.variables.Count; ++i)
+			{
+				Variable v = sc.variables[i];
+				keys.Add(v.key);
+				if (v.key == t.variableKey &&
+				    index == 0)
+				{
+					index = i + 1;
+				}
+			}
 
-		Variable variable = sc.variables[index];
 
-		t.variableKey = variable.key;
 
-		switch (variable.type)
-		{
-		case VariableType.Boolean:
-			t.booleanValue = EditorGUILayout.Toggle(new GUIContent("Boolean Value", "The boolean value to set the variable with"), t.booleanValue);
-			break;
-		case VariableType.Integer:
-			t.integerValue = EditorGUILayout.IntField(new GUIContent("Integer Value", "The integer value to set the variable with"), t.integerValue);
-			break;
-		case VariableType.Float:
-			t.floatValue = EditorGUILayout.FloatField(new GUIContent("Float Value", "The float value to set the variable with"), t.floatValue);
-			break;
-		case VariableType.String:
-			t.stringValue = EditorGUILayout.TextField(new GUIContent("String Value", "The string value to set the variable with"), t.stringValue);
-			break;
-		}
+			int newIndex = EditorGUILayout.Popup("Variable", index, keys.ToArray());
 
-	}
+			if (newIndex != index)
+			{
+				Undo.RecordObject(t, "Select variable");
+			}
+
+			if (newIndex == 0)
+			{
+				t.variableKey = "";
+				return;
+			}
+
+			Variable variable = sc.variables[newIndex - 1];
+
+			if (t.variableKey != variable.key)
+			{
+				Undo.RecordObject(t, "Select variable");
+				t.variableKey = variable.key;
+			}
+
+			bool booleanValue = t.booleanValue;
+			int integerValue = t.integerValue;
+			float floatValue = t.floatValue;
+			string stringValue = t.stringValue;
 
+			switch (variable.type)
+			{
+			case VariableType.Boolean:
+				booleanValue = EditorGUILayout.Toggle(new GUIContent("Boolean Value", "The boolean value to set the variable with"), t.booleanValue);
+				break;
+			case VariableType.Integer:
+				integerValue = EditorGUILayout.IntField(new GUIContent("Integer Value", "The integer value to set the variable with"), t.integerValue);
+				break;
+			case VariableType.Float:
+				floatValue = EditorGUILayout.FloatField(new GUIContent("Float Value", "The float value to set the variable with"), t.floatValue);
+				break;
+			case VariableType.String:
+				stringValue = EditorGUILayout.TextField(new GUIContent("String Value", "The string value to set the variable with"), t.stringValue);
+				break;
+			}
+
+			if (booleanValue != t.booleanValue)
+			{
+				Undo.RecordObject(t, "Set boolean value");
+				t.booleanValue = booleanValue;
+			}
+			else if (integerValue != t.integerValue)
+			{
+				Undo.RecordObject(t, "Set integer value");
+				t.integerValue = integerValue;
+			}
+			else if (floatValue != t.floatValue)
+			{
+				Undo.RecordObject(t, "Set float value");
+				t.floatValue = floatValue;
+			}
+			else if (stringValue != t.stringValue)
+			{
+				Undo.RecordObject(t, "Set string value");
+				t.stringValue = stringValue;
+			}
+
+		}
+	}
 
 }

Assets/Fungus/VisualScripting/CompareCommand.cs

@@ -8,6 +8,12 @@ public class CompareCommand : FungusCommand
 	
 	public bool booleanValue;
 
+	public int integerValue;
+
+	public float floatValue;
+
+	public string stringValue;
+	
 	public Sequence trueSequence;
 
 	public Sequence falseSequence;

Assets/Fungus/VisualScripting/Variable.cs

@@ -2,22 +2,27 @@
 using System;
 using System.Collections;
 
-public enum VariableType
+namespace Fungus
 {
-	Boolean,
-	Integer,
-	Float,
-	String
-};
 
-[Serializable]
-public class Variable
-{
-	public string key;
-	public VariableType type;
+	public enum VariableType
+	{
+		Boolean,
+		Integer,
+		Float,
+		String
+	};
+
+	[Serializable]
+	public class Variable
+	{
+		public string key;
+		public VariableType type;
+
+		public string stringValue;
+		public int integerValue;
+		public float floatValue;
+		public bool booleanValue;
+	}
 
-	public string stringValue;
-	public int integerValue;
-	public float floatValue;
-	public bool booleanValue;
 }