UnityMirror/xNode
1
0
Fork 0
mirror of https://github.com/Siccity/xNode.git synced 2025-12-20 17:26:02 +08:00
Code

Added colors to connections

Browse Source
This commit is contained in:
Unknown 2017-09-25 18:51:51 +02:00
parent 59c1e0d576
commit e40161684c
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Examples/Nodes/MathNode.cs
View File

@ -1,12 +1,12 @@
using UnityEngine; [System.Serializable]
[System.Serializable]
public class MathNode : Node { public class MathNode : Node {
[Input] public float a; [Input] public float a;
[Input] public float b; [Input] public float b;
[Output] public float result; [Output] public float result;
public enum ValueType { Float, Int }
public enum MathType { Add, Subtract, Multiply, Divide} public enum MathType { Add, Subtract, Multiply, Divide}
public ValueType valueType = ValueType.Float;
public MathType mathType = MathType.Add; public MathType mathType = MathType.Add;
protected override void Init() {
name = "Math";
}
} }

2
Scripts/Editor/NodeEditorAction.cs
View File

@ -131,7 +131,7 @@ public partial class NodeEditorWindow {
if (!_portConnectionPoints.ContainsKey(draggedOutput)) return; if (!_portConnectionPoints.ContainsKey(draggedOutput)) return;
Vector2 from = draggedOutput.node.position.position + _portConnectionPoints[draggedOutput].center; Vector2 from = draggedOutput.node.position.position + _portConnectionPoints[draggedOutput].center;
Vector2 to = draggedOutputTarget != null ? draggedOutputTarget.node.position.position + portConnectionPoints[draggedOutputTarget].center : WindowToGridPosition(Event.current.mousePosition); Vector2 to = draggedOutputTarget != null ? draggedOutputTarget.node.position.position + portConnectionPoints[draggedOutputTarget].center : WindowToGridPosition(Event.current.mousePosition);
DrawConnection(from, to); DrawConnection(from, to, NodeEditorUtilities.GetTypeColor(draggedOutput.type));
} }
} }

16
Scripts/Editor/NodeEditorGUI.cs
View File

@ -19,10 +19,6 @@ public partial class NodeEditorWindow {
GUI.matrix = m; GUI.matrix = m;
} }
public static void DrawConnection(Vector2 from, Vector2 to, Color col) {
Handles.DrawBezier(from, to, from, to, col, new Texture2D(2, 2), 2);
}
public static void BeginZoomed(Rect rect, float zoom) { public static void BeginZoomed(Rect rect, float zoom) {
GUI.EndClip(); GUI.EndClip();
@ -101,7 +97,8 @@ public partial class NodeEditorWindow {
contextMenu.DropDown(new Rect(Event.current.mousePosition, Vector2.zero)); contextMenu.DropDown(new Rect(Event.current.mousePosition, Vector2.zero));
} }
public void DrawConnection(Vector2 startPoint, Vector2 endPoint) { /// <summary> Draw a bezier from startpoint to endpoint, both in grid coordinates </summary>
public void DrawConnection(Vector2 startPoint, Vector2 endPoint, Color col) {
startPoint = GridToWindowPosition(startPoint); startPoint = GridToWindowPosition(startPoint);
endPoint = GridToWindowPosition(endPoint); endPoint = GridToWindowPosition(endPoint);
@ -113,8 +110,11 @@ public partial class NodeEditorWindow {
if (startPoint.x > endPoint.x) endTangent.x = Mathf.LerpUnclamped(endPoint.x, startPoint.x, -0.7f); if (startPoint.x > endPoint.x) endTangent.x = Mathf.LerpUnclamped(endPoint.x, startPoint.x, -0.7f);
else endTangent.x = Mathf.LerpUnclamped(endPoint.x, startPoint.x, 0.7f); else endTangent.x = Mathf.LerpUnclamped(endPoint.x, startPoint.x, 0.7f);
Handles.DrawBezier(startPoint, endPoint, startTangent, endTangent, Color.gray, null, 4); Color prevCol = GUI.color;
Handles.DrawBezier(startPoint, endPoint, startTangent, endTangent, Color.white, null, 2); Color edgeCol = new Color(0.1f, 0.1f, 0.1f, col.a);
Handles.DrawBezier(startPoint, endPoint, startTangent, endTangent, edgeCol, null, 4);
Handles.DrawBezier(startPoint, endPoint, startTangent, endTangent, col, null, 2);
GUI.color = prevCol;
} }
public void DrawConnections() { public void DrawConnections() {
@ -128,7 +128,7 @@ public partial class NodeEditorWindow {
for (int k = 0; k < output.ConnectionCount; k++) { for (int k = 0; k < output.ConnectionCount; k++) {
NodePort input = output.GetConnection(k); NodePort input = output.GetConnection(k);
Vector2 to = input.node.position.position + _portConnectionPoints[input].center; Vector2 to = input.node.position.position + _portConnectionPoints[input].center;
DrawConnection(from, to); DrawConnection(from, to, NodeEditorUtilities.GetTypeColor(output.type));
} }
} }
} }