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

- Filtering is functioning now for all default groups

Browse Source
This commit is contained in:
Nils Hausfeld
2023-09-25 19:10:05 +02:00
parent 50ebd5cb87
commit 33c51d0a8e
3 changed files with 99 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -505,9 +505,6 @@ namespace FlaxEditor.Surface.ContextMenu
for (int i = 0; i < _groups.Count; i++)
{
_groups[i].ResetView();
}
for (int i = 0; i < _groups.Count; i++)
{
_groups[i].EvaluateVisibilityWithBox(_selectedBox);
}
UnlockChildrenRecursive();

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

@@ -143,7 +143,7 @@ namespace FlaxEditor.Surface.ContextMenu
{
if (_children[i] is VisjectCMItem item)
{
isAnyVisible |= item.IsCompatibleWithBox(selectedBox);
isAnyVisible |= item.CanConnectTo(selectedBox);
}
}

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

@@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using FlaxEditor.Scripting;
using FlaxEditor.Surface.Elements;
using FlaxEditor.Utilities;
using FlaxEngine;
@@ -113,31 +114,45 @@ namespace FlaxEditor.Surface.ContextMenu
return false;
}
public bool IsCompatibleWithBox(Box box)
public bool CanConnectTo(Box startBox)
{
if (box == null)
if (startBox == null)
return true;
if(_archetype?.Elements == null)
return false;
Profiler.BeginEvent("VisjectCMItem.IsCompatibleWithBox");
bool isCompatible = false;
foreach (NodeElementArchetype element in _archetype.Elements)
{
if(element.Type != NodeElementType.Output && element.Type != NodeElementType.Input)
continue;
if ((box.IsOutput && element.Type == NodeElementType.Output) || (!box.IsOutput && element.Type == NodeElementType.Input))
if ((startBox.IsOutput && element.Type == NodeElementType.Output) || (!startBox.IsOutput && element.Type == NodeElementType.Input))
continue;
bool checkCompatibility = ((element.ConnectionsType == null || element.ConnectionsType == typeof(void)) && box.CurrentType != typeof(FlaxEngine.Object));
if (!checkCompatibility)
ScriptType inType;
ScriptType outType;
ConnectionsHint hint;
if (startBox.IsOutput)
{
if (box.CanUseType(element.ConnectionsType))
checkCompatibility = true;
inType = element.ConnectionsType;
outType = startBox.CurrentType;
hint = _archetype.ConnectionsHints;
}
else
{
inType = startBox.CurrentType;
outType = element.ConnectionsType;
hint = startBox.ParentNode.Archetype.ConnectionsHints;
}
bool checkCompatibility = CanCastToType(inType, outType, hint);
/*if (!checkCompatibility)
{
/*checkCompatibility = element.ConnectionsType == null && startBox.CurrentType != ScriptType.Object;#1#
checkCompatibility =
}*/
isCompatible |= checkCompatibility;
/*if(!isCompatible)
@@ -146,9 +161,80 @@ namespace FlaxEditor.Surface.ContextMenu
Visible = isCompatible;
Profiler.EndEvent();
return isCompatible;
}
private bool CanCastToType(ScriptType currentType, ScriptType type, ConnectionsHint hint)
{
if (VisjectSurface.CanUseDirectCastStatic(type, currentType, false))
return true;
var connectionsHints = hint;
if (currentType == ScriptType.Null && connectionsHints != ConnectionsHint.None)
{
if ((connectionsHints & ConnectionsHint.Anything) == ConnectionsHint.Anything)
return true;
if ((connectionsHints & ConnectionsHint.Value) == ConnectionsHint.Value && type.Type != typeof(void))
return true;
if ((connectionsHints & ConnectionsHint.Enum) == ConnectionsHint.Enum && type.IsEnum)
return true;
if ((connectionsHints & ConnectionsHint.Array) == ConnectionsHint.Array && type.IsArray)
return true;
if ((connectionsHints & ConnectionsHint.Dictionary) == ConnectionsHint.Dictionary && type.IsDictionary)
return true;
if ((connectionsHints & ConnectionsHint.Vector) == ConnectionsHint.Vector)
{
var t = type.Type;
if (t == typeof(Vector2) ||
t == typeof(Vector3) ||
t == typeof(Vector4) ||
t == typeof(Float2) ||
t == typeof(Float3) ||
t == typeof(Float4) ||
t == typeof(Double2) ||
t == typeof(Double3) ||
t == typeof(Double4) ||
t == typeof(Int2) ||
t == typeof(Int3) ||
t == typeof(Int4) ||
t == typeof(Color))
{
return true;
}
}
if ((connectionsHints & ConnectionsHint.Scalar) == ConnectionsHint.Scalar)
{
var t = type.Type;
if (t == typeof(bool) ||
t == typeof(char) ||
t == typeof(byte) ||
t == typeof(short) ||
t == typeof(ushort) ||
t == typeof(int) ||
t == typeof(uint) ||
t == typeof(long) ||
t == typeof(ulong) ||
t == typeof(float) ||
t == typeof(double))
{
return true;
}
}
}
return CanCast(type, currentType);
}
private static bool CanCast(ScriptType oB, ScriptType iB)
{
if (oB == iB)
return true;
if (oB == ScriptType.Null || iB == ScriptType.Null)
return false;
return (oB.Type != typeof(void) && oB.Type != typeof(FlaxEngine.Object)) &&
(iB.Type != typeof(void) && iB.Type != typeof(FlaxEngine.Object)) &&
oB.IsAssignableFrom(iB);
}
/// <summary>
/// Updates the filter.
@@ -158,7 +244,7 @@ namespace FlaxEditor.Surface.ContextMenu
{
if (selectedBox != null)
{
if (!IsCompatibleWithBox(selectedBox))
if (!CanConnectTo(selectedBox))
return;
}