ed/Cog
1
0
Fork 0
mirror of https://github.com/Ed94/Cog.git synced 2026-08-05 15:18:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix build error

Browse Source
This commit is contained in:
Arnaud Jamin
2023-10-12 11:26:55 -04:00
parent 293a35af06
commit 7dc83d6601
27 changed files with 154 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Abilities.cpp
+6 -3
View File
@@ -1,7 +1,10 @@
#include "CogAbilityWindow_Abilities.h"
#include "AbilitySystemGlobals.h"
#include "AbilitySystemComponent.h"
#include "CogAbilityDataAsset.h"
#include "CogAbilityHelper.h"
#include "CogAbilityReplicator.h"
#include "CogImguiHelper.h"
#include "CogWindowWidgets.h"
#include "imgui.h"
@@ -290,13 +293,13 @@ void UCogAbilityWindow_Abilities::RenderAbilityContextMenu(UAbilitySystemCompone
}
//--------------------------------------------------------------------------------------------------------------------------
void UCogAbilityWindow_Abilities::OpenAbility(FGameplayAbilitySpecHandle Handle)
void UCogAbilityWindow_Abilities::OpenAbility(const FGameplayAbilitySpecHandle& Handle)
{
OpenedAbilities.AddUnique(Handle);
}
//--------------------------------------------------------------------------------------------------------------------------
void UCogAbilityWindow_Abilities::CloseAbility(FGameplayAbilitySpecHandle Handle)
void UCogAbilityWindow_Abilities::CloseAbility(const FGameplayAbilitySpecHandle& Handle)
{
OpenedAbilities.Remove(Handle);
}
@@ -448,7 +451,7 @@ void UCogAbilityWindow_Abilities::GameTick(float DeltaTime)
}
//--------------------------------------------------------------------------------------------------------------------------
void UCogAbilityWindow_Abilities::ProcessAbilityActivation(FGameplayAbilitySpecHandle Handle)
void UCogAbilityWindow_Abilities::ProcessAbilityActivation(const FGameplayAbilitySpecHandle& Handle)
{
AActor* Selection = GetSelection();
if (Selection == nullptr)
Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Cheats.cpp
+3
View File
@@ -6,6 +6,7 @@
#include "CogCommonAllegianceActorInterface.h"
#include "CogDebugDraw.h"
#include "CogImguiHelper.h"
#include "CogWindowWidgets.h"
#include "EngineUtils.h"
#include "GameFramework/Character.h"
#include "imgui.h"
@@ -94,11 +95,13 @@ void UCogAbilityWindow_Cheats::RenderContent()
AActor* SelectedActor = GetSelection();
if (SelectedActor == nullptr)
{
ImGui::Text("Invlid Selection");
return;
}
if (Asset == nullptr)
{
ImGui::Text("Invalid Asset");
return;
}
Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Effects.cpp
+1
View File
@@ -5,6 +5,7 @@
#include "AttributeSet.h"
#include "CogAbilityDataAsset.h"
#include "CogAbilityHelper.h"
#include "CogImguiHelper.h"
#include "CogWindowWidgets.h"
#include "EngineUtils.h"
#include "GameFramework/Character.h"
Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Pools.cpp
+3
View File
@@ -1,8 +1,11 @@
#include "CogAbilityWindow_Pools.h"
#include "AbilitySystemComponent.h"
#include "AbilitySystemGlobals.h"
#include "CogAbilityDataAsset.h"
#include "CogImguiHelper.h"
#include "CogWindowWidgets.h"
#include "imgui_internal.h"
//--------------------------------------------------------------------------------------------------------------------------
void UCogAbilityWindow_Pools::RenderHelp()
Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Tweaks.cpp
+9
View File
@@ -2,6 +2,15 @@
#include "AbilitySystemComponent.h"
#include "CogAbilityDataAsset.h"
#include "CogAbilityReplicator.h"
#include "CogImguiHelper.h"
#include "CogWindowWidgets.h"
//--------------------------------------------------------------------------------------------------------------------------
UCogAbilityWindow_Tweaks::UCogAbilityWindow_Tweaks()
{
bHasMenu = true;
}
//--------------------------------------------------------------------------------------------------------------------------
void UCogAbilityWindow_Tweaks::RenderHelp()
Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Abilities.h
+11 -4
View File
@@ -2,8 +2,10 @@
#include "CoreMinimal.h"
#include "CogWindow.h"
#include "GameplayAbilitySpecHandle.h"
#include "CogAbilityWindow_Abilities.generated.h"
class UAbilitySystemComponent;
class UGameplayAbility;
class UCogAbilityDataAsset;
struct FGameplayAbilitySpec;
@@ -17,7 +19,9 @@ public:
UCogAbilityWindow_Abilities();
TWeakObjectPtr<const UCogAbilityDataAsset> Asset;
const UCogAbilityDataAsset* GetAsset() const { return Asset.Get(); }
void SetAsset(const UCogAbilityDataAsset* Value) { Asset = Value; }
protected:
@@ -43,15 +47,15 @@ protected:
virtual void RenderAbilityInfo(const UAbilitySystemComponent& AbilitySystemComponent, FGameplayAbilitySpec& Spec);
virtual void ProcessAbilityActivation(FGameplayAbilitySpecHandle Handle);
virtual void ProcessAbilityActivation(const FGameplayAbilitySpecHandle& Handle);
virtual void ActivateAbility(UAbilitySystemComponent& AbilitySystemComponent, FGameplayAbilitySpec& Spec);
virtual void DeactivateAbility(UAbilitySystemComponent& AbilitySystemComponent, FGameplayAbilitySpec& Spec);
virtual void OpenAbility(FGameplayAbilitySpecHandle Handle);
virtual void OpenAbility(const FGameplayAbilitySpecHandle& Handle);
virtual void CloseAbility(FGameplayAbilitySpecHandle Handle);
virtual void CloseAbility(const FGameplayAbilitySpecHandle& Handle);
private:
@@ -60,4 +64,7 @@ private:
FGameplayAbilitySpecHandle AbilityHandleToRemove;
TArray<FGameplayAbilitySpecHandle> OpenedAbilities;
UPROPERTY()
TWeakObjectPtr<const UCogAbilityDataAsset> Asset = nullptr;
};
Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Attributes.h
+9 -2
View File
@@ -4,7 +4,9 @@
#include "CogWindow.h"
#include "CogAbilityWindow_Attributes.generated.h"
class UAbilitySystemComponent;
class UCogAbilityDataAsset;
struct FGameplayAttribute;
UCLASS(Config = Cog)
class COGABILITY_API UCogAbilityWindow_Attributes : public UCogWindow
@@ -13,9 +15,11 @@ class COGABILITY_API UCogAbilityWindow_Attributes : public UCogWindow
public:
UCogAbilityWindow_Attributes();
UCogAbilityWindow_Attributes();
TWeakObjectPtr<const UCogAbilityDataAsset> Asset;
const UCogAbilityDataAsset* GetAsset() const { return Asset.Get(); }
void SetAsset(const UCogAbilityDataAsset* Value) { Asset = Value; }
protected:
@@ -42,4 +46,7 @@ private:
bool bShowOnlyModified = false;
ImGuiTextFilter Filter;
UPROPERTY()
TWeakObjectPtr<const UCogAbilityDataAsset> Asset = nullptr;
};
Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Cheats.h
+2 -1
View File
@@ -44,5 +44,6 @@ private:
UPROPERTY(Config)
TArray<FString> AppliedCheats;
TWeakObjectPtr<const UCogAbilityDataAsset> Asset;
UPROPERTY()
TWeakObjectPtr<const UCogAbilityDataAsset> Asset = nullptr;
};
Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Effects.h
+10 -1
View File
@@ -5,7 +5,11 @@
#include "CogWindow.h"
#include "CogAbilityWindow_Effects.generated.h"
class UAbilitySystemComponent;
class UCogAbilityDataAsset;
class UGameplayEffect;
struct FActiveGameplayEffect;
struct FActiveGameplayEffectHandle;
UCLASS()
class COGABILITY_API UCogAbilityWindow_Effects : public UCogWindow
@@ -16,7 +20,9 @@ public:
UCogAbilityWindow_Effects();
TWeakObjectPtr<const UCogAbilityDataAsset> Asset;
const UCogAbilityDataAsset* GetAsset() const { return Asset.Get(); }
void SetAsset(const UCogAbilityDataAsset* Value) { Asset = Value; }
protected:
@@ -39,4 +45,7 @@ protected:
virtual void RenderPrediction(const FActiveGameplayEffect& ActiveEffect, bool Short);
virtual FString GetEffectName(const UGameplayEffect& Effect);
UPROPERTY()
TWeakObjectPtr<const UCogAbilityDataAsset> Asset = nullptr;
};
Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Pools.h
+5 -1
View File
@@ -16,7 +16,9 @@ class COGABILITY_API UCogAbilityWindow_Pools : public UCogWindow
public:
TWeakObjectPtr<const UCogAbilityDataAsset> Asset;
const UCogAbilityDataAsset* GetAsset() const { return Asset.Get(); }
void SetAsset(const UCogAbilityDataAsset* Value) { Asset = Value; }
protected:
@@ -26,4 +28,6 @@ protected:
virtual void DrawPool(const UAbilitySystemComponent* AbilitySystemComponent, const FCogAbilityPool& Pool);
UPROPERTY()
TWeakObjectPtr<const UCogAbilityDataAsset> Asset = nullptr;
};
Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Tweaks.h
+9 -1
View File
@@ -13,7 +13,12 @@ class COGABILITY_API UCogAbilityWindow_Tweaks : public UCogWindow
GENERATED_BODY()
public:
TWeakObjectPtr<const UCogAbilityDataAsset> Asset;
UCogAbilityWindow_Tweaks();
const UCogAbilityDataAsset* GetAsset() const { return Asset.Get(); }
void SetAsset(const UCogAbilityDataAsset* Value) { Asset = Value; }
protected:
@@ -24,4 +29,7 @@ protected:
virtual void DrawTweak(ACogAbilityReplicator* Replicator, int32 TweakIndex, int32 TweakCategoryIndex);
private:
UPROPERTY()
TWeakObjectPtr<const UCogAbilityDataAsset> Asset = nullptr;
};