From 1bf26e3ecbe4f7cfa0c43b5b33a9cb9880c767b9 Mon Sep 17 00:00:00 2001 From: Ed_ Date: Tue, 9 Apr 2024 15:28:56 -0400 Subject: [PATCH] Updates for compilation in 5.4 as an engine plugin --- .../CogCommon/Public/CogCommonLogCategory.h | 2 +- .../Cog/Source/CogDebug/Private/CogDebug.cpp | 2 - .../CogDebug/Private/CogDebugDrawHelper.cpp | 1 + .../Source/CogDebug/Private/CogDebugLog.cpp | 5 -- .../CogDebug/Public/CogDebugDrawBlueprint.h | 34 ++++++------- .../CogDebug/Public/CogDebugLogBlueprint.h | 4 +- .../CogDebug/Public/CogDebugPlotBlueprint.h | 2 +- .../Private/CogEngineCollisionTester.cpp | 1 + .../Public/CogEngineCollisionTester.h | 44 ++++++++--------- .../CogEngine/Public/CogEngineDataAsset.h | 10 ++-- .../CogWindow/Private/CogWindowManager.cpp | 2 +- .../CogAbility/Public/CogAbilityDataAsset.h | 48 +++++++++---------- .../CogInput/Public/CogInputDataAsset.h | 2 +- 13 files changed, 76 insertions(+), 81 deletions(-) diff --git a/Plugins/Cog/Source/CogCommon/Public/CogCommonLogCategory.h b/Plugins/Cog/Source/CogCommon/Public/CogCommonLogCategory.h index e9d8d7c..5494be6 100644 --- a/Plugins/Cog/Source/CogCommon/Public/CogCommonLogCategory.h +++ b/Plugins/Cog/Source/CogCommon/Public/CogCommonLogCategory.h @@ -11,7 +11,7 @@ struct COGCOMMON_API FCogLogCategory FCogLogCategory() {} - UPROPERTY(EditAnywhere, BlueprintReadWrite) + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="Cog") FName Name; FString GetName() const { return Name.ToString(); } diff --git a/Plugins/Cog/Source/CogDebug/Private/CogDebug.cpp b/Plugins/Cog/Source/CogDebug/Private/CogDebug.cpp index a77f1fa..7bced1e 100644 --- a/Plugins/Cog/Source/CogDebug/Private/CogDebug.cpp +++ b/Plugins/Cog/Source/CogDebug/Private/CogDebug.cpp @@ -81,8 +81,6 @@ bool FCogDebug::IsDebugActiveForObject_Internal(const UObject* WorldContextObjec Outer = NewOuter; } - - return true; } //-------------------------------------------------------------------------------------------------------------------------- diff --git a/Plugins/Cog/Source/CogDebug/Private/CogDebugDrawHelper.cpp b/Plugins/Cog/Source/CogDebug/Private/CogDebugDrawHelper.cpp index b57651c..0a5fad6 100644 --- a/Plugins/Cog/Source/CogDebug/Private/CogDebugDrawHelper.cpp +++ b/Plugins/Cog/Source/CogDebug/Private/CogDebugDrawHelper.cpp @@ -5,6 +5,7 @@ #include "Engine/Engine.h" #include "DrawDebugHelpers.h" #include "Components/BoxComponent.h" +#include "Engine/OverlapResult.h" namespace { diff --git a/Plugins/Cog/Source/CogDebug/Private/CogDebugLog.cpp b/Plugins/Cog/Source/CogDebug/Private/CogDebugLog.cpp index 26c0199..602f6ca 100644 --- a/Plugins/Cog/Source/CogDebug/Private/CogDebugLog.cpp +++ b/Plugins/Cog/Source/CogDebug/Private/CogDebugLog.cpp @@ -131,11 +131,6 @@ FLogCategoryBase* FCogDebugLog::FindLogCategory(const FName CategoryName) { return LogCategoryInfo->LogCategory; } - else - { - return nullptr; - } - return nullptr; } diff --git a/Plugins/Cog/Source/CogDebug/Public/CogDebugDrawBlueprint.h b/Plugins/Cog/Source/CogDebug/Public/CogDebugDrawBlueprint.h index a2adf59..3c28f4d 100644 --- a/Plugins/Cog/Source/CogDebug/Public/CogDebugDrawBlueprint.h +++ b/Plugins/Cog/Source/CogDebug/Public/CogDebugDrawBlueprint.h @@ -12,55 +12,55 @@ class COGDEBUG_API UCogDebugDrawBlueprint : public UBlueprintFunctionLibrary public: - UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject")) + UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject"), Category="Cog") static void DebugDrawString(const UObject* WorldContextObject, FCogLogCategory LogCategory, const FString& Text, const FVector Location, const FLinearColor Color, bool Persistent); - UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject")) + UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject"), Category="Cog") static void DebugDrawPoint(const UObject* WorldContextObject, FCogLogCategory LogCategory, const FVector Location, float size, const FLinearColor Color, bool Persistent, uint8 DepthPriority); - UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject")) + UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject"), Category="Cog") static void DebugDrawSegment(const UObject* WorldContextObject, FCogLogCategory LogCategory, const FVector SegmentStart, const FVector SegmentEnd, const FLinearColor Color, bool Persistent, uint8 DepthPriority); - UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject")) + UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject"), Category="Cog") static void DebugDrawArrow(const UObject* WorldContextObject, FCogLogCategory LogCategory, const FVector SegmentStart, const FVector SegmentEnd, const FLinearColor Color, bool Persistent, uint8 DepthPriority); - UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject")) + UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject"), Category="Cog") static void DebugDrawAxis(const UObject* WorldContextObject, FCogLogCategory LogCategory, const FVector Location, const FRotator Rotation, float Scale, bool Persistent, uint8 DepthPriority); - UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject")) + UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject"), Category="Cog") static void DebugDrawSphere(const UObject* WorldContextObject, FCogLogCategory LogCategory, const FVector Location, float Radius, const FLinearColor Color, bool Persistent, uint8 DepthPriority); - UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject")) + UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject"), Category="Cog") static void DebugDrawBox(const UObject* WorldContextObject, FCogLogCategory LogCategory, const FVector Center, const FVector Extent, const FQuat Rotation, const FLinearColor Color, bool Persistent, uint8 DepthPriority); - UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject")) + UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject"), Category="Cog") static void DebugDrawSolidBox(const UObject* WorldContextObject, FCogLogCategory LogCategory, const FVector Center, const FVector Extent, const FQuat Rotation, const FLinearColor Color, bool Persistent, uint8 DepthPriority); - UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject")) + UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject"), Category="Cog") static void DebugDrawCapsule(const UObject* WorldContextObject, FCogLogCategory LogCategory, const FVector Center, const float HalfHeight, const float Radius, const FQuat Rotation, const FLinearColor Color, bool Persistent, uint8 DepthPriority); - UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject")) + UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject"), Category="Cog") static void DebugDrawCircle(const UObject* WorldContextObject, FCogLogCategory LogCategory, const FMatrix& Matrix, float Radius, const FLinearColor Color, bool Persistent, uint8 DepthPriority); - UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject")) + UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject"), Category="Cog") static void DebugDrawCircleArc(const UObject* WorldContextObject, FCogLogCategory LogCategory, const FMatrix& Matrix, float InnerRadius, float OuterRadius, float Angle, const FLinearColor Color, bool Persistent, uint8 DepthPriority); - UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject")) + UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject"), Category="Cog") static void DebugDrawPoints(const UObject* WorldContextObject, FCogLogCategory LogCategory, const TArray& Points, float Radius, const FLinearColor StartColor, const FLinearColor EndColor, bool Persistent, uint8 DepthPriority); - UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject")) + UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject"), Category="Cog") static void DebugDrawPath(const UObject* WorldContextObject, FCogLogCategory LogCategory, const TArray& Points, float PointSize, const FLinearColor StartColor, const FLinearColor EndColor, bool Persistent, uint8 DepthPriority); - UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject")) + UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject"), Category="Cog") static void DebugDrawString2D(const UObject* WorldContextObject, FCogLogCategory LogCategory, const FString& Text, const FVector2D Location, const FLinearColor Color, bool Persistent); - UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject")) + UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject"), Category="Cog") static void DebugDrawSegment2D(const UObject* WorldContextObject, FCogLogCategory LogCategory, const FVector2D SegmentStart, const FVector2D SegmentEnd, const FLinearColor Color, bool Persistent); - UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject")) + UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject"), Category="Cog") static void DebugDrawCircle2D(const UObject* WorldContextObject, FCogLogCategory LogCategory, const FVector2D Location, float Radius, const FLinearColor Color, bool Persistent); - UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject")) + UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject"), Category="Cog") static void DebugDrawRect2D(const UObject* WorldContextObject, FCogLogCategory LogCategory, const FVector2D Min, const FVector2D Max, const FLinearColor Color, bool Persistent); }; \ No newline at end of file diff --git a/Plugins/Cog/Source/CogDebug/Public/CogDebugLogBlueprint.h b/Plugins/Cog/Source/CogDebug/Public/CogDebugLogBlueprint.h index 0f1a422..27e3c27 100644 --- a/Plugins/Cog/Source/CogDebug/Public/CogDebugLogBlueprint.h +++ b/Plugins/Cog/Source/CogDebug/Public/CogDebugLogBlueprint.h @@ -26,10 +26,10 @@ class COGDEBUG_API UCogDebugLogBlueprint : public UBlueprintFunctionLibrary public: - UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject")) + UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly, WorldContext = "WorldContextObject"), Category="Cog") static void Log(const UObject* WorldContextObject, FCogLogCategory LogCategory, ECogLogVerbosity Verbosity = ECogLogVerbosity::Verbose, const FString& Text = FString("")); - UFUNCTION(BlueprintPure, meta = (DevelopmentOnly, WorldContext = "WorldContextObject")) + UFUNCTION(BlueprintPure, meta = (DevelopmentOnly, WorldContext = "WorldContextObject"), Category="Cog") static bool IsLogActive(const UObject* WorldContextObject, const FCogLogCategory LogCategory); }; \ No newline at end of file diff --git a/Plugins/Cog/Source/CogDebug/Public/CogDebugPlotBlueprint.h b/Plugins/Cog/Source/CogDebug/Public/CogDebugPlotBlueprint.h index 07cc005..f6a6629 100644 --- a/Plugins/Cog/Source/CogDebug/Public/CogDebugPlotBlueprint.h +++ b/Plugins/Cog/Source/CogDebug/Public/CogDebugPlotBlueprint.h @@ -11,6 +11,6 @@ class COGDEBUG_API UCogDebugPlotBlueprint : public UBlueprintFunctionLibrary public: - UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly)) + UFUNCTION(BlueprintCallable, meta = (DevelopmentOnly), Category="Cog") static void Plot(const UObject* Owner, const FName Name, const float Value); }; \ No newline at end of file diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineCollisionTester.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineCollisionTester.cpp index 98ce72e..c81c475 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineCollisionTester.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineCollisionTester.cpp @@ -5,6 +5,7 @@ #include "Components/PrimitiveComponent.h" #include "Components/SceneComponent.h" #include "Engine/World.h" +#include "Engine/OverlapResult.h" //-------------------------------------------------------------------------------------------------------------------------- ACogEngineCollisionTester::ACogEngineCollisionTester(const FObjectInitializer& ObjectInitializer) diff --git a/Plugins/Cog/Source/CogEngine/Public/CogEngineCollisionTester.h b/Plugins/Cog/Source/CogEngine/Public/CogEngineCollisionTester.h index b9ea8eb..4568920 100644 --- a/Plugins/Cog/Source/CogEngine/Public/CogEngineCollisionTester.h +++ b/Plugins/Cog/Source/CogEngine/Public/CogEngineCollisionTester.h @@ -58,75 +58,75 @@ public: void Query() const; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") bool TickInEditor = false; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") ECogEngine_CollisionQueryType Type = ECogEngine_CollisionQueryType::LineTrace; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") ECogEngine_CollisionQueryMode Mode = ECogEngine_CollisionQueryMode::Multi; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") ECogEngine_CollisionQueryBy By = ECogEngine_CollisionQueryBy::Channel; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") ECogEngine_CollisionQueryShape Shape = ECogEngine_CollisionQueryShape::Sphere; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") bool TraceComplex = false; UPROPERTY() int32 ObjectTypesToQuery = 0; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") TEnumAsByte Channel = ECC_WorldStatic; UPROPERTY() int32 ProfileIndex = 0; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") FVector ShapeExtent = FVector(100, 100, 100); - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") bool DrawHitLocations = true; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") bool DrawHitImpactPoints = true; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") bool DrawHitShapes = true; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") bool DrawHitNormals = true; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") bool DrawHitImpactNormals = true; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") bool DrawHitPrimitives = true; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") bool DrawHitActorsNames = false; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") float HitPointSize = 5.0f; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") FColor NoHitColor = FColor::Red; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") FColor HitColor = FColor::Green; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") FColor NormalColor = FColor::Yellow; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") FColor ImpactNormalColor = FColor::Cyan; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") USceneComponent* StartComponent = nullptr; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") USceneComponent* EndComponent = nullptr; }; diff --git a/Plugins/Cog/Source/CogEngine/Public/CogEngineDataAsset.h b/Plugins/Cog/Source/CogEngine/Public/CogEngineDataAsset.h index 8462ebd..142a505 100644 --- a/Plugins/Cog/Source/CogEngine/Public/CogEngineDataAsset.h +++ b/Plugins/Cog/Source/CogEngine/Public/CogEngineDataAsset.h @@ -11,10 +11,10 @@ struct COGENGINE_API FCogEngineSpawnEntry { GENERATED_BODY() - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") TSubclassOf Class; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") TObjectPtr Asset = nullptr; }; @@ -24,13 +24,13 @@ struct COGENGINE_API FCogEngineSpawnGroup { GENERATED_BODY() - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") FString Name; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") FLinearColor Color = FLinearColor(0.5f, 0.5f, 0.5f, 1.0f); - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") TArray Spawns; }; diff --git a/Plugins/Cog/Source/CogWindow/Private/CogWindowManager.cpp b/Plugins/Cog/Source/CogWindow/Private/CogWindowManager.cpp index 1deed0c..902a802 100644 --- a/Plugins/Cog/Source/CogWindow/Private/CogWindowManager.cpp +++ b/Plugins/Cog/Source/CogWindow/Private/CogWindowManager.cpp @@ -163,7 +163,7 @@ void UCogWindowManager::Tick(float DeltaTime) void UCogWindowManager::Render(float DeltaTime) { ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0, 0, 0, 0)); - ImGui::DockSpaceOverViewport(0, ImGuiDockNodeFlags_PassthruCentralNode | ImGuiDockNodeFlags_NoDockingInCentralNode | ImGuiDockNodeFlags_AutoHideTabBar); + ImGui::DockSpaceOverViewport(0, ImGuiDockNodeFlags_PassthruCentralNode | ImGuiDockNodeFlags_NoDockingOverCentralNode | ImGuiDockNodeFlags_AutoHideTabBar); ImGui::PopStyleColor(1); diff --git a/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityDataAsset.h b/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityDataAsset.h index 56a96dc..42d6aee 100644 --- a/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityDataAsset.h +++ b/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityDataAsset.h @@ -14,10 +14,10 @@ struct COGABILITY_API FCogAbilityCheat { GENERATED_BODY() - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") FString Name; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") TSubclassOf Effect; }; @@ -27,25 +27,25 @@ struct COGABILITY_API FCogAbilityPool { GENERATED_BODY() - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") FString Name; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") FGameplayAttribute Value; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") FGameplayAttribute Min; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") FGameplayAttribute Max; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") FGameplayAttribute Regen; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") FLinearColor Color = FLinearColor(0.5f, 0.5f, 0.5f, 1.0f); - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") FLinearColor BackColor = FLinearColor(0.15, 0.15, 0.15, 1.0f); }; @@ -56,16 +56,16 @@ struct FCogAbilityTweak { GENERATED_BODY() - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") FName Name; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") TSubclassOf Effect; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") float Multiplier = 0.01f; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") float AddPostMultiplier = 1.0f; }; @@ -75,22 +75,22 @@ struct FCogAbilityTweakCategory { GENERATED_BODY() - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") FString Name; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") FGameplayTag Id; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") TSubclassOf ActorClass; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") FGameplayTagContainer RequiredTags; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") FGameplayTagContainer IgnoredTags; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") FLinearColor Color = FLinearColor::White; }; @@ -100,13 +100,13 @@ struct FCogAbilityTweakProfileValue { GENERATED_BODY() - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") TSubclassOf Effect; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") FGameplayTag CategoryId; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") float Value = 0.0f; }; @@ -116,10 +116,10 @@ struct FCogAbilityTweakProfile { GENERATED_BODY() - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") FName Name; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") TArray Tweaks; }; diff --git a/Plugins/CogInput/Source/CogInput/Public/CogInputDataAsset.h b/Plugins/CogInput/Source/CogInput/Public/CogInputDataAsset.h index e7aecfd..bceb2a4 100644 --- a/Plugins/CogInput/Source/CogInput/Public/CogInputDataAsset.h +++ b/Plugins/CogInput/Source/CogInput/Public/CogInputDataAsset.h @@ -15,6 +15,6 @@ class COGINPUT_API UCogInputDataAsset : public UPrimaryDataAsset public: UCogInputDataAsset() {} - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, Category="Cog") TArray> MappingContexts; };