Skip to content
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

Add dummy category specifier to be compatiable as an engine module #44

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add dummy category specifier to be compatiable as an engine module #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 16 additions & 16 deletions HotPatcher/Source/HotPatcherCore/Public/Cooker/MultiCooker/FSingleCookerSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ USTRUCT(BlueprintType)
struct HOTPATCHERCORE_API FCookerShaderOptions
{
GENERATED_BODY()
UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
bool bSharedShaderLibrary = false;
UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
bool bNativeShader = false;
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Cooker",meta=(EditCondition="bSharedShaderLibrary"))
bool bMergeShaderLibrary = false;
Expand All @@ -36,25 +36,25 @@ struct HOTPATCHERCORE_API FSingleCookerSettings:public FHotPatcherCookerSettingB
{
GENERATED_BODY()
public:
UPROPERTY(EditAnywhere,BlueprintReadWrite)
UPROPERTY(EditAnywhere,BlueprintReadWrite, Category="")
FString MissionName;
UPROPERTY(EditAnywhere,BlueprintReadWrite)
UPROPERTY(EditAnywhere,BlueprintReadWrite, Category="")
int32 MissionID = -1;
UPROPERTY(EditAnywhere,BlueprintReadWrite)
UPROPERTY(EditAnywhere,BlueprintReadWrite, Category="")
FString ShaderLibName;

UPROPERTY(EditAnywhere,BlueprintReadWrite)
UPROPERTY(EditAnywhere,BlueprintReadWrite, Category="")
TArray<FAssetDetail> CookAssets;

// skip loaded assets when cooking(package path)
UPROPERTY(EditAnywhere,BlueprintReadWrite)
UPROPERTY(EditAnywhere,BlueprintReadWrite, Category="")
TSet<FName> SkipLoadedAssets;

// Directories or asset package path
UPROPERTY(EditAnywhere,BlueprintReadWrite)
UPROPERTY(EditAnywhere,BlueprintReadWrite, Category="")
TArray<FString> SkipCookContents;

UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
TArray<UClass*> ForceSkipClasses;

UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Cooker")
Expand Down Expand Up @@ -91,10 +91,10 @@ struct HOTPATCHERCORE_API FSingleCookerSettings:public FHotPatcherCookerSettingB
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Debug")
bool bDisplayConfig = false;

UPROPERTY(EditAnywhere,BlueprintReadWrite)
UPROPERTY(EditAnywhere,BlueprintReadWrite, Category="")
FString StorageCookedDir;

UPROPERTY(EditAnywhere,BlueprintReadWrite)
UPROPERTY(EditAnywhere,BlueprintReadWrite, Category="")
FString StorageMetadataDir;

// UPROPERTY(EditAnywhere,BlueprintReadWrite,Category = "SavePackageContext")
Expand All @@ -110,9 +110,9 @@ USTRUCT(BlueprintType)
struct HOTPATCHERCORE_API FAssetsCollection
{
GENERATED_BODY()
UPROPERTY(EditAnywhere,BlueprintReadWrite)
UPROPERTY(EditAnywhere,BlueprintReadWrite, Category="")
ETargetPlatform TargetPlatform = ETargetPlatform::None;
UPROPERTY(EditAnywhere,BlueprintReadWrite)
UPROPERTY(EditAnywhere,BlueprintReadWrite, Category="")
TArray<FAssetDetail> Assets;
};

Expand All @@ -121,11 +121,11 @@ struct HOTPATCHERCORE_API FCookerFailedCollection
{
GENERATED_BODY()
public:
UPROPERTY(EditAnywhere,BlueprintReadWrite)
UPROPERTY(EditAnywhere,BlueprintReadWrite, Category="")
FString MissionName;
UPROPERTY(EditAnywhere,BlueprintReadWrite)
UPROPERTY(EditAnywhere,BlueprintReadWrite, Category="")
int32 MissionID = -1;
UPROPERTY(EditAnywhere,BlueprintReadWrite)
UPROPERTY(EditAnywhere,BlueprintReadWrite, Category="")
TMap<ETargetPlatform,FAssetsCollection> CookFailedAssets;
};

Expand Down
6 changes: 3 additions & 3 deletions HotPatcher/Source/HotPatcherCore/Public/GameFeature/FGameFeaturePackagerSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ struct HOTPATCHERCORE_API FGameFeaturePackagerSettings:public FHotPatcherSetting
return &StaticIns;
}

UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
TArray<FString> FeatureNames;

UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
bool bAutoLoadFeaturePlugin = true;
// Config/ Script/ etc.
UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
TArray<FString> NonContentDirs;
/*
* Cook Asset in current patch
Expand Down
8 changes: 4 additions & 4 deletions HotPatcher/Source/HotPatcherCore/Public/HotPatcherSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ struct FPakExternalInfo
GENERATED_BODY()
FPakExternalInfo()=default;
FPakExternalInfo(const FPakExternalInfo&)=default;
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
FString PakName;
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
TArray<ETargetPlatform> TargetPlatforms;
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
FPlatformExternAssets AddExternAssetsToPlatform;
};

Expand Down Expand Up @@ -68,4 +68,4 @@ FORCEINLINE UHotPatcherSettings::UHotPatcherSettings(const FObjectInitializer& I
TempPatchSetting.SavePath.Path = TEXT("[PROJECTDIR]/Saved/HotPatcher/Paks");
}

#undef LOCTEXT_NAMESPACE
#undef LOCTEXT_NAMESPACE
10 changes: 5 additions & 5 deletions HotPatcher/Source/HotPatcherCore/Public/ShaderPatch/FExportShaderPatchSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ struct FShaderPatchConf
{
GENERATED_USTRUCT_BODY()

UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
ETargetPlatform Platform = ETargetPlatform::None;
UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
TArray<FDirectoryPath> OldMetadataDir;
UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
FDirectoryPath NewMetadataDir;
UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
bool bNativeFormat = false;
// since UE 4.26 (Below 4.26 this parameter has no effect)
UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
bool bDeterministicShaderCodeOrder = true;
};

Expand Down
4 changes: 2 additions & 2 deletions HotPatcher/Source/HotPatcherCore/Public/ShaderPatch/FlibShaderPatchHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ class HOTPATCHERCORE_API UFlibShaderPatchHelper : public UBlueprintFunctionLibra
GENERATED_BODY()
public:

UFUNCTION(BlueprintCallable)
UFUNCTION(BlueprintCallable, Category="")
static bool CreateShaderCodePatch(TArray<FString> const& OldMetaDataDirs, FString const& NewMetaDataDir, FString const& OutDir, bool bNativeFormat,bool bDeterministicShaderCodeOrder = true);

UFUNCTION(BlueprintCallable)
UFUNCTION(BlueprintCallable, Category="")
static TArray<FString> ConvDirectoryPathToStr(const TArray<FDirectoryPath>& Dirs);

static FString ShaderExtension;
Expand Down
4 changes: 2 additions & 2 deletions HotPatcher/Source/HotPatcherRuntime/Public/BaseTypes/AssetManager/FAssetDependenciesDetail.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ struct HOTPATCHERRUNTIME_API FAssetDependenciesDetail
: ModuleCategory(InModuleCategory), AssetDependencyDetails(InDependAssetDetails)
{}

UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
FString ModuleCategory;
//UPROPERTY(EditAnywhere, BlueprintReadWrite)
// TArray<FString> mDependAsset;
UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
TMap<FString,FAssetDetail> AssetDependencyDetails;
};
2 changes: 1 addition & 1 deletion HotPatcher/Source/HotPatcherRuntime/Public/BaseTypes/AssetManager/FAssetDependenciesInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ struct HOTPATCHERRUNTIME_API FAssetDependenciesInfo
FAssetDependenciesInfo(const FAssetDependenciesInfo&)=default;
//UPROPERTY(EditAnywhere, BlueprintReadWrite)
//FString mAssetRef;
UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
TMap<FString,FAssetDependenciesDetail> AssetsDependenciesMap;

void AddAssetsDetail(const FAssetDetail& AssetDetail);
Expand Down
6 changes: 3 additions & 3 deletions HotPatcher/Source/HotPatcherRuntime/Public/BaseTypes/AssetManager/FAssetDetail.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ struct HOTPATCHERRUNTIME_API FAssetDetail
{
return !PackagePath.IsNone() && !AssetType.IsNone() && !Guid.IsNone();
}
UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
FName PackagePath;
UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
FName AssetType;
UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
FName Guid;

};
Expand Down
10 changes: 5 additions & 5 deletions HotPatcher/Source/HotPatcherRuntime/Public/BaseTypes/FBinariesPatchConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,20 @@ struct FMatchRule
{
GENERATED_BODY()
// match or ignore
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
EMatchRule Rule = EMatchRule::None;

// grate/less/equal
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
EMatchOperator Operator = EMatchOperator::None;

// uint kb
UPROPERTY(EditAnywhere,meta=(EditCondition="Operator!=EMatchOperator::None"))
UPROPERTY(EditAnywhere,meta=(EditCondition="Operator!=EMatchOperator::None"), Category="")
float Size = 100;
// match file Formats. etc .ini/.lua, if it is empty match everything
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
TArray<FString> Formaters;
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
TArray<FString> AssetTypes;
};

Expand Down
34 changes: 17 additions & 17 deletions HotPatcher/Source/HotPatcherRuntime/Public/BaseTypes/FChunkInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@ struct FPakCommand
const TArray<FString>& GetPakCommands()const{ return PakCommands; }
const TArray<FString>& GetIoStoreCommands()const{ return IoStoreCommands; }
public:
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
FString ChunkName;
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
FString MountPath;
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
FString AssetPackage;
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
TArray<FString> PakCommands;
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
TArray<FString> IoStoreCommands;

EPatchAssetType Type = EPatchAssetType::None;
Expand All @@ -88,19 +88,19 @@ struct FPakFileProxy
{
GENERATED_USTRUCT_BODY()
public:
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
FString ChunkStoreName;
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
ETargetPlatform Platform = ETargetPlatform::None;
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
FString StorageDirectory;
// UPROPERTY(EditAnywhere)
// FString PakCommandSavePath;
// UPROPERTY(EditAnywhere)
// FString PakSavePath;
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
TArray<FPakCommand> PakCommands;
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
TArray<FString> IoStoreCommands;
};

Expand All @@ -113,23 +113,23 @@ struct FChunkInfo
{
AssetRegistryDependencyTypes = TArray<EAssetRegistryDependencyTypeEx>{ EAssetRegistryDependencyTypeEx::Packages };
}
UPROPERTY(EditAnywhere,BlueprintReadWrite)
UPROPERTY(EditAnywhere,BlueprintReadWrite, Category="")
FString ChunkName;
UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
bool bMonolithic = false;
UPROPERTY(EditAnywhere, BlueprintReadWrite,meta=(EditCondition="bMonolithic"))
UPROPERTY(EditAnywhere, BlueprintReadWrite,meta=(EditCondition="bMonolithic"), Category="")
EMonolithicPathMode MonolithicPathMode = EMonolithicPathMode::MountPath;
UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
bool bStorageUnrealPakList = false;
UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
bool bStorageIoStorePakList = false;
UPROPERTY(EditAnywhere,BlueprintReadWrite, Category = "Assets", meta = (RelativeToGameContentDir, LongPackageName))
TArray<FDirectoryPath> AssetIncludeFilters;
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Assets", meta = (RelativeToGameContentDir, LongPackageName))
TArray<FDirectoryPath> AssetIgnoreFilters;
UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
bool bAnalysisFilterDependencies = false;
UPROPERTY(EditAnywhere, BlueprintReadWrite,meta=(EditCondition="bAnalysisFilterDependencies"))
UPROPERTY(EditAnywhere, BlueprintReadWrite,meta=(EditCondition="bAnalysisFilterDependencies"), Category="")
TArray<EAssetRegistryDependencyTypeEx> AssetRegistryDependencyTypes;
UPROPERTY(EditAnywhere,BlueprintReadWrite, Category = "Assets")
TArray<FPatcherSpecifyAsset> IncludeSpecifyAssets;
Expand Down
12 changes: 6 additions & 6 deletions HotPatcher/Source/HotPatcherRuntime/Public/BaseTypes/FCookShaderOptions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ struct FCookShaderOptions
}
FString GetShaderLibMountPointRegular()const { return ShderLibMountPointRegular; }

UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
bool bSharedShaderLibrary = false;
UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
bool bNativeShader = false;
// metallib and metalmap to pak?
bool bNativeShaderToPak = false;
// if name is StartContent to ShaderArchive-StarterContent-PCD3D_SM5.ushaderbytecode
UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
EShaderLibNameRule ShaderNameRule = EShaderLibNameRule::CHUNK_NAME;
UPROPERTY(EditAnywhere, BlueprintReadWrite,meta=(EditCondition="ShaderNameRule==EShaderLibNameRule::CUSTOM"))
UPROPERTY(EditAnywhere, BlueprintReadWrite,meta=(EditCondition="ShaderNameRule==EShaderLibNameRule::CUSTOM"), Category="")
FString CustomShaderName;
UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
FString ShderLibMountPointRegular;
};
};
20 changes: 10 additions & 10 deletions HotPatcher/Source/HotPatcherRuntime/Public/BaseTypes/FCookerConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@ struct FCookerConfig
{
GENERATED_USTRUCT_BODY()
public:
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
FString EngineBin;
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
FString ProjectPath;
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
FString EngineParams;
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
TArray<FString> CookPlatforms;
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
bool bCookAllMap = false;
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
TArray<FString> CookMaps;
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
TArray<FString> CookFilter;
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
TArray<FString> CookSettings;
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category="")
FString Options;
};
};
2 changes: 1 addition & 1 deletion HotPatcher/Source/HotPatcherRuntime/Public/BaseTypes/FExternDirectoryInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ struct FExternDirectoryInfo

UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "BaseVersion")
FDirectoryPath DirectoryPath;
UPROPERTY(EditAnywhere,BlueprintReadWrite)
UPROPERTY(EditAnywhere,BlueprintReadWrite, Category="")
FString MountPoint = TEXT("../../../");


Expand Down
2 changes: 1 addition & 1 deletion HotPatcher/Source/HotPatcherRuntime/Public/BaseTypes/FExternFileInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ struct FExternFileInfo

UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "BaseVersion", meta = (RelativeToGameContentDir))
FFilePath FilePath;
UPROPERTY(EditAnywhere,BlueprintReadWrite)
UPROPERTY(EditAnywhere,BlueprintReadWrite, Category="HotPatcherRunTime | Asset")
FString MountPath = TEXT("../../../");
UPROPERTY()
FString FileHash;
Expand Down
6 changes: 3 additions & 3 deletions HotPatcher/Source/HotPatcherRuntime/Public/BaseTypes/FHotPatcherAssetDependency.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ struct FHotPatcherAssetDependency
{
GENERATED_USTRUCT_BODY()
public:
UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
FAssetDetail Asset;
UPROPERTY(EditAnywhere, BlueprintReadWrite)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="")
TArray<FAssetDetail> AssetReference;
UPROPERTY(EditAnywhere,BlueprintReadWrite)
UPROPERTY(EditAnywhere,BlueprintReadWrite, Category="")
TArray<FAssetDetail> AssetDependency;
};
Loading