Fixed sorting of port by inheritance level

Author: alelievr

Assets/Examples/DefaultNodes/Nodes/Inheritance1.cs

@@ -0,0 +1,24 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using GraphProcessor;
+using System.Linq;
+
+[System.Serializable, NodeMenuItem("Custom/Inheritance1")]
+public class Inheritance1 :InheritanceBase 
+{
+	[Input(name = "In 1")]
+    public float                input1;
+
+	[Output(name = "Out 1")]
+	public float				output1;
+
+	public float				field1;
+
+	public override string		name => "Inheritance1";
+
+	protected override void Process()
+	{
+	    output = input * 42;
+	}
+}

Assets/Examples/DefaultNodes/Nodes/Inheritance1.cs.meta

@@ -0,0 +1,24 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using GraphProcessor;
+using System.Linq;
+
+[System.Serializable, NodeMenuItem("Custom/Inheritance2")]
+public class Inheritance2 : Inheritance1
+{
+	[Input(name = "In 2")]
+    public float                input2;
+
+	[Output(name = "Out 2")]
+	public float				output2;
+
+	public float				field2;
+
+	public override string		name => "Inheritance2";
+
+	protected override void Process()
+	{
+	    output = input * 42;
+	}
+}

Assets/Examples/DefaultNodes/Nodes/Inheritance2.cs

@@ -0,0 +1,24 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using GraphProcessor;
+using System.Linq;
+
+[System.Serializable, NodeMenuItem("Custom/InheritanceBase")]
+public class InheritanceBase : BaseNode
+{
+	[Input(name = "In Base")]
+    public float                input;
+
+	[Output(name = "Out Base")]
+	public float				output;
+
+	public float				fieldBase;
+
+	public override string		name => "InheritanceBase";
+
+	protected override void Process()
+	{
+	    output = input * 42;
+	}
+}

Assets/Examples/DefaultNodes/Nodes/Inheritance2.cs.meta

@@ -591,16 +591,15 @@ protected void AddInputContainer()
 			inputContainerElement.SendToBack();
 			inputContainerElement.pickingMode = PickingMode.Ignore;
 		}
-		
+
 		protected virtual void DrawDefaultInspector(bool fromInspector = false)
 		{
 			var fields = nodeTarget.GetType().GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)
 				// Filter fields from the BaseNode type since we are only interested in user-defined fields
 				// (better than BindingFlags.DeclaredOnly because we keep any inherited user-defined fields) 
-				.Where(f => f.DeclaringType != typeof(BaseNode))
-				// Order by MetadataToken to sync the order with the port order (make sure FieldDrawers are next to the correct port)
-				//TODO: Also consider custom port order
-				.OrderBy(f => f.MetadataToken);
+				.Where(f => f.DeclaringType != typeof(BaseNode));
+
+			fields = nodeTarget.OverrideFieldOrder(fields).Reverse();
 
 			foreach (var field in fields)
 			{

Assets/Examples/DefaultNodes/Nodes/InheritanceBase.cs

@@ -249,9 +249,9 @@ public virtual void InitializePorts()
 		{
 			InitializeCustomPortTypeMethods();
 
-			foreach (var nodeFieldKP in nodeFields.ToList().OrderByDescending(kp => kp.Value.info.MetadataToken))
+			foreach (var key in OverrideFieldOrder(nodeFields.Values.Select(k => k.info)))
 			{
-				var nodeField = nodeFieldKP.Value;
+				var nodeField = nodeFields[key.Name];
 
 				if (HasCustomBehavior(nodeField))
 				{
@@ -265,6 +265,30 @@ public virtual void InitializePorts()
 			}
 		}
 
+		/// <summary>
+		/// Override the field order inside the node. It allows to re-order all the ports and field in the UI.
+		/// </summary>
+		/// <param name="fields">List of fields to sort</param>
+		/// <returns>Sorted list of fields</returns>
+		public virtual IEnumerable<FieldInfo> OverrideFieldOrder(IEnumerable<FieldInfo> fields)
+		{
+			long GetFieldInheritanceLevel(FieldInfo f)
+			{
+				int level = 0;
+				var t = f.DeclaringType;
+				while (t != null)
+				{
+					t = t.BaseType;
+					level++;
+				}
+
+				return level;
+			}
+
+			// Order by MetadataToken and inheritance level to sync the order with the port order (make sure FieldDrawers are next to the correct port)
+			return fields.OrderByDescending(f => (long)(((GetFieldInheritanceLevel(f) << 32)) | (long)f.MetadataToken));
+		}
+
 		protected BaseNode()
 		{
             inputPorts = new NodeInputPortContainer(this);