Improved broken connection cleanup. Example updates

Example/ExampleNodeGraph.asset.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: e8c47bc953732464a9bf3a76273d99ef
+timeCreated: 1507916591
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Example/Nodes/BaseNode.cs

@@ -1,15 +0,0 @@
-using UnityEngine;
-
-[System.Serializable]
-public class BaseNode : Node {
-
-    [Input] public string input;
-    [Output] public string output;
-    public bool concat;
-    [TextArea]
-    public string SomeString;
-    [Header("New stuff")]
-    public Color col;
-    public AnimationCurve anim;
-    public Vector3 vec;
-}

Example/Nodes/ConstantValue.cs

@@ -0,0 +1,13 @@
+[System.Serializable]
+public class ConstantValue : ExampleNodeBase {
+    public float a;
+    [Output] public float value;
+
+    protected override void Init() {
+        name = "Constant Value";
+    }
+
+    public override object GetValue(NodePort port) {
+        return a;
+    }
+}

Example/Nodes/ConstantValue.cs.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 23665941e8cd89a48b1272ac5fd6510c
+guid: 707240ce8955a0240a7c0c4177d83bf5
-timeCreated: 1505462705
+timeCreated: 1505937586
 licenseType: Free
 MonoImporter:
   serializedVersion: 2

Example/Nodes/DisplayValue.cs

@@ -1,5 +1,6 @@
 using UnityEngine;
 
-public class DisplayValue : Node {
+public class DisplayValue : ExampleNodeBase {
     [Input] public float value;
+
 }

Example/Nodes/Editor/DisplayValueEditor.cs

@@ -12,20 +12,7 @@ public class DisplayValueEditor : NodeEditor {
     }
 
     public float GetResult() {
-        float result = 0f;
+        ExampleNodeBase t = target as ExampleNodeBase;
-        NodePort port = target.GetInputByFieldName("value");
+        return t.GetInputFloat("value");
-        if (port == null) return result;
-        int connectionCount = port.ConnectionCount;
-        for (int i = 0; i < connectionCount; i++) {
-
-            NodePort connection = port.GetConnection(i);
-            if (connection == null) continue;
-            object obj = connection.GetValue();
-            if (obj == null) continue;
-
-            if (connection.type == typeof(int)) result += (int)obj;
-            else if (connection.type == typeof(float)) result += (float)obj;
-        }
-        return result;
     }
 }

Example/Nodes/ExampleNodeBase.cs

@@ -0,0 +1,22 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ExampleNodeBase : Node {
+
+	public float GetInputFloat(string fieldName) {
+		float result = 0f;
+        NodePort port = GetInputByFieldName(fieldName);
+        if (port == null) return result;
+        int connectionCount = port.ConnectionCount;
+        for (int i = 0; i < connectionCount; i++) {
+            NodePort connection = port.GetConnection(i);
+            if (connection == null) continue;
+            object obj = connection.GetValue();
+            if (obj == null) continue;
+            if (connection.type == typeof(int)) result += (int)obj;
+            else if (connection.type == typeof(float)) result += (float)obj;
+        }
+        return result;
+	}
+}

Example/Nodes/ExampleNodeBase.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 923bada49e668fd4a98b04fcb49999d7
+timeCreated: 1507917099
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Example/Nodes/MathNode.cs

@@ -1,9 +1,9 @@
 using UnityEngine;
 
 [System.Serializable]
-public class MathNode : Node {
+public class MathNode : ExampleNodeBase {
-    public float a;
+    [Input] public float c;
-    public float b;
+    [Input] public float b;
     [Output] public float result;
     public enum MathType { Add, Subtract, Multiply, Divide}
     public MathType mathType = MathType.Add;
@@ -13,6 +13,9 @@ public class MathNode : Node {
     }
 
     public override object GetValue(NodePort port) {
+        float a = GetInputFloat("c");
+        float b = GetInputFloat("b");
+        
         switch(port.fieldName) {
             case "result":
                 switch(mathType) {
@@ -25,8 +28,4 @@ public class MathNode : Node {
         }
         return 0f;
     }
-
-    public override void OnCreateConnection(NodePort from, NodePort to) {
-
-    }
 }

Scripts/Editor/NodeEditorGUI.cs

@@ -128,7 +128,9 @@ public partial class NodeEditorWindow {
                 if (!portConnectionPoints.ContainsKey(output)) continue;
                 Vector2 from = _portConnectionPoints[output].center;
                 for (int k = 0; k < output.ConnectionCount; k++) {
+
                     NodePort input = output.GetConnection(k);
+                    if (input == null) return; //If a script has been updated and the port doesn't exist, it is removed and null is returned. If this happens, return.
                     Vector2 to = _portConnectionPoints[input].center;
                     DrawConnection(from, to, NodeEditorUtilities.GetTypeColor(output.type));
                 }

Scripts/NodePort.cs

@@ -77,7 +77,16 @@ public class NodePort {
     }
 
     public NodePort GetConnection(int i) {
+        //If the connection is broken for some reason, remove it.
+        if (connections[i].node == null || string.IsNullOrEmpty(connections[i].fieldName)) {
+            connections.RemoveAt(i);
+            return null;
+        }
         NodePort port = connections[i].node.GetPortByFieldName(connections[i].fieldName);
+        if (port == null) {
+            connections.RemoveAt(i);
+            return null;
+        }
         return port;
     }