Merge pull request #169 from mjavaly/graham/atn-indices-fix

AssociatedTwineNodes editor fix -- no more shuffling of indices

Author: shoemakerc

Project/Assets/Editor/CustomInspectors/AssociatedTwineNodesEditor.cs

@@ -152,12 +152,32 @@ public static List<int> drawTwineNodeDropdownList (string listTitle, string item
 			}
 			EditorGUILayout.EndHorizontal ();
 		}
-		if (GUILayout.Button(addRowContent, plusButtonWidth))
-		{
-			selectedIndices.Add (0);
+
+		if (nodes.Length != selectedIndices.Count) {
+			// Only show button if there are more nodes available to select:
+			if (GUILayout.Button (addRowContent, plusButtonWidth)) {
+				int firstAvailableIndex = GetFirstIndexNotInList (selectedIndices, nodes.Length - 1);
+				selectedIndices.Add (firstAvailableIndex);
+			}
 		}
 		EditorGUI.indentLevel -= 1;
 
 		return selectedIndices;
 	}
+
+	/// <summary>
+	/// Gets the first index that does not appear in a list of indices.
+	/// </summary>
+	/// <returns>The first index not in list.</returns>
+	/// <param name="indexList">Index list.</param>
+	/// <param name="highestPossibleIndex">Highest possible index.</param>
+	private static int GetFirstIndexNotInList(List<int> indexList, int highestPossibleIndex) {
+		for (int i = 0; i <= highestPossibleIndex; i++) {
+			if (!indexList.Contains (i)) {
+				return i;
+			}
+		}
+
+		return 0;
+	}
 }

Project/Assets/Editor/Utilities/PrairieGUI.cs

@@ -5,24 +5,8 @@
 [AddComponentMenu("Prairie/Twine/Associated Twine Nodes")]
 public class AssociatedTwineNodes : PromptInteraction 
 {
+	// This list is updated through the AssociatedTwineNodesEditor:
 	public List<GameObject> associatedTwineNodeObjects = new List<GameObject>();
-	public List<int> selectedTwineNodeIndices;
-
-	public void UpdateTwineNodeObjectsFromIndices(TwineNode[] nodes)
-	{
-
-		if (this.associatedTwineNodeObjects != null) {
-			// Clear the list of twine nodes and re-add them based on the new indices:
-			this.associatedTwineNodeObjects.Clear ();
-		} else {
-			// Make sure it exists!
-			this.associatedTwineNodeObjects = new List<GameObject> ();
-		}
-		foreach (int index in this.selectedTwineNodeIndices) {
-			GameObject twineNodeObject = nodes [index].gameObject;
-			this.associatedTwineNodeObjects.Add (twineNodeObject);
-		}
-	}
 
 	protected override void PerformAction () 
 	{