Move the window config base class in CogCommon for projects that want to have their own configs,

This commit is contained in:
Arnaud Jamin
2024-05-10 22:34:53 -04:00
parent c4af1f304d
commit 5e2ff8b918
29 changed files with 76 additions and 83 deletions
@@ -1,7 +1,7 @@
#pragma once
#include "CoreMinimal.h"
#include "CogWindowConfig.h"
#include "CogCommonConfig.h"
#include "CogAbilityConfig_Alignment.generated.h"
class UAbilitySystemComponent;
@@ -14,7 +14,7 @@ struct FModifierSpec;
//--------------------------------------------------------------------------------------------------------------------------
UCLASS(Config = Cog)
class UCogAbilityConfig_Alignment : public UCogWindowConfig
class UCogAbilityConfig_Alignment : public UCogCommonConfig
{
GENERATED_BODY()
@@ -1,10 +1,9 @@
#pragma once
#include "CoreMinimal.h"
#include "CogCommonConfig.h"
#include "CogWindow.h"
#include "CogWindowConfig.h"
#include "GameplayAbilitySpecHandle.h"
#include "GameplayTagContainer.h"
#include "CogAbilityWindow_Abilities.generated.h"
class UAbilitySystemComponent;
@@ -98,7 +97,7 @@ protected:
//--------------------------------------------------------------------------------------------------------------------------
UCLASS(Config = Cog)
class UCogAbilityConfig_Abilities : public UCogWindowConfig
class UCogAbilityConfig_Abilities : public UCogCommonConfig
{
GENERATED_BODY()
@@ -1,8 +1,8 @@
#pragma once
#include "CoreMinimal.h"
#include "CogCommonConfig.h"
#include "CogWindow.h"
#include "CogWindowConfig.h"
#include "CogAbilityWindow_Attributes.generated.h"
class UAbilitySystemComponent;
@@ -42,7 +42,7 @@ private:
//--------------------------------------------------------------------------------------------------------------------------
UCLASS(Config = Cog)
class UCogAbilityConfig_Attributes : public UCogWindowConfig
class UCogAbilityConfig_Attributes : public UCogCommonConfig
{
GENERATED_BODY()
@@ -1,8 +1,8 @@
#pragma once
#include "CoreMinimal.h"
#include "CogCommonConfig.h"
#include "CogWindow.h"
#include "CogWindowConfig.h"
#include "CogAbilityWindow_Cheats.generated.h"
class AActor;
@@ -47,7 +47,7 @@ protected:
//--------------------------------------------------------------------------------------------------------------------------
UCLASS(Config = Cog)
class UCogAbilityConfig_Cheats : public UCogWindowConfig
class UCogAbilityConfig_Cheats : public UCogCommonConfig
{
GENERATED_BODY()
@@ -2,8 +2,8 @@
#include "CoreMinimal.h"
#include "ActiveGameplayEffectHandle.h"
#include "CogCommonConfig.h"
#include "CogWindow.h"
#include "CogWindowConfig.h"
#include "imgui.h"
#include "CogAbilityWindow_Effects.generated.h"
@@ -73,7 +73,7 @@ protected:
//--------------------------------------------------------------------------------------------------------------------------
UCLASS(Config = Cog)
class UCogAbilityConfig_Effects : public UCogWindowConfig
class UCogAbilityConfig_Effects : public UCogCommonConfig
{
GENERATED_BODY()
@@ -1,8 +1,8 @@
#pragma once
#include "CoreMinimal.h"
#include "CogCommonConfig.h"
#include "CogWindow.h"
#include "CogWindowConfig.h"
#include "CogAbilityWindow_Tags.generated.h"
struct FGameplayTagContainer;
@@ -67,7 +67,7 @@ class COGABILITY_API FCogAbilityWindow_BlockedTags : public FCogAbilityWindow_Ta
//--------------------------------------------------------------------------------------------------------------------------
UCLASS(Config = Cog)
class UCogAbilityConfig_Tags : public UCogWindowConfig
class UCogAbilityConfig_Tags : public UCogCommonConfig
{
GENERATED_BODY()
@@ -2,7 +2,6 @@
#include "CoreMinimal.h"
#include "CogWindow.h"
#include "CogWindowConfig.h"
#include "CogAbilityWindow_Tasks.generated.h"
class UAbilitySystemComponent;
@@ -45,7 +44,7 @@ protected:
//--------------------------------------------------------------------------------------------------------------------------
UCLASS(Config = Cog)
class UCogAbilityConfig_Tasks : public UCogWindowConfig
class UCogAbilityConfig_Tasks : public UCogCommonConfig
{
GENERATED_BODY()