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

- Fixed a bug where items with a string match didn't get highlighted anymore when the group name matched

Browse Source 
- Remouved double filtering when group name matched
- Started fixing asynchronous Un/Packing nodes filtering
This commit is contained in:
Nils Hausfeld
2023-09-29 21:53:34 +02:00
parent b5dc916568
commit 3befe4bb4a
4 changed files with 67 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Editor/Surface/Archetypes/Packing.cs
View File

@@ -353,6 +353,7 @@ namespace FlaxEditor.Surface.Archetypes
Create = (id, context, arch, groupArch) => new PackStructureNode(id, context, arch, groupArch),
Description = "Makes the structure data to from the components.",
Flags = NodeFlags.VisualScriptGraph | NodeFlags.AnimGraph | NodeFlags.NoSpawnViaGUI,
NodeTypeHint = NodeTypeHint.PackingNode,
Size = new Float2(180, 20),
DefaultValues = new object[]
{
@@ -463,6 +464,7 @@ namespace FlaxEditor.Surface.Archetypes
Create = (id, context, arch, groupArch) => new UnpackStructureNode(id, context, arch, groupArch),
Description = "Breaks the structure data to allow extracting components from it.",
Flags = NodeFlags.VisualScriptGraph | NodeFlags.AnimGraph | NodeFlags.NoSpawnViaGUI,
NodeTypeHint = NodeTypeHint.PackingNode,
Size = new Float2(180, 20),
DefaultValues = new object[]
{

21
Source/Editor/Surface/ContextMenu/VisjectCMGroup.cs
View File

@@ -90,28 +90,16 @@ namespace FlaxEditor.Surface.ContextMenu
// Update items
bool isAnyVisible = false;
bool groupHeaderMatches = QueryFilterHelper.Match(filterText, HeaderText);
for (int i = 0; i < _children.Count; i++)
{
if (_children[i] is VisjectCMItem item)
{
item.UpdateFilter(filterText, selectedBox);
item.UpdateFilter(filterText, selectedBox, groupHeaderMatches);
isAnyVisible |= item.Visible;
}
}
// Update header title
if (QueryFilterHelper.Match(filterText, HeaderText))
{
for (int i = 0; i < _children.Count; i++)
{
if (_children[i] is VisjectCMItem item)
{
item.UpdateFilter(null, selectedBox);
isAnyVisible |= item.Visible;
}
}
}
// Update itself
if (isAnyVisible)
{
@@ -136,7 +124,7 @@ namespace FlaxEditor.Surface.ContextMenu
{
if (_children[i] is VisjectCMItem item)
{
item.CanConnectTo(null);
item.Visible = true;
}
}
Visible = true;
@@ -150,7 +138,8 @@ namespace FlaxEditor.Surface.ContextMenu
{
if (_children[i] is VisjectCMItem item)
{
isAnyVisible |= item.CanConnectTo(selectedBox);
item.Visible = item.CanConnectTo(selectedBox);
isAnyVisible |= item.Visible;
}
}

109
Source/Editor/Surface/ContextMenu/VisjectCMItem.cs
View File

@@ -103,29 +103,23 @@ namespace FlaxEditor.Surface.ContextMenu
{
// Is compatible if box is null for reset reasons
if (startBox == null)
{
Visible = true;
return true;
}
if (_archetype == null)
{
Visible = false;
return false;
}
bool isCompatible = false;
// Check compatibility based on the archetype tag or name. This handles custom groups and items, mainly function nodes for visual scripting
if (_archetype.NodeTypeHint == NodeTypeHint.FunctionNode)
if (_archetype.NodeTypeHint is NodeTypeHint.FunctionNode)
{
ScriptMemberInfo memberInfo = ScriptMemberInfo.Null;
// Check if the archetype tag already has a member info otherwise try to fetch it via the archetype type and name
// Only really the InvokeMethod Nodes have a member info in their tag
if (_archetype.Tag is ScriptMemberInfo info)
if (_archetype.Tag is ScriptMemberInfo tagInfo)
{
memberInfo = info;
memberInfo = tagInfo;
}
else if(_archetype.DefaultValues is { Length: > 1 }) // We have to check since VisualScriptFunctionNode and ReturnNode don't have a name and type
{
@@ -139,46 +133,7 @@ namespace FlaxEditor.Surface.ContextMenu
if (memberInfo != ScriptMemberInfo.Null)
{
// Box was dragged from an impulse port and the member info can be invoked so it is compatible
if (startBox.CurrentType.IsVoid && memberInfo.ValueType.IsVoid)
{
isCompatible = true;
}
else
{
// When the startBox is output we only need to check the input parameters
if (startBox.IsOutput)
{
var parameters = memberInfo.GetParameters();
ScriptType outType = startBox.CurrentType;
// non static members have an instance input parameter
if (!memberInfo.IsStatic)
{
var scriptType = memberInfo.DeclaringType;
isCompatible |= CanCastType(scriptType, outType, _archetype.ConnectionsHints);
}
// We ignore event members here since they only have output parameters, which are currently not declared as such
// TODO: Fix bug where event member parameters 'IsOut' is set to false and not true
if (!memberInfo.IsEvent)
{
for (int i = 0; i < parameters.Length; i++)
{
ScriptType inType = parameters[i].Type;
isCompatible |= CanCastType(inType, outType, _archetype.ConnectionsHints);
}
}
}
else
{
// When the startBox is input we only have to check the output type of the method
ScriptType inType = startBox.CurrentType;
ScriptType outType = memberInfo.ValueType;
isCompatible |= CanCastType(inType, outType, _archetype.ConnectionsHints);
}
}
isCompatible |= CheckMemberInfoCompatibility(startBox, memberInfo);
}
}
else if (_archetype.Elements != null)
@@ -186,11 +141,56 @@ namespace FlaxEditor.Surface.ContextMenu
// Check compatibility based on the defined elements in the archetype. This handles all the default groups and items
isCompatible = CheckElementsCompatibility(startBox);
}
Visible = isCompatible;
return isCompatible;
}
private bool CheckMemberInfoCompatibility(Box startBox, ScriptMemberInfo info)
{
bool isCompatible = false;
// Box was dragged from an impulse port and the member info can be invoked so it is compatible
if (startBox.CurrentType.IsVoid && info.ValueType.IsVoid)
{
isCompatible = true;
}
else
{
// When the startBox is output we only need to check the input parameters
if (startBox.IsOutput && !info.IsField)
{
var parameters = info.GetParameters();
ScriptType outType = startBox.CurrentType;
// non static members have an instance input parameter
if (!info.IsStatic)
{
var scriptType = info.DeclaringType;
isCompatible |= CanCastType(scriptType, outType, _archetype.ConnectionsHints);
}
// We ignore event members here since they only have output parameters, which are currently not declared as such
// TODO: Fix bug where event member parameters 'IsOut' is set to false and not true
if (!info.IsEvent)
{
for (int i = 0; i < parameters.Length; i++)
{
ScriptType inType = parameters[i].Type;
isCompatible |= CanCastType(inType, outType, _archetype.ConnectionsHints);
}
}
}
else
{
// When the startBox is input we only have to check the output type of the method
ScriptType inType = startBox.CurrentType;
ScriptType outType = info.ValueType;
isCompatible |= CanCastType(inType, outType, _archetype.ConnectionsHints);
}
}
return isCompatible;
}
private bool CheckElementsCompatibility(Box startBox)
{
bool isCompatible = false;
@@ -243,11 +243,12 @@ namespace FlaxEditor.Surface.ContextMenu
/// Updates the filter.
/// </summary>
/// <param name="filterText">The filter text.</param>
public void UpdateFilter(string filterText, Box selectedBox)
public void UpdateFilter(string filterText, Box selectedBox, bool groupHeaderMatches = false)
{
if (selectedBox != null)
{
if (!CanConnectTo(selectedBox))
Visible = CanConnectTo(selectedBox);
if (!Visible)
{
_highlights?.Clear();
return;
@@ -319,7 +320,7 @@ namespace FlaxEditor.Surface.ContextMenu
Data = data;
}
else
else if(!groupHeaderMatches)
{
// Hide
_highlights?.Clear();

5
Source/Editor/Surface/NodeArchetype.cs
View File

@@ -88,6 +88,11 @@ namespace FlaxEditor.Surface
/// Is Function Node.
/// </summary>
FunctionNode = 1,
/// <summary>
/// Is custom Packing Node.
/// </summary>
PackingNode = 2,
}
/// <summary>