Merge pull request #251 from umasteeringgroup/fix-281-rc2-powertoolsevents

Fixes UMAData events so that removing listeners from them works prope…

Author: Jaimi

UMAProject/Assets/UMA/Core/StandardAssets/UMA/Scripts/UMAData.cs

@@ -126,28 +126,28 @@ public void RegisterAnimatedBoneHierarchy(int hash)
 		/// <summary>
 		/// Callback event when character has been updated.
 		/// </summary>
-		public event Action<UMAData> OnCharacterUpdated { add { if (CharacterUpdated == null) CharacterUpdated = new UMADataEvent(); CharacterUpdated.AddListener(new UnityAction<UMAData>(value)); } remove { CharacterUpdated.RemoveListener(new UnityAction<UMAData>(value)); } }
+		public event Action<UMAData> OnCharacterUpdated { add { if (CharacterUpdated == null) CharacterUpdated = new UMADataEvent(); CharacterUpdated.AddAction(value); } remove { CharacterUpdated.RemoveAction(value); } }
 		/// <summary>
 		/// Callback event when character has been completely created.
 		/// </summary>
-		public event Action<UMAData> OnCharacterCreated { add { if (CharacterCreated == null) CharacterCreated = new UMADataEvent(); CharacterCreated.AddListener(new UnityAction<UMAData>(value)); } remove { CharacterCreated.RemoveListener(new UnityAction<UMAData>(value)); } }
+		public event Action<UMAData> OnCharacterCreated { add { if (CharacterCreated == null) CharacterCreated = new UMADataEvent(); CharacterCreated.AddAction(value); } remove { CharacterCreated.RemoveAction(value); } }
 		/// <summary>
 		/// Callback event when character has been destroyed.
 		/// </summary>
-		public event Action<UMAData> OnCharacterDestroyed { add { if (CharacterDestroyed == null) CharacterDestroyed = new UMADataEvent(); CharacterDestroyed.AddListener(new UnityAction<UMAData>(value)); } remove { CharacterDestroyed.RemoveListener(new UnityAction<UMAData>(value)); } }
+		public event Action<UMAData> OnCharacterDestroyed { add { if (CharacterDestroyed == null) CharacterDestroyed = new UMADataEvent(); CharacterDestroyed.AddAction(value); } remove { CharacterDestroyed.RemoveAction(value); } }
 
 		/// <summary>
 		/// Callback event when character DNA has been updated.
 		/// </summary>
-		public event Action<UMAData> OnCharacterDnaUpdated { add { if (CharacterDnaUpdated == null) CharacterDnaUpdated = new UMADataEvent(); CharacterDnaUpdated.AddListener(new UnityAction<UMAData>(value)); } remove { CharacterDnaUpdated.RemoveListener(new UnityAction<UMAData>(value)); } }
+		public event Action<UMAData> OnCharacterDnaUpdated { add { if (CharacterDnaUpdated == null) CharacterDnaUpdated = new UMADataEvent(); CharacterDnaUpdated.AddAction(value); } remove { CharacterDnaUpdated.RemoveAction(value); } }
 		/// <summary>
 		/// Callback event used by UMA to make last minute tweaks
 		/// </summary>
-		public event Action<UMAData> OnCharacterBeforeUpdated { add { if (CharacterBeforeUpdated == null) CharacterBeforeUpdated = new UMADataEvent(); CharacterBeforeUpdated.AddListener(new UnityAction<UMAData>(value)); } remove { CharacterBeforeUpdated.RemoveListener(new UnityAction<UMAData>(value)); } }
+		public event Action<UMAData> OnCharacterBeforeUpdated { add { if (CharacterBeforeUpdated == null) CharacterBeforeUpdated = new UMADataEvent(); CharacterBeforeUpdated.AddAction(value);} remove { CharacterBeforeUpdated.RemoveAction(value); } }
 		/// <summary>
 		/// Callback event used by UMA to make last minute tweaks
 		/// </summary>
-		public event Action<UMAData> OnCharacterBeforeDnaUpdated { add { if (CharacterBeforeDnaUpdated == null) CharacterBeforeDnaUpdated = new UMADataEvent(); CharacterBeforeDnaUpdated.AddListener(new UnityAction<UMAData>(value)); } remove { CharacterBeforeUpdated.RemoveListener(new UnityAction<UMAData>(value)); } }
+		public event Action<UMAData> OnCharacterBeforeDnaUpdated { add { if (CharacterBeforeDnaUpdated == null) CharacterBeforeDnaUpdated = new UMADataEvent(); CharacterBeforeDnaUpdated.AddAction(value);} remove { CharacterBeforeDnaUpdated.RemoveAction(value); } }
 
 		public UMADataEvent CharacterCreated;
 		public UMADataEvent CharacterDestroyed;
@@ -878,44 +878,27 @@ public void MergeMatchingOverlays()
 			public void PreApplyDNA(UMAData umaData, bool fixUpUMADnaToDynamicUMADna = false)
 			{
 				EnsureAllDNAPresent();
-				bool fixup = false;
-				//DynamicUMADna:: when loading an older recipe that has UMADnaHumanoid/Tutorial into a race that now uses DynamicUmaDna the following wont work
-				//so check that and fix it if it happens
-				if (fixUpUMADnaToDynamicUMADna)
-				{
-					DynamicDNAConverterBehaviourBase.FixUpUMADnaToDynamicUMADna(this);
-				}
-				else
-				{
-					//clear any color adjusters from all overlays in the recipe
-					//Only do this if we havent looped back to fixup dna
-					umaData.umaRecipe.ClearOverlayColorAdjusters();
-				}
+				//clear any color adjusters from all overlays in the recipe
+				umaData.umaRecipe.ClearOverlayColorAdjusters();
 				foreach (var dnaEntry in umaDna)
 				{
 					//DynamicDNAPlugins FEATURE: Allow more than one converter to use the same dna
 					List<DNAConvertDelegate> dnaConverters;
 					this.umaDNAPreApplyConverters.TryGetValue(dnaEntry.Key, out dnaConverters);
-
+					//DynamicUMADna:: when loading an older recipe that has UMADnaHumanoid/Tutorial into a race that now uses DynamicUmaDna the following wont work
+					//so check that and fix it if it happens
+					if (dnaConverters == null || dnaConverters.Count == 0)
+					{
+						DynamicDNAConverterBehaviourBase.FixUpUMADnaToDynamicUMADna(this);
+						this.umaDNAPreApplyConverters.TryGetValue(dnaEntry.Key, out dnaConverters);
+					}
 					if (dnaConverters != null && dnaConverters.Count > 0)
 					{
 						for (int i = 0; i < dnaConverters.Count; i++)
 						{
 							dnaConverters[i](umaData, umaData.GetSkeleton());
 						}
 					}
-					else
-					{
-						//DynamicUMADna:: try again this time calling FixUpUMADnaToDynamicUMADna first
-						if (fixUpUMADnaToDynamicUMADna == false)
-						{
-							fixup = true;
-						}
-					}
-				}
-				if (fixup)
-				{
-					PreApplyDNA(umaData, true);
 				}
 			}
 

UMAProject/Assets/UMA/Core/StandardAssets/UMA/Scripts/UMAEvents.cs

@@ -22,6 +22,14 @@ public UMADataEvent(UMADataEvent source)
 				AddListener(target, UnityEventBase.GetValidMethodInfo(target, source.GetPersistentMethodName(i), new Type[] { typeof(UMAData) }));
 			}
 		}
+		public void AddAction(Action<UMAData> action)
+		{
+			this.AddListener(action.Target, action.Method);
+		}
+		public void RemoveAction(Action<UMAData> action)
+		{
+			this.RemoveListener(action.Target, action.Method);
+		}
 	}
 
 	/// <summary>