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

- More cleanup and comments

Browse Source
This commit is contained in:
Nils Hausfeld
2023-09-29 17:19:38 +02:00
parent a4970b7fce
commit 4bf46c3af3
4 changed files with 93 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,6 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using FlaxEditor.GUI.ContextMenu; using FlaxEditor.GUI.ContextMenu;
using FlaxEditor.GUI.Input; using FlaxEditor.GUI.Input;
using FlaxEditor.Scripting;
using FlaxEngine; using FlaxEngine;
using FlaxEngine.GUI; using FlaxEngine.GUI;
using FlaxEngine.Utilities; using FlaxEngine.Utilities;

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

@@ -80,7 +80,7 @@ namespace FlaxEditor.Surface.ContextMenu
if (!Visible) if (!Visible)
return; return;
if (selectedBox != null && CanConnectTo(selectedBox, NodeArchetype)) if (selectedBox != null && CanConnectTo(selectedBox))
SortScore += 1; SortScore += 1;
if (Data != null) if (Data != null)
SortScore += 1; SortScore += 1;
@@ -95,29 +95,14 @@ namespace FlaxEditor.Surface.ContextMenu
textRect = new Rectangle(22, 0, Width - 24, Height); textRect = new Rectangle(22, 0, Width - 24, Height);
} }
private bool CanConnectTo(Box startBox, NodeArchetype nodeArchetype) /// <summary>
{ /// Checks if this context menu item can be connected to a given box, before a node is actually spawned.
if (startBox == null) /// </summary>
return false; /// <param name="startBox">The connected box</param>
if (!startBox.IsOutput) /// <returns>True if the connected box is compatible with this item</returns>
return false; // For now, I'm only handing the output box case
if (nodeArchetype.Elements != null)
{
for (int i = 0; i < nodeArchetype.Elements.Length; i++)
{
if (nodeArchetype.Elements[i].Type == NodeElementType.Input &&
startBox.CanUseType(nodeArchetype.Elements[i].ConnectionsType))
{
return true;
}
}
}
return false;
}
public bool CanConnectTo(Box startBox) public bool CanConnectTo(Box startBox)
{ {
// Is compatible if box is null for reset reasons
if (startBox == null) if (startBox == null)
{ {
Visible = true; Visible = true;
@@ -131,15 +116,20 @@ namespace FlaxEditor.Surface.ContextMenu
} }
bool isCompatible = false; bool isCompatible = false;
// Check compatibility based on the defined elements in the archetype. This handles all the default groups and items
if (_archetype.Elements != null) if (_archetype.Elements != null)
{ {
isCompatible = CheckElementsCompatibility(startBox); isCompatible = CheckElementsCompatibility(startBox);
} }
// 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 == NodeTypeHint.FunctionNode)
{ {
ScriptMemberInfo memberInfo = ScriptMemberInfo.Null; 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 info)
{ {
memberInfo = info; memberInfo = info;
@@ -155,22 +145,29 @@ namespace FlaxEditor.Surface.ContextMenu
{ {
if(memberInfo.IsEvent) if(memberInfo.IsEvent)
isCompatible = false; isCompatible = false;
// 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) if (startBox.CurrentType.IsVoid && memberInfo.ValueType.IsVoid)
isCompatible = true; {
isCompatible = true;
}
else else
{ {
// When the startBox is output we only need to check the input parameters
if (startBox.IsOutput) if (startBox.IsOutput)
{ {
var parameters = memberInfo.GetParameters(); var parameters = memberInfo.GetParameters();
ScriptType outType = startBox.CurrentType; ScriptType outType = startBox.CurrentType;
// non static members have an instance input parameter
if (!memberInfo.IsStatic) if (!memberInfo.IsStatic)
{ {
var scriptType = memberInfo.DeclaringType; var scriptType = memberInfo.DeclaringType;
isCompatible |= CanCastToType(scriptType, outType, _archetype.ConnectionsHints); isCompatible |= CanCastToType(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) if (!memberInfo.IsEvent)
{ {
for (int i = 0; i < parameters.Length; i++) for (int i = 0; i < parameters.Length; i++)
@@ -182,6 +179,7 @@ namespace FlaxEditor.Surface.ContextMenu
} }
else else
{ {
// When the startBox is input we only have to check the output type of the method
ScriptType inType = startBox.CurrentType; ScriptType inType = startBox.CurrentType;
ScriptType outType = memberInfo.ValueType; ScriptType outType = memberInfo.ValueType;
@@ -232,60 +230,10 @@ namespace FlaxEditor.Surface.ContextMenu
{ {
if (VisjectSurface.CanUseDirectCastStatic(type, currentType, false)) if (VisjectSurface.CanUseDirectCastStatic(type, currentType, false))
return true; return true;
var connectionsHints = hint; if(VisjectSurface.IsTypeCompatible(currentType, type, hint))
if (currentType == ScriptType.Null && connectionsHints != ConnectionsHint.None) return true;
{
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); return CanCast(type, currentType);
} }

54
Source/Editor/Surface/Elements/Box.cs
View File

@@ -231,58 +231,8 @@ namespace FlaxEditor.Surface.Elements
} }
// Check using connection hints // Check using connection hints
var connectionsHints = ParentNode.Archetype.ConnectionsHints; if(VisjectSurface.IsTypeCompatible(Archetype.ConnectionsType, type, ParentNode.Archetype.ConnectionsHints))
if (Archetype.ConnectionsType == ScriptType.Null && connectionsHints != ConnectionsHint.None) return true;
{
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;
}
}
}
// Check independent and if there is box with bigger potential because it may block current one from changing type // Check independent and if there is box with bigger potential because it may block current one from changing type
var parentArch = ParentNode.Archetype; var parentArch = ParentNode.Archetype;

64
Source/Editor/Surface/VisjectSurface.Connecting.cs
View File

@@ -136,6 +136,70 @@ namespace FlaxEditor.Surface
return result; return result;
} }
/// <summary>
/// Checks if a type is compatible with another type and can be casted by using a connection hint
/// </summary>
/// <param name="from">Source type</param>
/// <param name="to">Type to check compatibility with</param>
/// <param name="hint">Hint to check if casting is possible</param>
/// <returns>True if the source type is compatible with the target type</returns>
public static bool IsTypeCompatible(ScriptType from, ScriptType to, ConnectionsHint hint)
{
if (from == ScriptType.Null && hint != ConnectionsHint.None)
{
if ((hint & ConnectionsHint.Anything) == ConnectionsHint.Anything)
return true;
if ((hint & ConnectionsHint.Value) == ConnectionsHint.Value && to.Type != typeof(void))
return true;
if ((hint & ConnectionsHint.Enum) == ConnectionsHint.Enum && to.IsEnum)
return true;
if ((hint & ConnectionsHint.Array) == ConnectionsHint.Array && to.IsArray)
return true;
if ((hint & ConnectionsHint.Dictionary) == ConnectionsHint.Dictionary && to.IsDictionary)
return true;
if ((hint & ConnectionsHint.Vector) == ConnectionsHint.Vector)
{
var t = to.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 ((hint & ConnectionsHint.Scalar) == ConnectionsHint.Scalar)
{
var t = to.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 false;
}
/// <summary> /// <summary>
/// Checks if can use direct conversion from one type to another. /// Checks if can use direct conversion from one type to another.
/// </summary> /// </summary>