From 9db84d1608d65380a3469233867de4b60185f1bd Mon Sep 17 00:00:00 2001
From: Thor <thorbrigsted@gmail.com>
Date: Thu, 19 Oct 2017 15:15:34 +0200
Subject: [PATCH] Replaced node Rect rect with node Vector2 position. Improved
 node hover check.

---
 Example/ExampleNodeGraph.asset     | Bin 7396 -> 7284 bytes
 Scripts/Editor/NodeEditor.cs       |   2 +-
 Scripts/Editor/NodeEditorAction.cs |  10 +++---
 Scripts/Editor/NodeEditorGUI.cs    |  53 ++++++++++++++++-------------
 Scripts/Node.cs                    |   2 +-
 5 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/Example/ExampleNodeGraph.asset b/Example/ExampleNodeGraph.asset
index 96509432175997cb113a88c5c503dadb5d9a0f90..7b03462df774608e9f779539f5cf2d52760c12f1 100644
GIT binary patch
literal 7284
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
Hp7Ztx(h)}O

literal 7396
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

diff --git a/Scripts/Editor/NodeEditor.cs b/Scripts/Editor/NodeEditor.cs
index 9225928..cdba07d 100644
--- a/Scripts/Editor/NodeEditor.cs
+++ b/Scripts/Editor/NodeEditor.cs
@@ -32,7 +32,7 @@ public class NodeEditor {
         FieldInfo[] fields = GetInspectorFields(target);
         for (int i = 0; i < fields.Length; i++) {
             object[] fieldAttribs = fields[i].GetCustomAttributes(false);
-            if (fields[i].Name == "graph" || fields[i].Name == "rect") continue;
+            if (fields[i].Name == "graph" || fields[i].Name == "position") continue;
             NodeEditorGUILayout.PropertyField(target, fields[i], portPositions);
         }
         //If user changed a value, notify other scripts through onUpdateNode
diff --git a/Scripts/Editor/NodeEditorAction.cs b/Scripts/Editor/NodeEditorAction.cs
index ee2dd8d..92a93c3 100644
--- a/Scripts/Editor/NodeEditorAction.cs
+++ b/Scripts/Editor/NodeEditorAction.cs
@@ -48,7 +48,7 @@ public partial class NodeEditorWindow {
                         }
                         Repaint();
                     } else if (IsDraggingNode) {
-                        draggedNode.rect.position = WindowToGridPosition(e.mousePosition) + dragOffset;
+                        draggedNode.position = WindowToGridPosition(e.mousePosition) + dragOffset;
                         Repaint();
                     }
                 } else if (e.button == 1) {
@@ -76,7 +76,7 @@ public partial class NodeEditorWindow {
                     }
                 } else if (IsHoveringNode && IsHoveringTitle(hoveredNode)) {
                     draggedNode = hoveredNode;
-                    dragOffset = hoveredNode.rect.position - WindowToGridPosition(e.mousePosition);
+                    dragOffset = hoveredNode.position - WindowToGridPosition(e.mousePosition);
                 }
                 break;
             case EventType.MouseUp:
