UnityMirror/xNode
1
0
Fork 0
mirror of https://github.com/Siccity/xNode.git synced 2025-12-21 01:36:03 +08:00
Code

feat: Add swapping state parameter to node connection and disconnection functions, may use it to detect how node connection/disconnection were made

Browse Source
This commit is contained in:
Insthync 2023-01-28 20:55:48 +07:00
parent 04343032e6
commit 6d1492b220
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Scripts/Node.cs
View File

@ -250,12 +250,15 @@ namespace XNode {
#endregion #endregion
/// <summary> Called after a connection between two <see cref="NodePort"/>s is created </summary> /// <summary> Called after a connection between two <see cref="NodePort"/>s is created </summary>
/// <param name="from">Output</param> <param name="to">Input</param> /// <param name="from">Output</param>
public virtual void OnCreateConnection(NodePort from, NodePort to) { } /// <param name="to">Input</param>
/// <param name="swapping">Creating while swapping or not?</param>
public virtual void OnCreateConnection(NodePort from, NodePort to, bool swapping) { }
/// <summary> Called after a connection is removed from this port </summary> /// <summary> Called after a connection is removed from this port </summary>
/// <param name="port">Output or Input</param> /// <param name="port">Output or Input</param>
public virtual void OnRemoveConnection(NodePort port) { } /// <param name="swapping">Removing while swapping or not?</param>
public virtual void OnRemoveConnection(NodePort port, bool swapping) { }
/// <summary> Disconnect everything from this node </summary> /// <summary> Disconnect everything from this node </summary>
public void ClearConnections() { public void ClearConnections() {

37
Scripts/NodePort.cs
View File

@ -202,7 +202,8 @@ namespace XNode {
/// <summary> Connect this <see cref="NodePort"/> to another </summary> /// <summary> Connect this <see cref="NodePort"/> to another </summary>
/// <param name="port">The <see cref="NodePort"/> to connect to</param> /// <param name="port">The <see cref="NodePort"/> to connect to</param>
public void Connect(NodePort port) { /// <param name="swapping">Creating while swapping or not?</param>
public void Connect(NodePort port, bool swapping = false) {
if (connections == null) connections = new List<PortConnection>(); if (connections == null) connections = new List<PortConnection>();
if (port == null) { Debug.LogWarning("Cannot connect to null port"); return; } if (port == null) { Debug.LogWarning("Cannot connect to null port"); return; }
if (port == this) { Debug.LogWarning("Cannot connect port to self."); return; } if (port == this) { Debug.LogWarning("Cannot connect port to self."); return; }
@ -212,13 +213,13 @@ namespace XNode {
UnityEditor.Undo.RecordObject(node, "Connect Port"); UnityEditor.Undo.RecordObject(node, "Connect Port");
UnityEditor.Undo.RecordObject(port.node, "Connect Port"); UnityEditor.Undo.RecordObject(port.node, "Connect Port");
#endif #endif
if (port.connectionType == Node.ConnectionType.Override && port.ConnectionCount != 0) { port.ClearConnections(); } if (port.connectionType == Node.ConnectionType.Override && port.ConnectionCount != 0) { port.ClearConnections(swapping); }
if (connectionType == Node.ConnectionType.Override && ConnectionCount != 0) { ClearConnections(); } if (connectionType == Node.ConnectionType.Override && ConnectionCount != 0) { ClearConnections(swapping); }
connections.Add(new PortConnection(port)); connections.Add(new PortConnection(port));
if (port.connections == null) port.connections = new List<PortConnection>(); if (port.connections == null) port.connections = new List<PortConnection>();
if (!port.IsConnectedTo(this)) port.connections.Add(new PortConnection(this)); if (!port.IsConnectedTo(this)) port.connections.Add(new PortConnection(this));
node.OnCreateConnection(this, port); node.OnCreateConnection(this, port, swapping);
port.node.OnCreateConnection(this, port); port.node.OnCreateConnection(this, port, swapping);
} }
public List<NodePort> GetConnections() { public List<NodePort> GetConnections() {
@ -284,7 +285,7 @@ namespace XNode {
} }
/// <summary> Disconnect this port from another port </summary> /// <summary> Disconnect this port from another port </summary>
public void Disconnect(NodePort port) { public void Disconnect(NodePort port, bool swapping = false) {
// Remove this ports connection to the other // Remove this ports connection to the other
for (int i = connections.Count - 1; i >= 0; i--) { for (int i = connections.Count - 1; i >= 0; i--) {
if (connections[i].Port == port) { if (connections[i].Port == port) {
@ -297,16 +298,16 @@ namespace XNode {
if (port.connections[i].Port == this) { if (port.connections[i].Port == this) {
port.connections.RemoveAt(i); port.connections.RemoveAt(i);
// Trigger OnRemoveConnection from this side port // Trigger OnRemoveConnection from this side port
port.node.OnRemoveConnection(port); port.node.OnRemoveConnection(port, swapping);
} }
} }
} }
// Trigger OnRemoveConnection // Trigger OnRemoveConnection
node.OnRemoveConnection(this); node.OnRemoveConnection(this, swapping);
} }
/// <summary> Disconnect this port from another port </summary> /// <summary> Disconnect this port from another port </summary>
public void Disconnect(int i) { public void Disconnect(int i, bool swapping = false) {
// Remove the other ports connection to this port // Remove the other ports connection to this port
NodePort otherPort = connections[i].Port; NodePort otherPort = connections[i].Port;
if (otherPort != null) { if (otherPort != null) {
@ -316,13 +317,13 @@ namespace XNode {
connections.RemoveAt(i); connections.RemoveAt(i);
// Trigger OnRemoveConnection // Trigger OnRemoveConnection
node.OnRemoveConnection(this); node.OnRemoveConnection(this, swapping);
if (otherPort != null) otherPort.node.OnRemoveConnection(otherPort); if (otherPort != null) otherPort.node.OnRemoveConnection(otherPort, swapping);
} }
public void ClearConnections() { public void ClearConnections(bool swapping = false) {
while (connections.Count > 0) { while (connections.Count > 0) {
Disconnect(connections[0].Port); Disconnect(connections[0].Port, swapping);
} }
} }
@ -347,16 +348,16 @@ namespace XNode {
for (int i = 0; i < bConnectionCount; i++) for (int i = 0; i < bConnectionCount; i++)
targetPortConnections.Add(targetPort.connections[i].Port); targetPortConnections.Add(targetPort.connections[i].Port);
ClearConnections(); ClearConnections(true);
targetPort.ClearConnections(); targetPort.ClearConnections(true);
// Add port connections to targetPort // Add port connections to targetPort
for (int i = 0; i < portConnections.Count; i++) for (int i = 0; i < portConnections.Count; i++)
targetPort.Connect(portConnections[i]); targetPort.Connect(portConnections[i], true);
// Add target port connections to this one // Add target port connections to this one
for (int i = 0; i < targetPortConnections.Count; i++) for (int i = 0; i < targetPortConnections.Count; i++)
Connect(targetPortConnections[i]); Connect(targetPortConnections[i], true);
} }
@ -380,7 +381,7 @@ namespace XNode {
NodePort otherPort = connection.Port; NodePort otherPort = connection.Port;
Connect(otherPort); Connect(otherPort);
} }
ClearConnections(); ClearConnections(false);
} }
/// <summary> Swap connected nodes from the old list with nodes from the new list </summary> /// <summary> Swap connected nodes from the old list with nodes from the new list </summary>