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

Merge branch 'PrimitivesInToolboxSearch' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-PrimitivesInToolboxSearch

Browse Source
This commit is contained in:
Wojtek Figat
2025-04-08 16:55:44 +02:00
parent 242d400284 f432e54809
commit 58813d09c3
1 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Source/Editor/Windows/ToolboxWindow.cs
View File

@@ -101,6 +101,7 @@ namespace FlaxEditor.Windows
private TextBox _searchBox; private TextBox _searchBox;
private ContainerControl _groupSearch; private ContainerControl _groupSearch;
private Tabs _actorGroups; private Tabs _actorGroups;
private ContainerControl groupPrimitives;
/// <summary> /// <summary>
/// The editor instance. /// The editor instance.
@@ -192,13 +193,13 @@ namespace FlaxEditor.Windows
} }
// Setup primitives tabs // Setup primitives tabs
var groupBasicModels = CreateGroupWithList(_actorGroups, "Basic Models"); groupPrimitives = CreateGroupWithList(_actorGroups, "Primitives");
groupBasicModels.AddChild(CreateEditorAssetItem("Cube", "Primitives/Cube.flax")); groupPrimitives.AddChild(CreateEditorAssetItem("Cube", "Primitives/Cube.flax"));
groupBasicModels.AddChild(CreateEditorAssetItem("Sphere", "Primitives/Sphere.flax")); groupPrimitives.AddChild(CreateEditorAssetItem("Sphere", "Primitives/Sphere.flax"));
groupBasicModels.AddChild(CreateEditorAssetItem("Plane", "Primitives/Plane.flax")); groupPrimitives.AddChild(CreateEditorAssetItem("Plane", "Primitives/Plane.flax"));
groupBasicModels.AddChild(CreateEditorAssetItem("Cylinder", "Primitives/Cylinder.flax")); groupPrimitives.AddChild(CreateEditorAssetItem("Cylinder", "Primitives/Cylinder.flax"));
groupBasicModels.AddChild(CreateEditorAssetItem("Cone", "Primitives/Cone.flax")); groupPrimitives.AddChild(CreateEditorAssetItem("Cone", "Primitives/Cone.flax"));
groupBasicModels.AddChild(CreateEditorAssetItem("Capsule", "Primitives/Capsule.flax")); groupPrimitives.AddChild(CreateEditorAssetItem("Capsule", "Primitives/Capsule.flax"));
// Created first to order specific tabs // Created first to order specific tabs
CreateGroupWithList(_actorGroups, "Lights"); CreateGroupWithList(_actorGroups, "Lights");
@@ -346,7 +347,35 @@ namespace FlaxEditor.Windows
} }
item.SetHighlights(highlights); item.SetHighlights(highlights);
} }
// Hack primitive models into the search results
foreach (var child in groupPrimitives.Children)
{
if (child is Item primitiveAssetItem)
{
String text = primitiveAssetItem.Text;
if (!QueryFilterHelper.Match(filterText, text, out QueryFilterHelper.Range[] ranges))
continue;
// Rebuild the path based on item name (it would be better to convert the drag data back to a string somehow)
string path = $"Primitives/{text}.flax";
var item = _groupSearch.AddChild(CreateEditorAssetItem(text, path));
var highlights = new List<Rectangle>(ranges.Length);
var style = Style.Current;
var font = style.FontSmall;
var textRect = item.TextRect;
for (int i = 0; i < ranges.Length; i++)
{
var start = font.GetCharPosition(text, ranges[i].StartIndex);
var end = font.GetCharPosition(text, ranges[i].EndIndex);
highlights.Add(new Rectangle(start.X + textRect.X, textRect.Y, end.X - start.X, textRect.Height));
}
item.SetHighlights(highlights);
}
}
if (string.IsNullOrEmpty(filterText)) if (string.IsNullOrEmpty(filterText))
_groupSearch.SortChildren(); _groupSearch.SortChildren();
@@ -357,8 +386,10 @@ namespace FlaxEditor.Windows
private Item CreateEditorAssetItem(string name, string path) private Item CreateEditorAssetItem(string name, string path)
{ {
path = StringUtils.CombinePaths(Globals.EngineContentFolder, "Editor", path); string globalPath = StringUtils.CombinePaths(Globals.EngineContentFolder, "Editor", path);
return new Item(name, GUI.Drag.DragItems.GetDragData(path)); Item item = new Item(name, GUI.Drag.DragItems.GetDragData(globalPath));
item.TooltipText = $"{path}\nActor with a {name} asset.";
return item;
} }
private Item CreateActorItem(string name, ScriptType type) private Item CreateActorItem(string name, ScriptType type)