From 362d248866c752e7849f144a270c1f1d070c4192 Mon Sep 17 00:00:00 2001 From: Arnaud Jamin Date: Wed, 12 Feb 2025 15:18:33 -0500 Subject: [PATCH] Cleanup --- Source/CogSample/CogSampleGameInstance.cpp | 13 +++++++++---- Source/CogSample/CogSampleGameInstance.h | 6 +----- Source/CogSample/CogSampleGameState.h | 10 +--------- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/Source/CogSample/CogSampleGameInstance.cpp b/Source/CogSample/CogSampleGameInstance.cpp index 6b3fbbb..60ca8b9 100644 --- a/Source/CogSample/CogSampleGameInstance.cpp +++ b/Source/CogSample/CogSampleGameInstance.cpp @@ -6,21 +6,26 @@ #include "CogAll.h" #include "CogSampleWindow_Team.h" #include "CogSubsystem.h" -#endif +#endif + -//-------------------------------------------------------------------------------------------------------------------------- void UCogSampleGameInstance::Init() { Super::Init(); #if ENABLE_COG + + // Get the cog subsystem if (UCogSubsystem* CogSubSystem = GetSubsystem()) { + // Add all the built-in windows. You copy paste this function code to organize the menu differently. Cog::AddAllWindows(*CogSubSystem); + + // Add a custom window CogSubSystem->AddWindow("Gameplay.Team"); + // Activate Cog CogSubSystem->Activate(); } #endif -} - +} \ No newline at end of file diff --git a/Source/CogSample/CogSampleGameInstance.h b/Source/CogSample/CogSampleGameInstance.h index 60a738c..ff6d779 100644 --- a/Source/CogSample/CogSampleGameInstance.h +++ b/Source/CogSample/CogSampleGameInstance.h @@ -1,15 +1,11 @@ #pragma once -#include "CoreMinimal.h" #include "CogSampleGameInstance.generated.h" -class UCogSubsystem; -class UCogSampleAbilitySystemComponent; - UCLASS() class UCogSampleGameInstance : public UGameInstance { GENERATED_BODY() - virtual void Init() override; + void Init() override; }; diff --git a/Source/CogSample/CogSampleGameState.h b/Source/CogSample/CogSampleGameState.h index dfd0a7e..fa463cd 100644 --- a/Source/CogSample/CogSampleGameState.h +++ b/Source/CogSample/CogSampleGameState.h @@ -30,20 +30,12 @@ private: UPROPERTY() UCogSampleAbilitySystemComponent* AbilitySystemComponent = nullptr; - //--------------------------------------------------------------------------------- - // To make sure it doesn't get garbage collected. - //--------------------------------------------------------------------------------- - UPROPERTY() - TObjectPtr CogWindowManagerRef = nullptr; - protected: UPROPERTY(Replicated) float _ServerFramerateRaw = 0.0f; #if ENABLE_COG - - TObjectPtr CogWindowManager = nullptr; - + float _ClientFramerateSmooth = 0.0f; float _ServerFramerateSmooth = 0.0f;