GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

- Override node inputs/outputs now also get shown

Browse Source 
- Added special treatment for enum, pack and unpack nodes in order to also show their inputs/outputs
This commit is contained in:
Nils Hausfeld
2024-06-13 22:03:41 +02:00
parent 36bdd6cbd0
commit 67f3f89bf7
2 changed files with 60 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
Source/Editor/Surface/ContextMenu/VisjectCM.cs
View File

@@ -2,7 +2,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Linq; using System.Linq;
using System.Reflection;
using FlaxEditor.GUI.ContextMenu; using FlaxEditor.GUI.ContextMenu;
using FlaxEditor.GUI.Input; using FlaxEditor.GUI.Input;
using FlaxEditor.Scripting; using FlaxEditor.Scripting;
@@ -688,7 +690,10 @@ namespace FlaxEditor.Surface.ContextMenu
if (memberInfo.ValueType != ScriptType.Null && memberInfo.ValueType != ScriptType.Void) if (memberInfo.ValueType != ScriptType.Null && memberInfo.ValueType != ScriptType.Void)
{ {
_surfaceStyle.GetConnectionColor(memberInfo.ValueType, archetype.ConnectionsHints, out typeColor); _surfaceStyle.GetConnectionColor(memberInfo.ValueType, archetype.ConnectionsHints, out typeColor);
AddOutputElement(spriteHandle, typeColor, $">Return ({memberInfo.ValueType.Name})"); if (memberInfo.IsField && archetype.Title.StartsWith("Set "))
AddInputElement(spriteHandle, typeColor, $"({memberInfo.ValueType.Name})");
else
AddOutputElement(spriteHandle, typeColor, $">Return ({memberInfo.ValueType.Name})");
} }
for(int i = 0; i < memberInfo.ParametersCount; i++) for(int i = 0; i < memberInfo.ParametersCount; i++)
@@ -708,19 +713,63 @@ namespace FlaxEditor.Surface.ContextMenu
{ {
_descriptionSignatureLabel.Text = archetype.Signature; _descriptionSignatureLabel.Text = archetype.Signature;
declaringType = archetype.DefaultType; declaringType = archetype.DefaultType;
Debug.Log(archetype.Elements); // Special handling for Pack nodes
foreach (var element in archetype.Elements) if (archetype.TypeID == 26)
{ {
if (element.Type == NodeElementType.Input) var outputType = TypeUtils.GetType((string)archetype.DefaultValues[0]);
_surfaceStyle.GetConnectionColor(outputType, archetype.ConnectionsHints, out typeColor);
AddOutputElement(spriteHandle, typeColor, $"{outputType.Name}");
var fields = outputType.GetMembers(BindingFlags.Public | BindingFlags.Instance).Where(x => x.IsField).ToArray();
var fieldsLength = fields.Length;
for (var i = 0; i < fieldsLength; i++)
{ {
_surfaceStyle.GetConnectionColor(element.ConnectionsType, archetype.ConnectionsHints, out typeColor); var field = fields[i];
AddInputElement(spriteHandle, typeColor, element.Text); _surfaceStyle.GetConnectionColor(field.ValueType, archetype.ConnectionsHints, out typeColor);
AddInputElement(spriteHandle, typeColor, $"{field.Name} ({field.ValueType.Name})");
} }
else if (element.Type == NodeElementType.Output) }
else if (archetype.TypeID == 36)
{
var inputType = TypeUtils.GetType((string)archetype.DefaultValues[0]);
_surfaceStyle.GetConnectionColor(inputType, archetype.ConnectionsHints, out typeColor);
AddInputElement(spriteHandle, typeColor, $"{inputType.Name}");
var fields = inputType.GetMembers(BindingFlags.Public | BindingFlags.Instance).Where(x => x.IsField).ToArray();
var fieldsLength = fields.Length;
for (var i = 0; i < fieldsLength; i++)
{ {
_surfaceStyle.GetConnectionColor(element.ConnectionsType, archetype.ConnectionsHints, out typeColor); var field = fields[i];
AddOutputElement(spriteHandle, typeColor, element.Text); _surfaceStyle.GetConnectionColor(field.ValueType, archetype.ConnectionsHints, out typeColor);
AddOutputElement(spriteHandle, typeColor, $"{field.Name} ({field.ValueType.Name})");
}
}
else
{
foreach (var element in archetype.Elements)
{
if (element.Type == NodeElementType.Input)
{
_surfaceStyle.GetConnectionColor(element.ConnectionsType, archetype.ConnectionsHints, out typeColor);
AddInputElement(spriteHandle, typeColor, $"{element.Text} ({element.Type.ToString()})");
}
else if (element.Type == NodeElementType.Output)
{
// TODO: better check for enums
switch (archetype.TypeID)
{
case 11:
var t = new ScriptType(archetype.DefaultValues[0].GetType());
_surfaceStyle.GetConnectionColor(t, archetype.ConnectionsHints, out typeColor);
AddOutputElement(spriteHandle, typeColor, $"{t.Name}");
break;
default:
_surfaceStyle.GetConnectionColor(element.ConnectionsType, archetype.ConnectionsHints, out typeColor);
AddOutputElement(spriteHandle, typeColor, $"{element.Text} ({element.Type.ToString()})");
break;
}
}
} }
} }
} }

1
Source/Editor/Surface/VisualScriptSurface.cs
View File

@@ -242,6 +242,7 @@ namespace FlaxEditor.Surface
node.DefaultValues[0] = name; node.DefaultValues[0] = name;
node.DefaultValues[1] = parameters.Length; node.DefaultValues[1] = parameters.Length;
node.Title = "Override " + name; node.Title = "Override " + name;
node.Tag = member;
nodes.Add(node); nodes.Add(node);
} }
} }