Skip to content

Improve support for repeated content structures across game and plugins #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Improve support for repeated content structures across game and plugins #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
835937a
Support multiple path filters
seriema Jul 11, 2022
330100b
`Contains` path `/UI/` should be default
seriema Jul 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Source/BUIValidator/Private/BUIValidatorSettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ bool FBUIValidatorGroup::ShouldGroupValidateAsset( UObject* InAsset ) const
bool bMatchAnyPath = MatchConditions.Paths.Num() == 0;
for ( const auto& Path : MatchConditions.Paths )
{
if ( AssetPathInUnreal.StartsWith( Path.Path ) )
if ( Path.Type == EBUIPathType::StartsWith && AssetPathInUnreal.StartsWith( Path.Path ) ||
Path.Type == EBUIPathType::EndsWith && AssetPathInUnreal.EndsWith( Path.Path ) ||
Path.Type == EBUIPathType::Contains && AssetPathInUnreal.Contains( Path.Path ) )
{
bMatchAnyPath = true;
break;
Expand Down
28 changes: 26 additions & 2 deletions Source/BUIValidator/Public/BUIValidatorSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,28 @@ enum class EBUITextureSizeRequirement
PowerOfTwo,
};

UENUM()
enum class EBUIPathType
{
Contains,
EndsWith,
StartsWith,
};

USTRUCT( meta = ( ToolTip = " Match any part of an asset directory." ) )
struct FBUIPathFilter
{
GENERATED_BODY()

// Which part of the directory path to search in. `EndsWith` and `Contains` are useful for content plugins. `StartsWith` is the default for backwards-compatibility.
UPROPERTY( EditAnywhere, meta = ( DisplayName = "Path" ) )
EBUIPathType Type = EBUIPathType::StartsWith;

// Match UTexture2D assets under any of these directories
UPROPERTY( EditAnywhere, meta = ( DisplayName = "Path segment" ) )
FString Path;
};

USTRUCT( meta = ( ToolTip = "All parts of a rule must pass in order for the rule to be applied" ) )
struct FBUIMatchConditions
{
Expand All @@ -23,8 +45,10 @@ struct FBUIMatchConditions
TArray<FString> Prefixes = { "T_UI_" };

// Match UTexture2D assets under any of these directories
UPROPERTY( EditAnywhere, meta = ( ContentDir, TitleProperty = "Path" ) )
TArray<FDirectoryPath> Paths;
UPROPERTY( EditAnywhere, meta = ( TitleProperty = "Path" ) )
TArray<FBUIPathFilter> Paths = {
{ EBUIPathType::Contains, "/UI/" }
};
};

USTRUCT()
Expand Down