From 5b1026e698b086febf0ca24d28719b4496e6eae8 Mon Sep 17 00:00:00 2001
From: Thor Brigsted <thorbrigsted@gmail.com>
Date: Sat, 14 Oct 2017 18:18:25 +0200
Subject: [PATCH] Fixed field editor bug, added tooltip.

---
 Example/ExampleNodeGraph.asset        | Bin 7160 -> 7396 bytes
 Example/Nodes/TestNode.cs             |  24 ++++++++++++------------
 Scripts/Editor/NodeEditorGUI.cs       |  11 +++++++++++
 Scripts/Editor/NodeEditorGUILayout.cs |  14 +++++++-------
 Scripts/Editor/NodeEditorResources.cs |   8 +++++++-
 5 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/Example/ExampleNodeGraph.asset b/Example/ExampleNodeGraph.asset
index b09f280fbf868ff10cafd68ec6f5b6d1e1e955e9..96509432175997cb113a88c5c503dadb5d9a0f90 100644
GIT binary patch
delta 880
zcmZ9KO=uHQ5Xa|j({90!CTy~sU2APXiXJMosi+7^G{IC5DHV!%(6(W%mfb9@Nos>1
z@uZiEI4B<UP;3Q{;-N>S3VLfi35unM)(Vz@hl&R&&U?Fwnz#J-&3nI@*_rqD*P+!T
zK>+<7K<6p|gvefb5e#ovI~MvDmtu443$<(cjm?={ndo))@@~tBjQ5mI_6pfH1z#%x
z9t-WHArc>qo&zmVsp1z!(?5zGfMJe~d32EIGVTapVC!gyr&tZw!dbS7y^*Z`o7@7V
zaqbV@B3q68w{RwsHR|+YgGw+9P-$gYi>QXo0H__f)Py@2cB!fnBFuA7l9<TtMJo(X
z6OQ=U^07ot3MJPV-cZj;dl-IF4P&40<q9vJs8y8E%W$Wr8gU;Nn($GE2~E{AJ}xz|
z1k3b|A+$A3Kkw74P1MFG+I!QUKAA6oJ$=G*#`v6ZisP0^#wjO1LDO-^v1mF|a4(DX
zu$kj-BWAAOo8nORi~*P;Bkfp@3ocC1VUO{3(Jh&HJ8I(hXe_ef*YNP`!M^+DM{Ja8
zo5Ps?6ob3kv8o@IeS%eEzt~F|J#D2o0G}7pGDi71flR6wOeWNmarV42pW3PhQux6b
zp!oiqavCaUDSj}`#V?AFdI<l;8qEpfz3RM8aMA2P^lyBF$N$5P{Bn;-;2kcnj|aHs
zm7>M3l15?aN9NAA2h?r~SB%}E$)C3p&*s+>kKcADF}gP?;jFHARg!d@BuM!Ji3~2@
F&>zR-!%F}F

delta 728
zcmZ9IUq}>D6vn?huC<iL#?H<(v$jbQS=b_4SQ4{q1-tYRkq{Ju{c%^V6+>ec3tNbS
z9$KUGQbAByQ4oam7Kz#-g%m{;#!}Klz7)tlB<y47&L1E44By;)&hNWt&fMSo%dG*x
zxCVsF05<ae;bcIq(Y{^S8)<w!>H9Z!C4YEdq-B(8n|PJ4I<b~+2kY*vS7|2bGp4xg
zXB}h75d1`|kejBTLEV_OE5LDy+8vr?TA*6BOUzNfIxODNl9~|nv^$hAKC;cnIxGFC
zx4SK~{}bH`B}|W|SE+(WK<*1@Ii#6ixy=89-U>ViifEeooy)TKd6uwyJEvzsM;RAg
zoN=+jrXV*jg2uE{$`4RcGtDK}HE6qJqiTDEKcEe|W|mxhsREZlmaZ8>I3r|Nv4TbZ
zMlJR0x)FBiNCn+R5A^q2`;bOAGJG{d7(})i*%pi<y9dKKH;_RO&d~g(6g3(3A$bwp
z3k@{`#iqWyBFRaBQpN<83?KQ;xZfkxUe`b)W^~QT0#J(63-fd}AB12Kquy}y)y9LE
zxxp}b$dROg!s^)E7XSR=SN{2tH`6lrLf&z@C*6Jjo?)$9*k&zEl&r$aGi%HBzt+yq
zaqIELDSLlejauFr=^cN&a^U9nm)6rKso3I<A)6_!p2Jz=yhw56Vvd|lzU2^7a)AG0
C;gQ+^

diff --git a/Example/Nodes/TestNode.cs b/Example/Nodes/TestNode.cs
index 900ddf4..e16136d 100644
--- a/Example/Nodes/TestNode.cs
+++ b/Example/Nodes/TestNode.cs
@@ -4,16 +4,16 @@ using UnityEngine;
 
 public class TestNode : Node {
 
-	public int i;
-	public float f;
-	public double d;
-	public long l;
-	public bool b;
-	public string s;
-	public Rect r;
-	public Vector2 v2;
-	public Vector3 v3;
-	public Vector4 v4;
-	public Color col;
-	public AnimationCurve a;
+	public int myInt;
+	[Input(false)] public float myFloat;
+	public double myDouble;
+	public long myLong;
+	public bool myBool;
+	[Input(true)] public string myString;
+	public Rect myRect;
+	[Input(true)] public Vector2 myVec2;
+	[Input(true)] public Vector3 myVec3;
+	public Vector4 myVec4;
+	public Color myColor;
+	public AnimationCurve myCurve;
 }
diff --git a/Scripts/Editor/NodeEditorGUI.cs b/Scripts/Editor/NodeEditorGUI.cs
index cc7fca0..2dac4cb 100644
--- a/Scripts/Editor/NodeEditorGUI.cs
+++ b/Scripts/Editor/NodeEditorGUI.cs
@@ -15,6 +15,7 @@ public partial class NodeEditorWindow {
         DrawConnections();
         DrawDraggedConnection();
         DrawNodes();
+        DrawTooltip();
 
         GUI.matrix = m;
     }
@@ -193,4 +194,14 @@ public partial class NodeEditorWindow {
             if (onValidate != null && nodeHash != selectedNode.GetHashCode()) onValidate.Invoke(selectedNode, null);
         }
     }
+
+    private void DrawTooltip() {
+        if (hoveredPort != null) {
+            GUIContent content = new GUIContent(hoveredPort.type.ToString());
+            Vector2 size = NodeEditorResources.styles.tooltip.CalcSize(content);
+            Rect rect = new Rect(Event.current.mousePosition - (size), size);
+            EditorGUI.LabelField(rect, content, NodeEditorResources.styles.tooltip);
+            Repaint();
+        }
+    }
 }
\ No newline at end of file
diff --git a/Scripts/Editor/NodeEditorGUILayout.cs b/Scripts/Editor/NodeEditorGUILayout.cs
index 9683c70..522f352 100644
--- a/Scripts/Editor/NodeEditorGUILayout.cs
+++ b/Scripts/Editor/NodeEditorGUILayout.cs
@@ -11,8 +11,8 @@ public class NodeEditorGUILayout {
 
     private static double tempValue;
 
-    public static object PortField(string label, object value, NodePort port, bool fallback, out Vector2 portPosition) {
-        if (fallback) value = PropertyField(label, value);
+    public static object PortField(string label, object value, System.Type type, NodePort port, bool fallback, out Vector2 portPosition) {
+        if (fallback) value = PropertyField(label, value, type);
         else EditorGUILayout.LabelField(label);
 
         Rect rect = GUILayoutUtility.GetLastRect();
@@ -50,15 +50,15 @@ public class NodeEditorGUILayout {
         if (NodeEditorUtilities.GetAttrib(fieldAttribs, out inputAttrib)) {
             NodePort port = target.GetPortByFieldName(fieldName);
             Vector2 portPos;
-            fieldValue = PortField(fieldPrettyName, fieldValue, port, inputAttrib.fallback, out portPos);
+            fieldValue = PortField(fieldPrettyName, fieldValue, fieldType, port, inputAttrib.fallback, out portPos);
             portPositions.Add(port, portPos);
         } else if (NodeEditorUtilities.GetAttrib(fieldAttribs, out outputAttrib)) {
             NodePort port = target.GetPortByFieldName(fieldName);
             Vector2 portPos;
-            fieldValue = PortField(fieldPrettyName, fieldValue, port, outputAttrib.fallback, out portPos);
+            fieldValue = PortField(fieldPrettyName, fieldValue, fieldType, port, outputAttrib.fallback, out portPos);
             portPositions.Add(port, portPos);
         } else {
-            fieldValue = PropertyField(fieldPrettyName, fieldValue);
+            fieldValue = PropertyField(fieldPrettyName, fieldValue, fieldType);
         }
 
         if (EditorGUI.EndChangeCheck()) {
@@ -68,7 +68,7 @@ public class NodeEditorGUILayout {
         return fieldValue;
     }
 
-    public static object PropertyField(string label, object value) {
+    public static object PropertyField(string label, object value, System.Type type) {
         if (value is int) return IntField(label, (int) value);
         else if (value is float) return FloatField(label, (float) value);
         else if (value is double) return DoubleField(label, (double) value);
@@ -82,7 +82,7 @@ public class NodeEditorGUILayout {
         else if (value is Vector4) return Vector4Field(label, (Vector4) value);
         else if (value is Color) return ColorField(label, (Color) value);
         else if (value is AnimationCurve) return CurveField(label, (AnimationCurve) value);
-        else if (value == null || value.GetType().IsSubclassOf(typeof(UnityEngine.Object)) || value.GetType() == typeof(UnityEngine.Object)) return ObjectField(label, (UnityEngine.Object) value);
+        else if (type.IsSubclassOf(typeof(UnityEngine.Object)) || type == typeof(UnityEngine.Object)) return ObjectField(label, (UnityEngine.Object) value);
         else return value;
     }
     public static Rect GetRect(string label) {
diff --git a/Scripts/Editor/NodeEditorResources.cs b/Scripts/Editor/NodeEditorResources.cs
index 7ec60ad..70853e6 100644
--- a/Scripts/Editor/NodeEditorResources.cs
+++ b/Scripts/Editor/NodeEditorResources.cs
@@ -26,7 +26,7 @@ public static class NodeEditorResources {
     public static Styles _styles = null;
 
     public class Styles {
-        public GUIStyle inputPort, outputPort, nodeHeader, nodeBody;
+        public GUIStyle inputPort, outputPort, nodeHeader, nodeBody, tooltip;
 
         public Styles() {
             GUIStyle baseStyle = new GUIStyle("Label");
@@ -49,6 +49,12 @@ public static class NodeEditorResources {
             nodeBody.normal.background = NodeEditorResources.nodeBody;
             nodeBody.border = new RectOffset(32, 32, 32, 32);
             nodeBody.padding = new RectOffset(16, 16, 4, 6);
+
+            tooltip = new GUIStyle("helpBox");
+            tooltip.alignment = TextAnchor.MiddleCenter;
+            //tooltip.border = new RectOffset(0, 0, 0, 0);
+            //tooltip.normal.background
+            //tooltip.padding = new RectOffset(0, 0, 0, 0);
         }
     }