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

changed way that the the new menu is generated. Added category name to proxies

Browse Source
This commit is contained in:
Chandler Cox
2022-10-30 14:30:32 -05:00
parent 3c689a4697
commit 050635b2cd
31 changed files with 149 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Editor/Content/Proxy/AnimationGraphFunctionProxy.cs
View File

@@ -16,6 +16,9 @@ namespace FlaxEditor.Content
/// <inheritdoc />
public override string Name => "Animation Graph Function";
/// <inheritdoc />
public override string CategoryName => "Animation";
/// <inheritdoc />
public override EditorWindow Open(Editor editor, ContentItem item)
{

3
Source/Editor/Content/Proxy/AnimationGraphProxy.cs
View File

@@ -15,6 +15,9 @@ namespace FlaxEditor.Content
{
/// <inheritdoc />
public override string Name => "Animation Graph";
/// <inheritdoc />
public override string CategoryName => "Animation";
/// <inheritdoc />
public override EditorWindow Open(Editor editor, ContentItem item)

3
Source/Editor/Content/Proxy/AnimationProxy.cs
View File

@@ -18,6 +18,9 @@ namespace FlaxEditor.Content
{
/// <inheritdoc />
public override string Name => "Animation";
/// <inheritdoc />
public override string CategoryName => "Animation";
/// <inheritdoc />
public override bool CanReimport(ContentItem item)

5
Source/Editor/Content/Proxy/AssetProxy.cs
View File

@@ -22,6 +22,11 @@ namespace FlaxEditor.Content
/// </summary>
public abstract string TypeName { get; }
/// <summary>
/// The category name used to sort in context menus
/// </summary>
public abstract string CategoryName { get; }
/// <summary>
/// Checks if this proxy supports the given asset type id at the given path.
/// </summary>

3
Source/Editor/Content/Proxy/AudioClipProxy.cs
View File

@@ -62,6 +62,9 @@ namespace FlaxEditor.Content
/// <inheritdoc />
public override string Name => "Audio Clip";
/// <inheritdoc />
public override string CategoryName => "Audio";
/// <inheritdoc />
public override bool CanReimport(ContentItem item)

3
Source/Editor/Content/Proxy/CollisionDataProxy.cs
View File

@@ -42,6 +42,9 @@ namespace FlaxEditor.Content
{
/// <inheritdoc />
public override string Name => "Collision Data";
/// <inheritdoc />
public override string CategoryName => "Physics";
/// <inheritdoc />
public override EditorWindow Open(Editor editor, ContentItem item)

3
Source/Editor/Content/Proxy/CubeTextureProxy.cs
View File

@@ -20,6 +20,9 @@ namespace FlaxEditor.Content
/// <inheritdoc />
public override string Name => "Cube Texture";
/// <inheritdoc />
public override string CategoryName => "Texture";
/// <inheritdoc />
public override bool CanReimport(ContentItem item)

3
Source/Editor/Content/Proxy/FontProxy.cs
View File

@@ -17,6 +17,9 @@ namespace FlaxEditor.Content
{
/// <inheritdoc />
public override string Name => "Font";
/// <inheritdoc />
public override string CategoryName => "Font";
/// <inheritdoc />
public override bool CanReimport(ContentItem item)

3
Source/Editor/Content/Proxy/GameplayGlobalsProxy.cs
View File

@@ -15,6 +15,9 @@ namespace FlaxEditor.Content
{
/// <inheritdoc />
public override string Name => "Gameplay Globals";
/// <inheritdoc />
public override string CategoryName => "Globals";
/// <inheritdoc />
public override EditorWindow Open(Editor editor, ContentItem item)

3
Source/Editor/Content/Proxy/IESProfileProxy.cs
View File

@@ -20,6 +20,9 @@ namespace FlaxEditor.Content
/// <inheritdoc />
public override string Name => "IES Profile";
/// <inheritdoc />
public override string CategoryName => "Lighting";
/// <inheritdoc />
public override bool CanReimport(ContentItem item)

17
Source/Editor/Content/Proxy/JsonAssetProxy.cs
View File

@@ -31,6 +31,9 @@ namespace FlaxEditor.Content
/// <inheritdoc />
public override string Name => "Json Asset";
/// <inheritdoc />
public override string CategoryName => "Json Asset";
/// <inheritdoc />
public override string FileExtension => Extension;
@@ -165,6 +168,20 @@ namespace FlaxEditor.Content
/// <inheritdoc />
public override string Name { get; } = Utilities.Utils.GetPropertyNameUI(typeof(T).Name);
private string _categoryName;
/// <inheritdoc />
public override string CategoryName => _categoryName;
/// <summary>
/// Sets the category name
/// </summary>
/// <param name="name">This is the category name</param>
public void SetCategoryName(string name)
{
_categoryName = name;
}
/// <inheritdoc />
public override bool CanCreate(ContentFolder targetLocation)
{

3
Source/Editor/Content/Proxy/MaterialFunctionProxy.cs
View File

@@ -15,6 +15,9 @@ namespace FlaxEditor.Content
{
/// <inheritdoc />
public override string Name => "Material Function";
/// <inheritdoc />
public override string CategoryName => "Material";
/// <inheritdoc />
public override EditorWindow Open(Editor editor, ContentItem item)

3
Source/Editor/Content/Proxy/MaterialInstanceProxy.cs
View File

@@ -20,6 +20,9 @@ namespace FlaxEditor.Content
/// <inheritdoc />
public override string Name => "Material Instance";
/// <inheritdoc />
public override string CategoryName => "Material";
/// <inheritdoc />
public override EditorWindow Open(Editor editor, ContentItem item)

3
Source/Editor/Content/Proxy/MaterialProxy.cs
View File

@@ -21,6 +21,9 @@ namespace FlaxEditor.Content
/// <inheritdoc />
public override string Name => "Material";
/// <inheritdoc />
public override string CategoryName => "Material";
/// <inheritdoc />
public override EditorWindow Open(Editor editor, ContentItem item)

3
Source/Editor/Content/Proxy/ModelProxy.cs
View File

@@ -21,6 +21,9 @@ namespace FlaxEditor.Content
/// <inheritdoc />
public override string Name => "Model";
/// <inheritdoc />
public override string CategoryName => "Model";
/// <inheritdoc />
public override bool CanReimport(ContentItem item)

3
Source/Editor/Content/Proxy/ParticleEmitterFunctionProxy.cs
View File

@@ -15,6 +15,9 @@ namespace FlaxEditor.Content
{
/// <inheritdoc />
public override string Name => "Particle Emitter Function";
/// <inheritdoc />
public override string CategoryName => "Particles";
/// <inheritdoc />
public override EditorWindow Open(Editor editor, ContentItem item)

3
Source/Editor/Content/Proxy/ParticleEmitterProxy.cs
View File

@@ -22,6 +22,9 @@ namespace FlaxEditor.Content
/// <inheritdoc />
public override string Name => "Particle Emitter";
/// <inheritdoc />
public override string CategoryName => "Particles";
/// <inheritdoc />
public override EditorWindow Open(Editor editor, ContentItem item)

3
Source/Editor/Content/Proxy/ParticleSystemProxy.cs
View File

@@ -46,6 +46,9 @@ namespace FlaxEditor.Content
/// <inheritdoc />
public override string Name => "Particle System";
/// <inheritdoc />
public override string CategoryName => "Particles";
/// <inheritdoc />
public override EditorWindow Open(Editor editor, ContentItem item)

3
Source/Editor/Content/Proxy/PrefabProxy.cs
View File

@@ -31,6 +31,9 @@ namespace FlaxEditor.Content
/// <inheritdoc />
public override string Name => "Prefab";
/// <inheritdoc />
public override string CategoryName => "Prefab";
/// <inheritdoc />
public override string FileExtension => Extension;

3
Source/Editor/Content/Proxy/PreviewsCacheProxy.cs
View File

@@ -15,6 +15,9 @@ namespace FlaxEditor.Content
{
/// <inheritdoc />
public override string Name => "Previews Cache";
/// <inheritdoc />
public override string CategoryName => "Previews Cache";
/// <inheritdoc />
public override EditorWindow Open(Editor editor, ContentItem item)

3
Source/Editor/Content/Proxy/SceneAnimationProxy.cs
View File

@@ -40,6 +40,9 @@ namespace FlaxEditor.Content
{
/// <inheritdoc />
public override string Name => "Scene Animation";
/// <inheritdoc />
public override string CategoryName => "Animation";
/// <inheritdoc />
public override EditorWindow Open(Editor editor, ContentItem item)

3
Source/Editor/Content/Proxy/SceneProxy.cs
View File

@@ -19,6 +19,9 @@ namespace FlaxEditor.Content
/// <inheritdoc />
public override string Name => "Scene";
/// <inheritdoc />
public override string CategoryName => "Scene";
/// <inheritdoc />
public override string FileExtension => Extension;

3
Source/Editor/Content/Proxy/SettingsProxy.cs
View File

@@ -20,6 +20,9 @@ namespace FlaxEditor.Content
/// Gets the settings type.
/// </summary>
public Type Type => _type;
/// <inheritdoc />
public override string CategoryName => "Settings";
/// <summary>
/// Initializes a new instance of the <see cref="SettingsProxy"/> class.

3
Source/Editor/Content/Proxy/ShaderProxy.cs
View File

@@ -14,6 +14,9 @@ namespace FlaxEditor.Content
{
/// <inheritdoc />
public override string Name => "Shader";
/// <inheritdoc />
public override string CategoryName => "Shader";
/// <inheritdoc />
public override bool CanReimport(ContentItem item)

3
Source/Editor/Content/Proxy/SkeletonMaskProxy.cs
View File

@@ -15,6 +15,9 @@ namespace FlaxEditor.Content
{
/// <inheritdoc />
public override string Name => "Skeleton Mask";
/// <inheritdoc />
public override string CategoryName => "Animation";
/// <inheritdoc />
public override EditorWindow Open(Editor editor, ContentItem item)

3
Source/Editor/Content/Proxy/SkinnedModelProxy.cs
View File

@@ -20,6 +20,9 @@ namespace FlaxEditor.Content
/// <inheritdoc />
public override string Name => "Skinned Model";
/// <inheritdoc />
public override string CategoryName => "Model";
/// <inheritdoc />
public override bool CanReimport(ContentItem item)

3
Source/Editor/Content/Proxy/SpriteAtlasProxy.cs
View File

@@ -20,6 +20,9 @@ namespace FlaxEditor.Content
/// <inheritdoc />
public override string Name => "Sprite Atlas";
/// <inheritdoc />
public override string CategoryName => "Sprites";
/// <inheritdoc />
public override bool CanReimport(ContentItem item)

3
Source/Editor/Content/Proxy/TextureProxy.cs
View File

@@ -20,6 +20,9 @@ namespace FlaxEditor.Content
/// <inheritdoc />
public override string Name => "Texture";
/// <inheritdoc />
public override string CategoryName => "Texture";
/// <inheritdoc />
public override bool CanReimport(ContentItem item)

3
Source/Editor/Content/Proxy/VisualScriptProxy.cs
View File

@@ -24,6 +24,9 @@ namespace FlaxEditor.Content
/// <inheritdoc />
public override string Name => "Visual Script";
/// <inheritdoc />
public override string CategoryName => "Scripting";
/// <inheritdoc />
public override EditorWindow Open(Editor editor, ContentItem item)

4
Source/Editor/Modules/ContentDatabaseModule.cs
View File

@@ -927,7 +927,9 @@ namespace FlaxEditor.Modules
Proxy.Add(new VisualScriptProxy());
Proxy.Add(new LocalizedStringTableProxy());
Proxy.Add(new FileProxy());
Proxy.Add(new SpawnableJsonAssetProxy<PhysicalMaterial>());
var pm = new SpawnableJsonAssetProxy<PhysicalMaterial>();
pm.SetCategoryName("Physics");
Proxy.Add(pm);
// Settings
Proxy.Add(new SettingsProxy(typeof(GameSettings), Editor.Instance.Icons.GameSettings128));

96
Source/Editor/Windows/ContentWindow.ContextMenu.cs
View File

@@ -2,10 +2,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using FlaxEditor.Content;
using FlaxEditor.GUI.ContextMenu;
using FlaxEngine;
using FlaxEngine.Assertions;
using FlaxEngine.GUI;
using FlaxEngine.Json;
namespace FlaxEditor.Windows
@@ -17,35 +19,6 @@ namespace FlaxEditor.Windows
/// </summary>
public event Action<ContextMenu, ContentItem> ContextMenuShow;
private readonly List<string> _animationGroupNames = new List<string>()
{
"Animation",
"Animation Graph",
"Animation Graph Function",
"Skeleton Mask",
"Scene Animation",
};
private readonly List<string> _particleGroupNames = new List<string>()
{
"Particle Emitter",
"Particle Emitter Function",
"Particle System",
};
private readonly List<string> _materialGroupNames = new List<string>()
{
"Material",
"Material Function",
"Material Instance",
};
private readonly List<string> _physicsGroupNames = new List<string>()
{
"Collision Data",
"Physical Material",
};
private void ShowContextMenuForItem(ContentItem item, ref Float2 location, bool isTreeNode)
{
Assert.IsNull(_newElement);
@@ -180,6 +153,28 @@ namespace FlaxEditor.Windows
cm.AddButton("New folder", NewFolder);
}
// categorize the asset proxies according to their category name
Dictionary<string, List<AssetProxy>> categorizedProxyList = new Dictionary<string, List<AssetProxy>>();
for (int i = 0; i < Editor.ContentDatabase.Proxy.Count; i++)
{
var p = Editor.ContentDatabase.Proxy[i];
if (p.CanCreate(folder))
{
if (p is AssetProxy ap)
{
if (categorizedProxyList.ContainsKey(ap.CategoryName))
{
categorizedProxyList.TryGetValue(ap.CategoryName, out var apList);
apList?.Add(ap);
}
else
{
categorizedProxyList.Add(ap.CategoryName, new List<AssetProxy>() {ap});
}
}
}
}
c = cm.AddChildMenu("New");
c.ContextMenu.Tag = item;
c.ContextMenu.AutoSort = true;
@@ -189,17 +184,27 @@ namespace FlaxEditor.Windows
var p = Editor.ContentDatabase.Proxy[i];
if (p.CanCreate(folder))
{
if (_animationGroupNames.Contains(p.Name))
AddContentProxyToMenu(c.ContextMenu, p, "Animation");
else if (_particleGroupNames.Contains(p.Name))
AddContentProxyToMenu(c.ContextMenu, p, "Particles");
else if (_materialGroupNames.Contains(p.Name))
AddContentProxyToMenu(c.ContextMenu, p, "Materials");
else if (_physicsGroupNames.Contains(p.Name))
AddContentProxyToMenu(c.ContextMenu, p, "Physics");
if (p is AssetProxy ap && categorizedProxyList.TryGetValue(ap.CategoryName, out var apList))
{
if (apList.Contains(ap))
{
if (apList.Count > 1)
{
var childMenu = c.ContextMenu.GetOrAddChildMenu(ap.CategoryName);
childMenu.ContextMenu.AutoSort = true;
childMenu.ContextMenu.AddButton(p.Name, () => NewItem(p));
}
else
{
c.ContextMenu.AddButton(p.Name, () => NewItem(p));
}
}
}
else
{
c.ContextMenu.AddButton(p.Name, () => NewItem(p));
}
newItems++;
}
}
@@ -218,21 +223,6 @@ namespace FlaxEditor.Windows
cm.Show(this, location);
}
private void AddContentProxyToMenu(ContextMenu contextMenu, ContentProxy contentProxy, string menuName)
{
var childMenu = contextMenu.GetChildMenu(menuName);
if (childMenu == null)
{
var c = contextMenu.AddChildMenu(menuName);
c.ContextMenu.AutoSort = true;
c.ContextMenu.AddButton(contentProxy.Name, () => NewItem(contentProxy));
}
else
{
childMenu.ContextMenu.AddButton(contentProxy.Name, () => NewItem(contentProxy));
}
}
private void OnExpandAllClicked(ContextMenuButton button)
{
CurrentViewFolder.Node.ExpandAll();