BUG SubGraph edges persist when they don't exist

When resetting a SubGraph's Schema edges that should be removed stay

Author: Daniel Burgess

Assets/Examples/BasicExample.asset

@@ -65,29 +65,40 @@ MonoBehaviour:
     inputPortIdentifier: 
     outputPortIdentifier: 
   - _guid:
-      Value: 4134c8f0-3dd1-4b20-836e-afb4762a92c8
+      Value: abe45722-8a31-4cc1-be33-d3b8a90b5c1a
     owner: {fileID: 11400000}
     inputNodeGUID:
-      Value: 05c6ea81-f327-4692-9e0f-792c109f3184
+      Value: 034f0a6d-ea56-4e83-8190-5459f04085bf
     outputNodeGUID:
       Value: 2d09ddaf-923b-4f10-9ea7-a279c757ea26
     inputFieldName: _ingress
     outputFieldName: output
     inputPortIdentifier: Float IN
     outputPortIdentifier: 
   - _guid:
-      Value: 604145ea-745c-4b4b-9ccc-c089dc173c95
+      Value: 0e58fe31-0e18-47ec-9e66-772ca7d7a543
     owner: {fileID: 11400000}
     inputNodeGUID:
-      Value: b233fdec-4d0e-48e2-a2d9-bb976eb6f6f3
+      Value: f1bbd92e-6021-4bfb-9420-a3cc973fbb0d
     outputNodeGUID:
-      Value: 05c6ea81-f327-4692-9e0f-792c109f3184
+      Value: 034f0a6d-ea56-4e83-8190-5459f04085bf
     inputFieldName: obj
     outputFieldName: _egress
     inputPortIdentifier: 
     outputPortIdentifier: String OUT
   - _guid:
-      Value: 326496ae-9ef5-44e4-a475-b9e602f1f695
+      Value: eec4286d-0123-4afd-b207-f7b8294a4a02
+    owner: {fileID: 11400000}
+    inputNodeGUID:
+      Value: 034f0a6d-ea56-4e83-8190-5459f04085bf
+    outputNodeGUID:
+      Value: 87d938a8-54f3-4391-aad4-abf499ae38b4
+    inputFieldName: _ingress
+    outputFieldName: output
+    inputPortIdentifier: Decimal Places
+    outputPortIdentifier: output
+  - _guid:
+      Value: c8cb5412-1b74-4cea-8c0a-a03b10f7dcaa
     owner: {fileID: 11400000}
     inputNodeGUID:
       Value: 034f0a6d-ea56-4e83-8190-5459f04085bf
@@ -98,27 +109,27 @@ MonoBehaviour:
     inputPortIdentifier: Float IN
     outputPortIdentifier: 
   - _guid:
-      Value: 91ea98d1-763d-4b47-8d7d-8dbe42d915f9
+      Value: 3245c8d4-ed87-4397-a4fa-f623440c641a
     owner: {fileID: 11400000}
     inputNodeGUID:
-      Value: f1bbd92e-6021-4bfb-9420-a3cc973fbb0d
+      Value: 05c6ea81-f327-4692-9e0f-792c109f3184
     outputNodeGUID:
-      Value: 034f0a6d-ea56-4e83-8190-5459f04085bf
-    inputFieldName: obj
-    outputFieldName: _egress
-    inputPortIdentifier: 
-    outputPortIdentifier: String OUT
+      Value: 2d09ddaf-923b-4f10-9ea7-a279c757ea26
+    inputFieldName: _ingress
+    outputFieldName: output
+    inputPortIdentifier: Float IN
+    outputPortIdentifier: 
   - _guid:
-      Value: e8dcd9f4-b743-4eda-a990-a09c466e00fa
+      Value: 9d4de727-b267-4c5b-b92a-ea85f72633bf
     owner: {fileID: 11400000}
     inputNodeGUID:
-      Value: 034f0a6d-ea56-4e83-8190-5459f04085bf
+      Value: b233fdec-4d0e-48e2-a2d9-bb976eb6f6f3
     outputNodeGUID:
-      Value: 87d938a8-54f3-4391-aad4-abf499ae38b4
-    inputFieldName: _ingress
-    outputFieldName: output
-    inputPortIdentifier: Decimal Places
-    outputPortIdentifier: output
+      Value: 05c6ea81-f327-4692-9e0f-792c109f3184
+    inputFieldName: obj
+    outputFieldName: _egress
+    inputPortIdentifier: 
+    outputPortIdentifier: String OUT
   groups:
   - title: New Comment Block
     color: {r: 0, g: 0, b: 0, a: 0}
