1
0
mirror of https://github.com/Siccity/xNode.git synced 2025-12-20 09:16:01 +08:00

Test branch. Switched to delegates for possible performance gain.

This commit is contained in:
Thor Brigsted 2018-09-11 00:18:11 +02:00
parent ff97cc4494
commit 147dc639e8
2 changed files with 33 additions and 67 deletions

View File

@ -184,10 +184,24 @@ namespace XNode {
/// <summary> Returns a value based on requested port output. Should be overridden in all derived nodes with outputs. </summary> /// <summary> Returns a value based on requested port output. Should be overridden in all derived nodes with outputs. </summary>
/// <param name="port">The requested port.</param> /// <param name="port">The requested port.</param>
public virtual object GetValue(NodePort port) { public object GetValue(NodePort port) {
Debug.LogWarning("No GetValue(NodePort port) override defined for " + GetType()); if (port.targetDelegate == null) port.Initialize(GetDelegate);
return null; return port.targetDelegate.DynamicInvoke();
} }
/// <summary> Returns a value based on requested port output. Should be overridden in all derived nodes with outputs. </summary>
/// <param name="port">The requested port.</param>
public T GetValue<T>(NodePort port) {
if (port.targetDelegate == null) port.Initialize(GetDelegate);
Func<T> func = port.targetDelegate as Func<T>;
if (func != null)
return func();
return default(T); //default
}
public abstract Delegate GetDelegate(string fieldName);
#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>

View File

@ -26,6 +26,7 @@ namespace XNode {
public bool IsConnected { get { return connections.Count != 0; } } public bool IsConnected { get { return connections.Count != 0; } }
public bool IsInput { get { return direction == IO.Input; } } public bool IsInput { get { return direction == IO.Input; } }
public bool IsOutput { get { return direction == IO.Output; } } public bool IsOutput { get { return direction == IO.Output; } }
public Delegate targetDelegate;
public string fieldName { get { return _fieldName; } } public string fieldName { get { return _fieldName; } }
public Node node { get { return _node; } } public Node node { get { return _node; } }
@ -88,6 +89,12 @@ namespace XNode {
_connectionType = connectionType; _connectionType = connectionType;
} }
/// <summary> Initialize the delegate for this NodePort. </summary>
/// <param name="initializer">Supply the GetDelegate method in the parent node. </param>
public void Initialize(Func<string, Delegate> initializer) {
targetDelegate = initializer(fieldName);
}
/// <summary> Checks all connections for invalid references, and removes them. </summary> /// <summary> Checks all connections for invalid references, and removes them. </summary>
public void VerifyConnections() { public void VerifyConnections() {
for (int i = connections.Count - 1; i >= 0; i--) { for (int i = connections.Count - 1; i >= 0; i--) {
@ -101,23 +108,23 @@ namespace XNode {
/// <summary> Return the output value of this node through its parent nodes GetValue override method. </summary> /// <summary> Return the output value of this node through its parent nodes GetValue override method. </summary>
/// <returns> <see cref="Node.GetValue(NodePort)"/> </returns> /// <returns> <see cref="Node.GetValue(NodePort)"/> </returns>
public object GetOutputValue() { public T GetOutputValue<T>() {
if (direction == IO.Input) return null; if (direction == IO.Input) return default(T);
return node.GetValue(this); return node.GetValue<T>(this);
} }
/// <summary> Return the output value of the first connected port. Returns null if none found or invalid.</summary> /// <summary> Return the output value of the first connected port. Returns null if none found or invalid.</summary>
/// <returns> <see cref="NodePort.GetOutputValue"/> </returns> /// <returns> <see cref="NodePort.GetOutputValue"/> </returns>
public object GetInputValue() { public T GetInputValue<T>() {
NodePort connectedPort = Connection; NodePort connectedPort = Connection;
if (connectedPort == null) return null; if (connectedPort == null) return default(T);
return connectedPort.GetOutputValue(); return connectedPort.GetOutputValue<T>();
} }
/// <summary> Return the output values of all connected ports. </summary> /// <summary> Return the output values of all connected ports. </summary>
/// <returns> <see cref="NodePort.GetOutputValue"/> </returns> /// <returns> <see cref="NodePort.GetOutputValue"/> </returns>
public object[] GetInputValues() { public T[] GetInputValues<T>() {
object[] objs = new object[ConnectionCount]; T[] ts = new T[ConnectionCount];
for (int i = 0; i < ConnectionCount; i++) { for (int i = 0; i < ConnectionCount; i++) {
NodePort connectedPort = connections[i].Port; NodePort connectedPort = connections[i].Port;
if (connectedPort == null) { // if we happen to find a null port, remove it and look again if (connectedPort == null) { // if we happen to find a null port, remove it and look again
@ -125,66 +132,11 @@ namespace XNode {
i--; i--;
continue; continue;
} }
objs[i] = connectedPort.GetOutputValue(); ts[i] = connectedPort.GetOutputValue<T>();
}
return objs;
}
/// <summary> Return the output value of the first connected port. Returns null if none found or invalid. </summary>
/// <returns> <see cref="NodePort.GetOutputValue"/> </returns>
public T GetInputValue<T>() {
object obj = GetInputValue();
return obj is T ? (T) obj : default(T);
}
/// <summary> Return the output values of all connected ports. </summary>
/// <returns> <see cref="NodePort.GetOutputValue"/> </returns>
public T[] GetInputValues<T>() {
object[] objs = GetInputValues();
T[] ts = new T[objs.Length];
for (int i = 0; i < objs.Length; i++) {
if (objs[i] is T) ts[i] = (T) objs[i];
} }
return ts; return ts;
} }
/// <summary> Return true if port is connected and has a valid input. </summary>
/// <returns> <see cref="NodePort.GetOutputValue"/> </returns>
public bool TryGetInputValue<T>(out T value) {
object obj = GetInputValue();
if (obj is T) {
value = (T) obj;
return true;
} else {
value = default(T);
return false;
}
}
/// <summary> Return the sum of all inputs. </summary>
/// <returns> <see cref="NodePort.GetOutputValue"/> </returns>
public float GetInputSum(float fallback) {
object[] objs = GetInputValues();
if (objs.Length == 0) return fallback;
float result = 0;
for (int i = 0; i < objs.Length; i++) {
if (objs[i] is float) result += (float) objs[i];
}
return result;
}
/// <summary> Return the sum of all inputs. </summary>
/// <returns> <see cref="NodePort.GetOutputValue"/> </returns>
public int GetInputSum(int fallback) {
object[] objs = GetInputValues();
if (objs.Length == 0) return fallback;
int result = 0;
for (int i = 0; i < objs.Length; i++) {
if (objs[i] is int) result += (int) objs[i];
}
return result;
}
/// <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) { public void Connect(NodePort port) {