ed/Cog
1
0
Fork 0
mirror of https://github.com/Ed94/Cog.git synced 2026-06-13 08:02:23 -07:00
Code Issues Packages Projects Releases Wiki Activity

rename CogInterfaces to CogInterface

Browse Source
This commit is contained in:
Arnaud Jamin
2023-10-02 23:49:10 -04:00
parent 771963f7c2
commit bd6c7be5ca
21 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Plugins/CogAbility/CogAbility.uplugin
+1 -1
View File
@@ -27,7 +27,7 @@
"Enabled": true
},
{
"Name": "CogInterfaces",
"Name": "CogInterface",
"Enabled": true
},
{
Plugins/CogAbility/Source/CogAbility/CogAbility.Build.cs
+1 -1
View File
@@ -23,7 +23,7 @@ public class CogAbility : ModuleRules
{
"Core",
"CogImgui",
"CogInterfaces",
"CogInterface",
"CogDebug",
"CogWindow",
"GameplayAbilities",
Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Cheats.cpp
+1 -1
View File
@@ -1,7 +1,7 @@
#include "CogAbilityWindow_Cheats.h"
#include "CogAbilityDataAsset_Cheats.h"
#include "CogInterfacesAllegiance.h"
#include "CogInterfaceAllegianceActor.h"
#include "CogDebugDraw.h"
#include "CogImguiHelper.h"
#include "EngineUtils.h"
Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Damages.cpp
+6 -6
View File
@@ -1,6 +1,6 @@
#include "CogAbilityWindow_Damages.h"
#include "CogInterfacesDamageActor.h"
#include "CogInterfaceDamageActor.h"
#include "CogImguiHelper.h"
#include "imgui.h"
@@ -236,12 +236,12 @@ void UCogAbilityWindow_Damages::RenderContent()
//--------------------------------------------------------------------------------------------------------------------------
void UCogAbilityWindow_Damages::OnSelectionChanged(AActor* OldSelection, AActor* NewSelection)
{
if (ICogInterfacesDamageActor* DamageActor = Cast<ICogInterfacesDamageActor>(OldSelection))
if (ICogInterfaceDamageActor* DamageActor = Cast<ICogInterfaceDamageActor>(OldSelection))
{
DamageActor->OnDamageEvent().Remove(OnDamageEventDelegate);
}
if (ICogInterfacesDamageActor* DamageActor = Cast<ICogInterfacesDamageActor>(NewSelection))
if (ICogInterfaceDamageActor* DamageActor = Cast<ICogInterfaceDamageActor>(NewSelection))
{
OnDamageEventDelegate = DamageActor->OnDamageEvent().AddUObject(this, &UCogAbilityWindow_Damages::OnDamageEvent);
}
@@ -257,14 +257,14 @@ void UCogAbilityWindow_Damages::GameTick(float DeltaSeconds)
}
//--------------------------------------------------------------------------------------------------------------------------
void UCogAbilityWindow_Damages::OnDamageEvent(const FCogInterfacesDamageParams& Params)
void UCogAbilityWindow_Damages::OnDamageEvent(const FCogInterfaceDamageParams& Params)
{
AActor* Selection = GetSelection();
if (Params.Type == ECogInterfacesDamageEventType::DamageDealt)
if (Params.Type == ECogInterfaceDamageEventType::DamageDealt)
{
DamageDealtStats.AddDamage(Params.MitigatedDamage, Params.IncomingDamage, Params.IsCritical);
}
else if (Params.Type == ECogInterfacesDamageEventType::DamageReceived)
else if (Params.Type == ECogInterfaceDamageEventType::DamageReceived)
{
DamageReceivedStats.AddDamage(Params.MitigatedDamage, Params.IncomingDamage, Params.IsCritical);
}
Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Damages.h
+2 -2
View File
@@ -4,7 +4,7 @@
#include "CogWindow.h"
#include "CogAbilityWindow_Damages.generated.h"
struct FCogInterfacesDamageParams;
struct FCogInterfaceDamageParams;
//--------------------------------------------------------------------------------------------------------------------------
class FCogDamageInstance
@@ -64,7 +64,7 @@ protected:
private:
UFUNCTION()
void OnDamageEvent(const FCogInterfacesDamageParams& Params);
void OnDamageEvent(const FCogInterfaceDamageParams& Params);
FCogDamageStats DamageDealtStats;
FCogDamageStats DamageReceivedStats;
Plugins/CogDebug/CogDebug.uplugin
+1 -1
View File
@@ -32,7 +32,7 @@
"Enabled": true
},
{
"Name": "CogInterfaces",
"Name": "CogInterface",
"Enabled": true
}
]
Plugins/CogDebug/Source/CogDebug/CogDebug.Build.cs
+1 -1
View File
@@ -23,7 +23,7 @@ public class CogDebug : ModuleRules
{
"Core",
"CogImgui",
"CogInterfaces",
"CogInterface",
}
);
Plugins/CogDebug/Source/CogDebug/Private/CogDebugPlot.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include "CogDebugDraw.h"
#include "CogDebugHelper.h"
#include "CogInterfacesFilteredActor.h"
#include "CogInterfaceFilteredActor.h"
#include "CogImguiHelper.h"
FCogDebugPlotEvent FCogDebugPlot::DefaultEvent;
Plugins/CogDebug/Source/CogDebug/Private/CogDebugSettings.cpp
+1 -1
View File
@@ -1,6 +1,6 @@
#include "CogDebugSettings.h"
#include "CogInterfacesFilteredActor.h"
#include "CogInterfaceFilteredActor.h"
//--------------------------------------------------------------------------------------------------------------------------
TWeakObjectPtr<AActor> FCogDebugSettings::Selection;
Plugins/CogInterfaces/CogInterfaces.uplugin → Plugins/CogInterface/CogInterface.uplugin
+2 -2
View File
@@ -2,7 +2,7 @@
"FileVersion": 1,
"Version": 1,
"VersionName": "1.0",
"FriendlyName": "CogInterfaces",
"FriendlyName": "CogInterface",
"Description": "",
"Category": "Other",
"CreatedBy": "Arnaud Jamin",
@@ -16,7 +16,7 @@
"Installed": false,
"Modules": [
{
"Name": "CogInterfaces",
"Name": "CogInterface",
"Type": "Runtime",
"LoadingPhase": "Default"
}
Plugins/CogInterfaces/Resources/Icon128.png → Plugins/CogInterface/Resources/Icon128.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Plugins/CogInterfaces/Source/CogInterfaces/CogInterfaces.Build.cs → Plugins/CogInterface/Source/CogInterface/CogInterface.Build.cs
+2 -2
View File
@@ -1,8 +1,8 @@
using UnrealBuildTool;
public class CogInterfaces : ModuleRules
public class CogInterface : ModuleRules
{
public CogInterfaces(ReadOnlyTargetRules Target) : base(Target)
public CogInterface(ReadOnlyTargetRules Target) : base(Target)
{
PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
Plugins/CogInterfaces/Source/CogInterfaces/Private/CogInterfacesModule.cpp → Plugins/CogInterface/Source/CogInterface/Private/CogInterfaceModule.cpp
+4 -4
View File
@@ -1,17 +1,17 @@
#include "CogInterfacesModule.h"
#include "CogInterfaceModule.h"
#define LOCTEXT_NAMESPACE "FCogInterfacesModule"
//--------------------------------------------------------------------------------------------------------------------------
void FCogInterfacesModule::StartupModule()
void FCogInterfaceModule::StartupModule()
{
}
//--------------------------------------------------------------------------------------------------------------------------
void FCogInterfacesModule::ShutdownModule()
void FCogInterfaceModule::ShutdownModule()
{
}
#undef LOCTEXT_NAMESPACE
IMPLEMENT_MODULE(FCogInterfacesModule, CogInterfaces)
IMPLEMENT_MODULE(FCogInterfaceModule, CogInterface)
Plugins/CogInterfaces/Source/CogInterfaces/Public/CogInterfacesAllegiance.h → Plugins/CogInterface/Source/CogInterface/Public/CogInterfaceAllegianceActor.h
+1 -1
View File
@@ -1,7 +1,7 @@
#pragma once
#include "CoreMinimal.h"
#include "CogInterfacesAllegiance.generated.h"
#include "CogInterfaceAllegianceActor.generated.h"
//--------------------------------------------------------------------------------------------------------------------------
UENUM(BlueprintType)
Plugins/CogInterfaces/Source/CogInterfaces/Public/CogInterfacesDamageActor.h → Plugins/CogInterface/Source/CogInterface/Public/CogInterfaceDamageActor.h
+8 -8
View File
@@ -1,11 +1,11 @@
#pragma once
#include "CoreMinimal.h"
#include "CogInterfacesDamageActor.generated.h"
#include "CogInterfaceDamageActor.generated.h"
//--------------------------------------------------------------------------------------------------------------------------
UENUM(BlueprintType)
enum class ECogInterfacesDamageEventType : uint8
enum class ECogInterfaceDamageEventType : uint8
{
DamageDealt,
DamageReceived,
@@ -14,11 +14,11 @@ enum class ECogInterfacesDamageEventType : uint8
//--------------------------------------------------------------------------------------------------------------------------
USTRUCT()
struct FCogInterfacesDamageParams
struct FCogInterfaceDamageParams
{
GENERATED_BODY()
ECogInterfacesDamageEventType Type;
ECogInterfaceDamageEventType Type;
TObjectPtr<AActor> DamageDealer;
TObjectPtr<AActor> DamageReceiver;
float MitigatedDamage = 0;
@@ -27,20 +27,20 @@ struct FCogInterfacesDamageParams
};
//--------------------------------------------------------------------------------------------------------------------------
DECLARE_MULTICAST_DELEGATE_OneParam(FCogAbilityOnDamageEvent, const FCogInterfacesDamageParams&);
DECLARE_MULTICAST_DELEGATE_OneParam(FCogInterfaceOnDamageEvent, const FCogInterfaceDamageParams&);
//--------------------------------------------------------------------------------------------------------------------------
UINTERFACE(MinimalAPI, Blueprintable)
class UCogInterfacesDamageActor : public UInterface
class UCogInterfaceDamageActor : public UInterface
{
GENERATED_BODY()
};
//--------------------------------------------------------------------------------------------------------------------------
class ICogInterfacesDamageActor
class ICogInterfaceDamageActor
{
GENERATED_BODY()
public:
virtual FCogAbilityOnDamageEvent& OnDamageEvent() = 0;
virtual FCogInterfaceOnDamageEvent& OnDamageEvent() = 0;
};
Plugins/CogInterfaces/Source/CogInterfaces/Public/CogInterfacesFilteredActor.h → Plugins/CogInterface/Source/CogInterface/Public/CogInterfaceFilteredActor.h
+1 -1
View File
@@ -1,7 +1,7 @@
#pragma once
#include "CoreMinimal.h"
#include "CogInterfacesFilteredActor.generated.h"
#include "CogInterfaceFilteredActor.generated.h"
UINTERFACE(MinimalAPI, Blueprintable)
class UCogInterfacesFilteredActor : public UInterface
Plugins/CogInterface/Source/CogInterface/Public/CogInterfaceModule.h
+17
View File
@@ -0,0 +1,17 @@
#pragma once
#include "CoreMinimal.h"
#include "Modules/ModuleManager.h"
class COGINTERFACE_API FCogInterfaceModule : public IModuleInterface
{
public:
static inline FCogInterfaceModule& Get() { return FModuleManager::LoadModuleChecked<FCogInterfaceModule>("CogInterface"); }
virtual void StartupModule() override;
virtual void ShutdownModule() override;
private:
};
Plugins/CogInterfaces/Source/CogInterfaces/Public/CogInterfacesModule.h
-17
View File
@@ -1,17 +0,0 @@
#pragma once
#include "CoreMinimal.h"
#include "Modules/ModuleManager.h"
class COGINTERFACES_API FCogInterfacesModule : public IModuleInterface
{
public:
static inline FCogInterfacesModule& Get() { return FModuleManager::LoadModuleChecked<FCogInterfacesModule>("CogInterfaces"); }
virtual void StartupModule() override;
virtual void ShutdownModule() override;
private:
};
Source/CogSample/CogSample.Build.cs
+1 -1
View File
@@ -25,7 +25,7 @@ public class CogSample : ModuleRules
PublicDependencyModuleNames.AddRange(new string[]
{
"CogImgui",
"CogInterfaces",
"CogInterface",
"CogWindow",
"CogEngine",
"CogInput",
Source/CogSample/CogSampleCharacter.cpp
+4 -4
View File
@@ -348,8 +348,8 @@ void ACogSampleCharacter::Look(const FInputActionValue& Value)
void ACogSampleCharacter::OnDamageReceived(float ReceivedDamage, float IncomingDamage, AActor* DamageDealer, const FGameplayEffectSpec& EffectSpec)
{
#if USE_COG
FCogInterfacesDamageParams Params;
Params.Type = ECogInterfacesDamageEventType::DamageReceived;
FCogInterfaceDamageParams Params;
Params.Type = ECogInterfaceDamageEventType::DamageReceived;
Params.MitigatedDamage = ReceivedDamage;
Params.IncomingDamage = IncomingDamage;
Params.DamageDealer = DamageDealer;
@@ -362,8 +362,8 @@ void ACogSampleCharacter::OnDamageReceived(float ReceivedDamage, float IncomingD
void ACogSampleCharacter::OnDamageDealt(float ReceivedDamage, float IncomingDamage, AActor* DamageReceiver, const FGameplayEffectSpec& EffectSpec)
{
#if USE_COG
FCogInterfacesDamageParams Params;
Params.Type = ECogInterfacesDamageEventType::DamageDealt;
FCogInterfaceDamageParams Params;
Params.Type = ECogInterfaceDamageEventType::DamageDealt;
Params.MitigatedDamage = ReceivedDamage;
Params.IncomingDamage = IncomingDamage;
Params.DamageDealer = this;
Source/CogSample/CogSampleCharacter.h
+5 -5
View File
@@ -5,8 +5,8 @@
#include "ActiveGameplayEffectHandle.h"
#include "AttributeSet.h"
#include "CogDefines.h"
#include "CogInterfacesDamageActor.h"
#include "CogInterfacesFilteredActor.h"
#include "CogInterfaceDamageActor.h"
#include "CogInterfaceFilteredActor.h"
#include "GameFramework/Character.h"
#include "GameplayAbilitySpecHandle.h"
#include "GameplayTagContainer.h"
@@ -59,7 +59,7 @@ UCLASS(config=Game)
class ACogSampleCharacter : public ACharacter
, public IAbilitySystemInterface
, public ICogInterfacesFilteredActor
, public ICogInterfacesDamageActor
, public ICogInterfaceDamageActor
{
GENERATED_BODY()
@@ -75,7 +75,7 @@ public:
virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override;
virtual void PossessedBy(AController* NewController) override;
virtual FCogAbilityOnDamageEvent& OnDamageEvent() override { return OnDamageEventDelegate; }
virtual FCogInterfaceOnDamageEvent& OnDamageEvent() override { return OnDamageEventDelegate; }
virtual bool IsActorFilteringDebug() const override { return true; }
void OnAcknowledgePossession(APlayerController* InController);
@@ -146,7 +146,7 @@ public:
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Ability)
TArray<TSubclassOf<UGameplayEffect>> Effects;
FCogAbilityOnDamageEvent OnDamageEventDelegate;
FCogInterfaceOnDamageEvent OnDamageEventDelegate;
private: