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

Merge branch 'master' into 1.5

Browse Source
This commit is contained in:
Wojtek Figat
2022-11-27 12:11:50 +01:00
parent 373350df1e b1618a88be
commit 8e52e2fb10
49 changed files with 262 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Engine/Scripting/Attributes/Editor/ActorContextMenu.cs → Source/Engine/Scripting/Attributes/Editor/ActorContextMenuAttribute.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
namespace FlaxEngine
{
@@ -13,11 +13,11 @@ namespace FlaxEngine
/// The path to be used in the context menu
/// </summary>
public string Path;
/// <summary>
/// Initializes a new instance of the <see cref="ActorContextMenuAttribute"/> class.
/// </summary>
/// <param name="path">The path to use to create the context menu</param>
/// <param name="path">The path to use to create the context menu.</param>
public ActorContextMenuAttribute(string path)
{
Path = path;

42
Source/Engine/Scripting/Attributes/Editor/ActorToolboxAttribute.cs Normal file
View File

@@ -0,0 +1,42 @@
using System;
namespace FlaxEngine
{
/// <summary>
/// This attribute is used to show actors that can be created in the actor tab of the toolbox.
/// </summary>
[Serializable]
[AttributeUsage(AttributeTargets.Class)]
public class ActorToolboxAttribute : Attribute
{
/// <summary>
/// The path to be used in the tool box
/// </summary>
public string Group;
/// <summary>
/// The name to be used for the actor in the tool box. Will default to actor name if now used.
/// </summary>
public string Name;
/// <summary>
/// Initializes a new instance of the <see cref="ActorToolboxAttribute"/> class.
/// </summary>
/// <param name="group">The group to use to create the tab.</param>
public ActorToolboxAttribute(string group)
{
Group = group;
}
/// <summary>
/// Initializes a new instance of the <see cref="ActorToolboxAttribute"/> class.
/// </summary>
/// <param name="group">The group used to create the tab.</param>
/// <param name="name">The name to use rather than default.</param>
public ActorToolboxAttribute(string group, string name)
{
Group = group;
Name = name;
}
}
}

4
Source/Engine/Scripting/Attributes/Editor/ContentContextMenu.cs → Source/Engine/Scripting/Attributes/Editor/ContentContextMenuAttribute.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
namespace FlaxEngine
{
@@ -17,7 +17,7 @@ namespace FlaxEngine
/// <summary>
/// Initializes a new instance of the <see cref="ContentContextMenuAttribute"/> class.
/// </summary>
/// <param name="path">The path to use to create the context menu</param>
/// <param name="path">The path to use to create the context menu.</param>
public ContentContextMenuAttribute(string path)
{
Path = path;