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

Merge branch 'req-actor-inherited-type' of https://github.com/Tryibion/FlaxEngine into Tryibion-req-actor-inherited-type

Browse Source
This commit is contained in:
Wojtek Figat
2026-03-10 20:01:37 +01:00
parent afc4d0f3d3 2901e3898c
commit 8cdb6d77ab
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
View File

@@ -103,11 +103,12 @@ namespace FlaxEditor.CustomEditors.Dedicated
var actors = ScriptsEditor.ParentEditor.Values;
foreach (var a in actors)
{
if (a.GetType() != requireActor.RequiredType)
{
item.Enabled = false;
break;
}
if (a.GetType() == requireActor.RequiredType)
continue;
if (requireActor.IncludeInheritedTypes && a.GetType().IsSubclassOf(requireActor.RequiredType))
continue;
item.Enabled = false;
break;
}
}
cm.AddItem(item);
@@ -824,7 +825,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
if (attribute != null)
{
var actor = script.Actor;
if (actor.GetType() != attribute.RequiredType && !actor.GetType().IsSubclassOf(attribute.RequiredType))
if (actor.GetType() != attribute.RequiredType && (attribute.IncludeInheritedTypes && !actor.GetType().IsSubclassOf(attribute.RequiredType)))
{
Editor.LogWarning($"`{Utilities.Utils.GetPropertyNameUI(scriptType.Name)}` on `{script.Actor}` is missing a required Actor of type `{attribute.RequiredType}`.");
hasAllRequirements = false;

9
Source/Engine/Scripting/Attributes/Editor/RequireActorAttribute.cs
View File

@@ -13,13 +13,20 @@ public class RequireActorAttribute : Attribute
/// The required type.
/// </summary>
public Type RequiredType;
/// <summary>
/// Whether to include inherited types.
/// </summary>
public bool IncludeInheritedTypes;
/// <summary>
/// Initializes a new instance of the <see cref="RequireActorAttribute"/> class.
/// </summary>
/// <param name="type">The required type.</param>
public RequireActorAttribute(Type type)
/// <param name="includeInheritedTypes">Whether to include inherited types.</param>
public RequireActorAttribute(Type type, bool includeInheritedTypes = false)
{
RequiredType = type;
IncludeInheritedTypes = includeInheritedTypes;
}
}