@@ -1248,7 +1259,7 @@ MonoBehaviour:
     - rid: 4827994175793266935
       type: {class: SubGraphNode, ns: , asm: com.alelievr.NodeGraphProcessor.Runtime}
       data:
-        nodeCustomName: 
+        nodeCustomName: Float To String
         _guid:
           Value: 05c6ea81-f327-4692-9e0f-792c109f3184
         computeOrder: 10
@@ -1300,7 +1311,7 @@ MonoBehaviour:
         computeOrder: 31
         position:
           serializedVersion: 2
-          x: -535.0001
+          x: -535
           y: 1031.5
           width: 125
           height: 37

Assets/Examples/FloatToString.asset

@@ -19,7 +19,7 @@ MonoBehaviour:
   - rid: 4827994175793266725
   edges:
   - _guid:
-      Value: 9b4d0bb9-965b-43a5-9a7b-9cd00344d029
+      Value: 6c633c2e-ccc0-4b60-b504-734e85a9054b
     owner: {fileID: 11400000}
     inputNodeGUID:
       Value: 7a64e6db-4a2a-4a0f-920e-45ac493ae39f
@@ -30,7 +30,7 @@ MonoBehaviour:
     inputPortIdentifier: 
     outputPortIdentifier: Float IN
   - _guid:
-      Value: 0245cd7d-8811-4048-9d6a-fa26bc67cde6
+      Value: 6b771e34-f0f7-4080-92ce-4101464e233c
     owner: {fileID: 11400000}
     inputNodeGUID:
       Value: ea9dd183-58e9-46d0-b544-e999ef6808ab
@@ -51,7 +51,7 @@ MonoBehaviour:
   scale: {x: 1.7490063, y: 1.7490063, z: 1}
   options:
     displayName: Float To String
-    renamePolicy: 2
+    renamePolicy: 1
   isMacro: 0
   macroOptions:
     menuLocation: 
@@ -70,8 +70,8 @@ MonoBehaviour:
         computeOrder: 0
         position:
           serializedVersion: 2
-          x: 535.4502
-          y: 464.75006
+          x: 605.6925
+          y: 441.00006
           width: 84
           height: 75
         initialPosition:
@@ -92,8 +92,8 @@ MonoBehaviour:
         computeOrder: 2
         position:
           serializedVersion: 2
-          x: 1030.4501
-          y: 488.00006
+          x: 957.1414
+          y: 441.0001
           width: 98
           height: 75
         initialPosition:

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

@@ -194,9 +194,6 @@ public void UpdatePortView(PortData data)
             UpdatePortSize();
         }
 
-        public List<EdgeView> GetEdges()
-        {
-            return edges;
-        }
+        public List<EdgeView> GetEdges() => edges;
     }
 }

Assets/com.alelievr.NodeGraphProcessor/Runtime/Graph/BaseGraph.cs

@@ -178,7 +178,7 @@ protected virtual void OnEnable()
 
         public virtual void Initialize() { }
 
-        void InitializeGraphElements()
+        private void InitializeGraphElements()
         {
             // Sanitize the element lists (it's possible that nodes are null if their full class name have changed)
             // If you rename / change the assembly of a node or parameter, please use the MovedFrom() attribute to avoid breaking the graph.
@@ -815,14 +815,21 @@ void PropagateComputeOrder(BaseNode node, int computeOrder)
             }
         }
 
-        void DestroyBrokenGraphElements()
+        protected void DestroyBrokenGraphElements()
         {
-            edges.RemoveAll(e => e.inputNode == null
+            var brokenEdges = edges.FindAll(e => e.inputNode == null
                 || e.outputNode == null
+                || !e.inputNode.GetAllEdges().Contains(e)
+                || !e.outputNode.GetAllEdges().Contains(e)
                 || string.IsNullOrEmpty(e.outputFieldName)
-                || string.IsNullOrEmpty(e.inputFieldName)
-            );
+                || string.IsNullOrEmpty(e.inputFieldName));
+
+            brokenEdges.ForEach(e => Disconnect(e.GUID));
+            edges.RemoveAll(e => brokenEdges.Contains(e));
+
             nodes.RemoveAll(n => n == null);
+
+            UpdateComputeOrder();
         }
 
         /// <summary>

Assets/com.alelievr.NodeGraphProcessor/Runtime/Graph/SubGraph.cs

@@ -137,6 +137,7 @@ public void RemoveOptionsListener(Notify listener)
         public void NotifyPortsChanged()
         {
             OnPortsUpdated?.Invoke();
+            DestroyBrokenGraphElements();
         }
 
         public void NotifyOptionsChanged()