From 7543b49ef712d4786e11936f1f7225812b7da0ef Mon Sep 17 00:00:00 2001 From: Eduardo Valencia Date: Thu, 15 Feb 2024 18:59:25 -0500 Subject: [PATCH] Updated to 5.3.x, renamed interface function, and more In CogSampleSpawnPredictionComponent.cpp, lines 299 through 302 have return statements of FColor::FColor, these have been updated to a single FColor return statement In CogSampleTargetableInterface.h, the GetTargetLocation function does not compile against Linux. Reason being that it interferes with built in functions that share the same name (notably within the AIController class). This has been changed to GetTargetActorLocation to maintain a similar name. Recommend adding comments when possible. Additionaly, the sample project and the editor have had their IncludeOrderVersion updated to 5.2. This was done to clear the warning listing that 5.1 will be deprecated in the next major version release. The project compiles against Windows and Linux (likely other platforms too, unable to check) Happy to help! :) --- Cog.uproject | 51 +++++++++---------- .../Source/CogDebug/Private/CogDebugGizmo.cpp | 2 +- .../CogEngineWindow_CollisionTester.cpp | 2 +- .../Private/CogEngineWindow_DebugSettings.cpp | 2 +- .../Private/CogEngineWindow_Transform.cpp | 2 +- Source/CogSample.Target.cs | 2 +- Source/CogSample/CogSampleCharacter.cpp | 2 +- Source/CogSample/CogSampleCharacter.h | 2 +- .../CogSampleFunctionLibrary_Gameplay.cpp | 2 +- .../CogSampleSpawnPredictionComponent.cpp | 8 +-- .../CogSample/CogSampleTargetableInterface.h | 2 +- Source/CogSampleEditor.Target.cs | 2 +- 12 files changed, 38 insertions(+), 41 deletions(-) diff --git a/Cog.uproject b/Cog.uproject index d71dfc5..b370cd6 100644 --- a/Cog.uproject +++ b/Cog.uproject @@ -1,29 +1,26 @@ { - "FileVersion": 3, - "EngineAssociation": "5.1", - "Category": "", - "Description": "", - "Modules": - [ - { - "Name": "CogSample", - "Type": "Runtime", - "LoadingPhase": "Default" - } - ], - "Plugins": - [ - { - "Name": "GameplayAbilities", - "Enabled": true - }, - { - "Name": "ModelingToolsEditorMode", - "Enabled": true, - "TargetAllowList": - [ - "Editor" - ] - } - ] + "FileVersion": 3, + "EngineAssociation": "5.3", + "Category": "", + "Description": "", + "Modules": [ + { + "Name": "CogSample", + "Type": "Runtime", + "LoadingPhase": "Default" + } + ], + "Plugins": [ + { + "Name": "GameplayAbilities", + "Enabled": true + }, + { + "Name": "ModelingToolsEditorMode", + "Enabled": true, + "TargetAllowList": [ + "Editor" + ] + } + ] } \ No newline at end of file diff --git a/Plugins/Cog/Source/CogDebug/Private/CogDebugGizmo.cpp b/Plugins/Cog/Source/CogDebug/Private/CogDebugGizmo.cpp index 37cabc7..1d172ed 100644 --- a/Plugins/Cog/Source/CogDebug/Private/CogDebugGizmo.cpp +++ b/Plugins/Cog/Source/CogDebug/Private/CogDebugGizmo.cpp @@ -2,7 +2,7 @@ #include "CogDebug.h" #include "CogDebugDrawHelper.h" -#include "CogImGuiHelper.h" +#include "CogImguiHelper.h" #include "Components/PrimitiveComponent.h" #include "Components/SceneComponent.h" #include "DrawDebugHelpers.h" diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_CollisionTester.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_CollisionTester.cpp index 19fa703..497909e 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_CollisionTester.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_CollisionTester.cpp @@ -1,7 +1,7 @@ #include "CogEngineWindow_CollisionTester.h" #include "CogDebug.h" -#include "CogImGuiHelper.h" +#include "CogImguiHelper.h" #include "CogWindowWidgets.h" #include "Components/PrimitiveComponent.h" #include "Components/SceneComponent.h" diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_DebugSettings.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_DebugSettings.cpp index ac46687..6048f4a 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_DebugSettings.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_DebugSettings.cpp @@ -1,7 +1,7 @@ #include "CogEngineWindow_DebugSettings.h" #include "CogDebug.h" -#include "CogImGuiHelper.h" +#include "CogImguiHelper.h" #include "CogWindowWidgets.h" #include "Engine/CollisionProfile.h" diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Transform.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Transform.cpp index 77aebd0..d611ba0 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Transform.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Transform.cpp @@ -1,7 +1,7 @@ #include "CogEngineWindow_Transform.h" #include "CogDebug.h" -#include "CogImGuiHelper.h" +#include "CogImguiHelper.h" #include "CogWindowWidgets.h" #include "GameFramework/Actor.h" #include "imgui.h" diff --git a/Source/CogSample.Target.cs b/Source/CogSample.Target.cs index 8982f7d..fa43e53 100644 --- a/Source/CogSample.Target.cs +++ b/Source/CogSample.Target.cs @@ -7,7 +7,7 @@ public class CogSampleTarget : TargetRules { Type = TargetType.Game; DefaultBuildSettings = BuildSettingsVersion.V2; - IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_1; + IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_2; ExtraModuleNames.Add("CogSample"); //bUseUnityBuild = false; //bUsePCHFiles = false; diff --git a/Source/CogSample/CogSampleCharacter.cpp b/Source/CogSample/CogSampleCharacter.cpp index e4705c8..408909e 100644 --- a/Source/CogSample/CogSampleCharacter.cpp +++ b/Source/CogSample/CogSampleCharacter.cpp @@ -827,7 +827,7 @@ void ACogSampleCharacter::UpdateActiveAbilitySlots() } //-------------------------------------------------------------------------------------------------------------------------- -FVector ACogSampleCharacter::GetTargetLocation() const +FVector ACogSampleCharacter::GetTargetActorLocation() const { return GetActorLocation(); } diff --git a/Source/CogSample/CogSampleCharacter.h b/Source/CogSample/CogSampleCharacter.h index 86504da..eacc2e8 100644 --- a/Source/CogSample/CogSampleCharacter.h +++ b/Source/CogSample/CogSampleCharacter.h @@ -134,7 +134,7 @@ public: // ICogSampleTargetInterface overrides //---------------------------------------------------------------------------------------------------------------------- - virtual FVector GetTargetLocation() const override; + virtual FVector GetTargetActorLocation() const override; virtual void GetTargetCapsules(TArray& Capsules) const override; diff --git a/Source/CogSample/CogSampleFunctionLibrary_Gameplay.cpp b/Source/CogSample/CogSampleFunctionLibrary_Gameplay.cpp index 66c4046..416e11e 100644 --- a/Source/CogSample/CogSampleFunctionLibrary_Gameplay.cpp +++ b/Source/CogSample/CogSampleFunctionLibrary_Gameplay.cpp @@ -154,7 +154,7 @@ FVector UCogSampleFunctionLibrary_Gameplay::GetActorTargetLocation(const AActor* if (const ICogSampleTargetableInterface* Targetable = Cast(Actor)) { - return Targetable->GetTargetLocation(); + return Targetable->GetTargetActorLocation(); } return Actor->GetActorLocation(); diff --git a/Source/CogSample/CogSampleSpawnPredictionComponent.cpp b/Source/CogSample/CogSampleSpawnPredictionComponent.cpp index 2df7329..63907e6 100644 --- a/Source/CogSample/CogSampleSpawnPredictionComponent.cpp +++ b/Source/CogSample/CogSampleSpawnPredictionComponent.cpp @@ -296,10 +296,10 @@ FColor UCogSampleSpawnPredictionComponent::GetRoleColor() const { switch (Role) { - case ECogSampleSpawnPredictionRole::Server: return FColor::FColor(255, 0, 0, 255); - case ECogSampleSpawnPredictionRole::Predicted: return FColor::FColor(255, 255, 0, 255); - case ECogSampleSpawnPredictionRole::Replicated: return FColor::FColor(128, 128, 0, 255); - case ECogSampleSpawnPredictionRole::Remote: return FColor::FColor(255, 0, 255, 255); + case ECogSampleSpawnPredictionRole::Server: return FColor(255, 0, 0, 255); + case ECogSampleSpawnPredictionRole::Predicted: return FColor(255, 255, 0, 255); + case ECogSampleSpawnPredictionRole::Replicated: return FColor(128, 128, 0, 255); + case ECogSampleSpawnPredictionRole::Remote: return FColor(255, 0, 255, 255); } return FColor(128, 128, 128, 255); diff --git a/Source/CogSample/CogSampleTargetableInterface.h b/Source/CogSample/CogSampleTargetableInterface.h index c361a21..1789925 100644 --- a/Source/CogSample/CogSampleTargetableInterface.h +++ b/Source/CogSample/CogSampleTargetableInterface.h @@ -18,7 +18,7 @@ class ICogSampleTargetableInterface public: - virtual FVector GetTargetLocation() const { return FVector::ZeroVector; } + virtual FVector GetTargetActorLocation() const { return FVector::ZeroVector; } virtual void GetTargetCapsules(TArray& Capsules) const { } }; diff --git a/Source/CogSampleEditor.Target.cs b/Source/CogSampleEditor.Target.cs index 2c08418..933ff26 100644 --- a/Source/CogSampleEditor.Target.cs +++ b/Source/CogSampleEditor.Target.cs @@ -7,7 +7,7 @@ public class CogSampleEditorTarget : TargetRules { Type = TargetType.Editor; DefaultBuildSettings = BuildSettingsVersion.V2; - IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_1; + IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_2; ExtraModuleNames.Add("CogSample"); } }