Fixed node creation from asset + updated changelog

Author: alelievr

Assets/com.alelievr.NodeGraphProcessor/Editor/Views/BaseGraphView.cs

@@ -124,7 +124,7 @@ public class BaseGraphView : GraphView, IDisposable
 
 		public SerializedObject		serializedGraph { get; private set; }
 
-		Dictionary<Type, Type> nodeTypePerCreateAssetType = new Dictionary<Type, Type>();
+		Dictionary<Type, (Type nodeType, MethodInfo initalizeNodeFromObject)> nodeTypePerCreateAssetType = new Dictionary<Type, (Type, MethodInfo)>();
 
 		public BaseGraphView(EditorWindow window)
 		{
@@ -619,14 +619,18 @@ void DragPerformedCallback(DragPerformEvent e)
 					{
 						if (kp.Key.IsAssignableFrom(objectType))
 						{
-							var node = BaseNode.CreateFromType(kp.Value, mousePos);
-							var initializeFunction = kp.Value.GetMethod(nameof(ICreateNodeFrom<Object>.InitializeNodeFromObject), BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
-							if ((bool)initializeFunction.Invoke(node, new []{obj}))
+							try
 							{
-								AddNode(node);
+								var node = BaseNode.CreateFromType(kp.Value.nodeType, mousePos);
+								if ((bool)kp.Value.initalizeNodeFromObject.Invoke(node, new []{obj}))
+									AddNode(node);
+								else
+									break;	
+							}
+							catch (Exception exception)
+							{
+								Debug.LogException(exception);
 							}
-							else
-								break;	
 						}
 					}
 				}
@@ -753,12 +757,21 @@ public void Initialize(BaseGraph graph)
 			foreach (var nodeInfo in NodeProvider.GetNodeMenuEntries(graph))
 			{
 				var interfaces = nodeInfo.type.GetInterfaces();
+                var exceptInheritedInterfaces = interfaces.Except(interfaces.SelectMany(t => t.GetInterfaces()));
 				foreach (var i in interfaces)
 				{
 					if (i.IsGenericType && i.GetGenericTypeDefinition() == typeof(ICreateNodeFrom<>))
 					{
-						var genericArgument = i.GetGenericArguments()[0];
-						nodeTypePerCreateAssetType[genericArgument] = nodeInfo.type;
+						var genericArgumentType = i.GetGenericArguments()[0];
+						var initializeFunction = nodeInfo.type.GetMethod(
+							nameof(ICreateNodeFrom<Object>.InitializeNodeFromObject),
+							BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance,
+							null, new Type[]{ genericArgumentType}, null
+						);
+
+						// We only add the type that implements the interface, not it's children
+						if (initializeFunction.DeclaringType == nodeInfo.type)
+							nodeTypePerCreateAssetType[genericArgumentType] = (nodeInfo.type, initializeFunction);
 					}
 				}
 			}

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Added vertical ports
 - Added an example with Waitable and async nodes
+- Added drag and drop support for assets and scene objects directly into a graph
 
 ## [1.0.1]