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

Merge remote-tracking branch 'origin/master' into 1.9

Browse Source
This commit is contained in:
Wojtek Figat
2024-07-19 00:32:54 +02:00
parent fe33f09f1d d879b8e064
commit b33c2b4f36
21 changed files with 347 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Editor/Modules/ContentFindingModule.cs
View File

@@ -342,9 +342,10 @@ namespace FlaxEditor.Modules
{
foreach (var contentItem in items)
{
var name = contentItem.ShortName;
if (contentItem.IsAsset)
{
if (nameRegex.Match(contentItem.ShortName).Success)
if (nameRegex.Match(name).Success)
{
var asset = contentItem as AssetItem;
if (asset == null || !typeRegex.Match(asset.TypeName).Success)
@@ -358,7 +359,7 @@ namespace FlaxEditor.Modules
var splits = asset.TypeName.Split('.');
finalName = splits[splits.Length - 1];
}
matches.Add(new SearchResult { Name = asset.ShortName, Type = finalName, Item = asset });
matches.Add(new SearchResult { Name = name, Type = finalName, Item = asset });
}
}
else if (contentItem.IsFolder)
@@ -370,11 +371,12 @@ namespace FlaxEditor.Modules
}
else
{
if (nameRegex.Match(contentItem.ShortName).Success && typeRegex.Match(contentItem.GetType().Name).Success)
if (nameRegex.Match(name).Success && typeRegex.Match(contentItem.GetType().Name).Success)
{
string finalName = contentItem.GetType().Name.Replace("Item", "");
matches.Add(new SearchResult { Name = contentItem.ShortName, Type = finalName, Item = contentItem });
if (contentItem is ScriptItem)
name = contentItem.FileName; // Show extension for scripts (esp. for .h and .cpp files of the same name)
matches.Add(new SearchResult { Name = name, Type = finalName, Item = contentItem });
}
}
}