UnityMirror/xNode
1
0
Fork 0
mirror of https://github.com/Siccity/xNode.git synced 2026-02-04 22:34:54 +08:00
Code

Added NodeGraphEditor.GetNoodleThickness

Browse Source
This commit is contained in:
Thor Brigsted 2019-10-16 23:08:07 +02:00
parent 63b0bf428b
commit 08af93c2e3
3 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Scripts/Editor/NodeEditorAction.cs
View File

@ -472,6 +472,7 @@ namespace XNodeEditor {
public void DrawDraggedConnection() { public void DrawDraggedConnection() {
if (IsDraggingPort) { if (IsDraggingPort) {
Gradient gradient = graphEditor.GetNoodleGradient(draggedOutput, null); Gradient gradient = graphEditor.GetNoodleGradient(draggedOutput, null);
float thickness = graphEditor.GetNoodleThickness(draggedOutput, null);
Rect fromRect; Rect fromRect;
if (!_portConnectionPoints.TryGetValue(draggedOutput, out fromRect)) return; if (!_portConnectionPoints.TryGetValue(draggedOutput, out fromRect)) return;
@ -483,7 +484,7 @@ namespace XNodeEditor {
if (draggedOutputTarget != null) gridPoints.Add(portConnectionPoints[draggedOutputTarget].center); if (draggedOutputTarget != null) gridPoints.Add(portConnectionPoints[draggedOutputTarget].center);
else gridPoints.Add(WindowToGridPosition(Event.current.mousePosition)); else gridPoints.Add(WindowToGridPosition(Event.current.mousePosition));
DrawNoodle(gradient, gridPoints); DrawNoodle(gradient, thickness, gridPoints);
Color bgcol = Color.black; Color bgcol = Color.black;
Color frcol = gradient.colorKeys[0].color; Color frcol = gradient.colorKeys[0].color;

44
Scripts/Editor/NodeEditorGUI.cs
View File

@ -117,7 +117,7 @@ namespace XNodeEditor {
} }
/// <summary> Draw a bezier from output to input in grid coordinates </summary> /// <summary> Draw a bezier from output to input in grid coordinates </summary>
public void DrawNoodle(Gradient gradient, List<Vector2> gridPoints) { public void DrawNoodle(Gradient gradient, float width, List<Vector2> gridPoints) {
Vector2[] windowPoints = gridPoints.Select(x => GridToWindowPosition(x)).ToArray(); Vector2[] windowPoints = gridPoints.Select(x => GridToWindowPosition(x)).ToArray();
Handles.color = gradient.Evaluate(0f); Handles.color = gradient.Evaluate(0f);
int length = gridPoints.Count; int length = gridPoints.Count;
@ -150,13 +150,12 @@ namespace XNodeEditor {
Vector2 tangent_a = point_a + outputTangent * 50 / zoom; Vector2 tangent_a = point_a + outputTangent * 50 / zoom;
Vector2 tangent_b = point_b + inputTangent * 50 / zoom; Vector2 tangent_b = point_b + inputTangent * 50 / zoom;
// Hover effect. // Hover effect.
int bezier_width = 4;
int division = Mathf.RoundToInt(.1f * dist_ab) + 3; int division = Mathf.RoundToInt(.1f * dist_ab) + 3;
Vector3[] points = Handles.MakeBezierPoints(point_a, point_b, tangent_a, tangent_b, division); Vector3[] points = Handles.MakeBezierPoints(point_a, point_b, tangent_a, tangent_b, division);
// Coloring and bezier drawing. // Coloring and bezier drawing.
for (int j = 0; j < points.Length - 1; j++) { for (int j = 0; j < points.Length - 1; j++) {
if (i == gridPoints.Count - 2) Handles.color = gradient.Evaluate((j + 1f) / points.Length); if (i == gridPoints.Count - 2) Handles.color = gradient.Evaluate((j + 1f) / points.Length);
Handles.DrawAAPolyLine(bezier_width, points[j], points[j + 1]); Handles.DrawAAPolyLine(width, points[j], points[j + 1]);
} }
outputTangent = -inputTangent; outputTangent = -inputTangent;
} }
@ -165,14 +164,12 @@ namespace XNodeEditor {
for (int i = 0; i < length - 1; i++) { for (int i = 0; i < length - 1; i++) {
Vector2 point_a = windowPoints[i]; Vector2 point_a = windowPoints[i];
Vector2 point_b = windowPoints[i + 1]; Vector2 point_b = windowPoints[i + 1];
// Hover effect.
int line_width = 5;
// Draws the line with the coloring. // Draws the line with the coloring.
Vector2 prev_point = point_a; Vector2 prev_point = point_a;
for (float j = 0; j < 1; j += 10f / Vector2.Distance(point_a, point_b)) { for (float j = 0; j < 1; j += 10f / Vector2.Distance(point_a, point_b)) {
Vector2 lerp = Vector2.Lerp(point_a, point_b, j); Vector2 lerp = Vector2.Lerp(point_a, point_b, j);
if (i == gridPoints.Count - 2) Handles.color = gradient.Evaluate(j); if (i == gridPoints.Count - 2) Handles.color = gradient.Evaluate(j);
Handles.DrawAAPolyLine(line_width, prev_point, lerp); Handles.DrawAAPolyLine(width, prev_point, lerp);
prev_point = lerp; prev_point = lerp;
} }
} }
@ -187,15 +184,15 @@ namespace XNodeEditor {
start_1.x = midpoint; start_1.x = midpoint;
end_1.x = midpoint; end_1.x = midpoint;
if (i == gridPoints.Count - 2) { if (i == gridPoints.Count - 2) {
Handles.DrawAAPolyLine(5, windowPoints[i], start_1); Handles.DrawAAPolyLine(width, windowPoints[i], start_1);
Handles.color = gradient.Evaluate(0.5f); Handles.color = gradient.Evaluate(0.5f);
Handles.DrawAAPolyLine(5, start_1, end_1); Handles.DrawAAPolyLine(width, start_1, end_1);
Handles.color = gradient.Evaluate(1f); Handles.color = gradient.Evaluate(1f);
Handles.DrawAAPolyLine(5, end_1, windowPoints[i + 1]); Handles.DrawAAPolyLine(width, end_1, windowPoints[i + 1]);
} else { } else {
Handles.DrawAAPolyLine(5, windowPoints[i], start_1); Handles.DrawAAPolyLine(width, windowPoints[i], start_1);
Handles.DrawAAPolyLine(5, start_1, end_1); Handles.DrawAAPolyLine(width, start_1, end_1);
Handles.DrawAAPolyLine(5, end_1, windowPoints[i + 1]); Handles.DrawAAPolyLine(width, end_1, windowPoints[i + 1]);
} }
} else { } else {
float midpoint = (windowPoints[i].y + windowPoints[i + 1].y) * 0.5f; float midpoint = (windowPoints[i].y + windowPoints[i + 1].y) * 0.5f;
@ -208,21 +205,21 @@ namespace XNodeEditor {
start_2.y = midpoint; start_2.y = midpoint;
end_2.y = midpoint; end_2.y = midpoint;
if (i == gridPoints.Count - 2) { if (i == gridPoints.Count - 2) {
Handles.DrawAAPolyLine(5, windowPoints[i], start_1); Handles.DrawAAPolyLine(width, windowPoints[i], start_1);
Handles.color = gradient.Evaluate(0.25f); Handles.color = gradient.Evaluate(0.25f);
Handles.DrawAAPolyLine(5, start_1, start_2); Handles.DrawAAPolyLine(width, start_1, start_2);
Handles.color = gradient.Evaluate(0.5f); Handles.color = gradient.Evaluate(0.5f);
Handles.DrawAAPolyLine(5, start_2, end_2); Handles.DrawAAPolyLine(width, start_2, end_2);
Handles.color = gradient.Evaluate(0.75f); Handles.color = gradient.Evaluate(0.75f);
Handles.DrawAAPolyLine(5, end_2, end_1); Handles.DrawAAPolyLine(width, end_2, end_1);
Handles.color = gradient.Evaluate(1f); Handles.color = gradient.Evaluate(1f);
Handles.DrawAAPolyLine(5, end_1, windowPoints[i + 1]); Handles.DrawAAPolyLine(width, end_1, windowPoints[i + 1]);
} else { } else {
Handles.DrawAAPolyLine(5, windowPoints[i], start_1); Handles.DrawAAPolyLine(width, windowPoints[i], start_1);
Handles.DrawAAPolyLine(5, start_1, start_2); Handles.DrawAAPolyLine(width, start_1, start_2);
Handles.DrawAAPolyLine(5, start_2, end_2); Handles.DrawAAPolyLine(width, start_2, end_2);
Handles.DrawAAPolyLine(5, end_2, end_1); Handles.DrawAAPolyLine(width, end_2, end_1);
Handles.DrawAAPolyLine(5, end_1, windowPoints[i + 1]); Handles.DrawAAPolyLine(width, end_1, windowPoints[i + 1]);
} }
} }
} }
@ -252,6 +249,7 @@ namespace XNodeEditor {
XNode.NodePort input = output.GetConnection(k); XNode.NodePort input = output.GetConnection(k);
Gradient noodleGradient = graphEditor.GetNoodleGradient(output, input); Gradient noodleGradient = graphEditor.GetNoodleGradient(output, input);
float noodleThickness = graphEditor.GetNoodleThickness(output, input);
// Error handling // Error handling
if (input == null) continue; //If a script has been updated and the port doesn't exist, it is removed and null is returned. If this happens, return. if (input == null) continue; //If a script has been updated and the port doesn't exist, it is removed and null is returned. If this happens, return.
@ -265,7 +263,7 @@ namespace XNodeEditor {
gridPoints.Add(fromRect.center); gridPoints.Add(fromRect.center);
gridPoints.AddRange(reroutePoints); gridPoints.AddRange(reroutePoints);
gridPoints.Add(toRect.center); gridPoints.Add(toRect.center);
DrawNoodle(noodleGradient, gridPoints); DrawNoodle(noodleGradient, noodleThickness, gridPoints);
// Loop through reroute points again and draw the points // Loop through reroute points again and draw the points
for (int i = 0; i < reroutePoints.Count; i++) { for (int i = 0; i < reroutePoints.Count; i++) {

9
Scripts/Editor/NodeGraphEditor.cs
View File

@ -63,7 +63,7 @@ namespace XNodeEditor {
menu.AddCustomContextMenuItems(target); menu.AddCustomContextMenuItems(target);
} }
/// <summary> Returned color is used to color noodles </summary> /// <summary> Returned gradient is used to color noodles </summary>
/// <param name="output"> The output this noodle comes from. Never null. </param> /// <param name="output"> The output this noodle comes from. Never null. </param>
/// <param name="input"> The output this noodle comes from. Can be null if we are dragging the noodle. </param> /// <param name="input"> The output this noodle comes from. Can be null if we are dragging the noodle. </param>
public virtual Gradient GetNoodleGradient(XNode.NodePort output, XNode.NodePort input) { public virtual Gradient GetNoodleGradient(XNode.NodePort output, XNode.NodePort input) {
@ -94,6 +94,13 @@ namespace XNodeEditor {
return grad; return grad;
} }
/// <summary> Returned float is used for noodle thickness </summary>
/// <param name="output"> The output this noodle comes from. Never null. </param>
/// <param name="input"> The output this noodle comes from. Can be null if we are dragging the noodle. </param>
public virtual float GetNoodleThickness(XNode.NodePort output, XNode.NodePort input) {
return 5f;
}
/// <summary> Returned color is used to color ports </summary> /// <summary> Returned color is used to color ports </summary>
public virtual Color GetPortColor(XNode.NodePort port) { public virtual Color GetPortColor(XNode.NodePort port) {
return GetTypeColor(port.ValueType); return GetTypeColor(port.ValueType);