From 55d47c108a17ade19c61e0fb2c26b34e3385adce Mon Sep 17 00:00:00 2001 From: Arnaud Jamin Date: Wed, 4 Oct 2023 10:18:48 -0400 Subject: [PATCH] fix build --- .../CogEngine/Private/CogEngineWindow_NetEmulation.cpp | 4 +++- .../CogEngine/Public/CogEngineWindow_OutputLog.h | 10 ++++++---- .../Source/CogEngine/Public/CogEngineWindow_Spawns.h | 2 ++ .../Source/CogInput/Private/CogInputWindow_Actions.cpp | 2 +- .../Source/CogInput/Public/CogInputWindow_Actions.h | 8 +++++--- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/Plugins/CogEngine/Source/CogEngine/Private/CogEngineWindow_NetEmulation.cpp b/Plugins/CogEngine/Source/CogEngine/Private/CogEngineWindow_NetEmulation.cpp index 6669f95..f5d2b76 100644 --- a/Plugins/CogEngine/Source/CogEngine/Private/CogEngineWindow_NetEmulation.cpp +++ b/Plugins/CogEngine/Source/CogEngine/Private/CogEngineWindow_NetEmulation.cpp @@ -218,4 +218,6 @@ void UCogEngineWindow_NetEmulation::DrawControls() "The ratio of incoming packets that will be dropped to simulate packet loss"); } -#endif //DO_ENABLE_NET_TEST \ No newline at end of file +#endif //DO_ENABLE_NET_TEST + +} \ No newline at end of file diff --git a/Plugins/CogEngine/Source/CogEngine/Public/CogEngineWindow_OutputLog.h b/Plugins/CogEngine/Source/CogEngine/Public/CogEngineWindow_OutputLog.h index 6fbe8a7..550ffe6 100644 --- a/Plugins/CogEngine/Source/CogEngine/Public/CogEngineWindow_OutputLog.h +++ b/Plugins/CogEngine/Source/CogEngine/Public/CogEngineWindow_OutputLog.h @@ -8,6 +8,7 @@ class UCogEngineWindow_OutputLog; +//-------------------------------------------------------------------------------------------------------------------------- class UCogLogOutputDevice : public FOutputDevice { public: @@ -21,6 +22,7 @@ public: UCogEngineWindow_OutputLog* OutputLog = nullptr; }; +//-------------------------------------------------------------------------------------------------------------------------- UCLASS(Config = Cog) class COGENGINE_API UCogEngineWindow_OutputLog : public UCogWindow { @@ -30,6 +32,10 @@ public: UCogEngineWindow_OutputLog(); + void AddLog(const TCHAR* Message, ELogVerbosity::Type Verbosity, const FName& Category); + + void Clear(); + protected: virtual void RenderHelp() override; @@ -38,10 +44,6 @@ protected: virtual void RenderContent() override; - void Clear(); - - void AddLog(const TCHAR* Message, ELogVerbosity::Type Verbosity, const FName& Category); - private: struct FLineInfo diff --git a/Plugins/CogEngine/Source/CogEngine/Public/CogEngineWindow_Spawns.h b/Plugins/CogEngine/Source/CogEngine/Public/CogEngineWindow_Spawns.h index 2f86a2a..4375e1b 100644 --- a/Plugins/CogEngine/Source/CogEngine/Public/CogEngineWindow_Spawns.h +++ b/Plugins/CogEngine/Source/CogEngine/Public/CogEngineWindow_Spawns.h @@ -20,6 +20,8 @@ class COGENGINE_API UCogEngineWindow_Spawns : public UCogWindow protected: + virtual void RenderHelp(); + virtual void PreRender(ImGuiWindowFlags& WindowFlags) override; virtual void RenderContent() override; diff --git a/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp b/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp index 85d60a3..3f97f87 100644 --- a/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp +++ b/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp @@ -15,7 +15,7 @@ void UCogInputWindow_Actions::RenderHelp() "This window display the current state of each Input Action. " "It can also be used to inject inputs to help debugging. " "The input action are read from a Input Mapping Context defined in '%s' data asset. " - , TCHAR_TO_ANSI(*GetNameSafe(ActionAsset)) + , TCHAR_TO_ANSI(*GetNameSafe(ActionsAsset.Get())) ); } diff --git a/Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Actions.h b/Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Actions.h index 9f07b73..fec9b66 100644 --- a/Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Actions.h +++ b/Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Actions.h @@ -13,9 +13,13 @@ class COGINPUT_API UCogInputWindow_Actions : public UCogWindow { GENERATED_BODY() +public: + + TWeakObjectPtr ActionsAsset; + protected: - void RenderHelp() + void RenderHelp(); virtual void PreRender(ImGuiWindowFlags& WindowFlags) override; @@ -25,8 +29,6 @@ protected: virtual void DrawAxis(const char* Format, const char* ActionName, float CurrentValue, float* InjectValue); - TWeakObjectPtr ActionsAsset; - private: UPROPERTY(Config)