@@ -113,7 +113,7 @@ public partial class NodeEditorWindow {
 
     public void CreateNode(Type type, Vector2 position) {
         Node node = graph.AddNode(type);
-        node.rect.position = position;
+        node.position = position;
         Repaint();
     }
 
@@ -132,8 +132,8 @@ public partial class NodeEditorWindow {
     bool IsHoveringTitle(Node node) {
         Vector2 mousePos = Event.current.mousePosition;
         //Get node position
-        Vector2 nodePos = GridToWindowPosition(node.rect.position);
-        Rect windowRect = new Rect(nodePos, new Vector2(node.rect.size.x / zoom, 30 / zoom));
+        Vector2 nodePos = GridToWindowPosition(node.position);
+        Rect windowRect = new Rect(nodePos, new Vector2(/*Node width*/200 / zoom, 30 / zoom));
         return windowRect.Contains(mousePos);
     }
 }
\ No newline at end of file
diff --git a/Scripts/Editor/NodeEditorGUI.cs b/Scripts/Editor/NodeEditorGUI.cs
index 38dcc00..728b2e3 100644
--- a/Scripts/Editor/NodeEditorGUI.cs
+++ b/Scripts/Editor/NodeEditorGUI.cs
@@ -153,8 +153,11 @@ public partial class NodeEditorWindow {
 
         Vector2 mousePos = Event.current.mousePosition;
 
-        hoveredPort = null;
-        hoveredNode = null;
+        
+        if (e.type != EventType.Layout) {
+            hoveredNode = null;
+            hoveredPort = null;
+        }
 
         foreach (Node node in graph.nodes) {
             if (node == null) return;
@@ -162,7 +165,7 @@ public partial class NodeEditorWindow {
             nodeEditor.target = node;
 
             //Get node position
-            Vector2 nodePos = GridToWindowPositionNoClipped(node.rect.position);
+            Vector2 nodePos = GridToWindowPositionNoClipped(node.position);
 
             //GUIStyle style = (node == selectedNode) ? (GUIStyle)"flow node 0 on" : (GUIStyle)"flow node 0";
 
@@ -178,7 +181,7 @@ public partial class NodeEditorWindow {
             if (e.type == EventType.Repaint) {
                 foreach (var kvp in portHandlePoints) {
                     Vector2 portHandlePos = kvp.Value;
-                    portHandlePos += node.rect.position;
+                    portHandlePos += node.position;
                     Rect rect = new Rect(portHandlePos.x - 8, portHandlePos.y - 8, 16, 16);
                     portConnectionPoints.Add(kvp.Key, rect);
                 }
@@ -186,27 +189,29 @@ public partial class NodeEditorWindow {
 
             GUILayout.EndVertical();
 
-            //Check if we are hovering this node
-            Vector2 nodeSize = GUILayoutUtility.GetLastRect().size / zoom;
-            Rect windowRect = new Rect(nodePos, nodeSize);
-            if (windowRect.Contains(mousePos)) hoveredNode = node;
+            if (e.type != EventType.Layout) {
+                //Check if we are hovering this node
+                Vector2 nodeSize = GUILayoutUtility.GetLastRect().size / zoom;
+                Rect windowRect = new Rect(nodePos, nodeSize);
+                if (windowRect.Contains(mousePos)) hoveredNode = node;
 
-            //Check if we are hovering any of this nodes ports
-            //Check input ports
-            for (int i = 0; i < node.InputCount; i++) {
-                NodePort port = node.inputs[i];
-                //Check if port rect is available
-                if (!portConnectionPoints.ContainsKey(port)) continue;
-                Rect r = GridToWindowRect(portConnectionPoints[port]);
-                if (r.Contains(mousePos)) hoveredPort = port;
-            }
-            //Check all output ports
-            for (int i = 0; i < node.OutputCount; i++) {
-                NodePort port = node.outputs[i];
-                //Check if port rect is available
-                if (!portConnectionPoints.ContainsKey(port)) continue;
-                Rect r = GridToWindowRect(portConnectionPoints[port]);
-                if (r.Contains(mousePos)) hoveredPort = port;
+                //Check if we are hovering any of this nodes ports
+                //Check input ports
+                for (int i = 0; i < node.InputCount; i++) {
+                    NodePort port = node.inputs[i];
+                    //Check if port rect is available
+                    if (!portConnectionPoints.ContainsKey(port)) continue;
+                    Rect r = GridToWindowRect(portConnectionPoints[port]);
+                    if (r.Contains(mousePos)) hoveredPort = port;
+                }
+                //Check all output ports
+                for (int i = 0; i < node.OutputCount; i++) {
+                    NodePort port = node.outputs[i];
+                    //Check if port rect is available
+                    if (!portConnectionPoints.ContainsKey(port)) continue;
+                    Rect r = GridToWindowRect(portConnectionPoints[port]);
+                    if (r.Contains(mousePos)) hoveredPort = port;
+                }
             }
 
             GUILayout.EndArea();
diff --git a/Scripts/Node.cs b/Scripts/Node.cs
index fd6e23a..38798b7 100644
--- a/Scripts/Node.cs
+++ b/Scripts/Node.cs
@@ -10,7 +10,7 @@ public abstract class Node : ScriptableObject {
 
     /// <summary> Name of the node </summary>
     [SerializeField] public NodeGraph graph;
-    [SerializeField] public Rect rect = new Rect(0, 0, 200, 200);
+    [SerializeField] public Vector2 position;
     /// <summary> Input <see cref="NodePort"/>s. It is recommended not to modify these at hand. Instead, see <see cref="InputAttribute"/> </summary>
     [SerializeField] public List<NodePort> inputs = new List<NodePort>();
     /// <summary> Output <see cref="NodePort"/>s. It is recommended not to modify these at hand. Instead, see <see cref="InputAttribute"/> </summary>