From d5fd488b6a7420a88d966c1caa07b4c6fe06fdd7 Mon Sep 17 00:00:00 2001 From: Arnaud Jamin Date: Sat, 9 Dec 2023 16:58:32 -0500 Subject: [PATCH] Formating sort headers and remove tabs --- .../CogEngine/Private/CogEngineReplicator.cpp | 8 ++++---- .../Private/CogEngineWindow_Collisions.cpp | 6 +++--- .../Private/CogEngineWindow_CommandBindings.cpp | 2 +- .../Private/CogEngineWindow_NetEmulation.cpp | 4 ++-- .../CogEngine/Private/CogEngineWindow_Plots.cpp | 4 ++-- .../Private/CogEngineWindow_Selection.cpp | 4 ++-- .../CogEngine/Private/CogEngineWindow_Skeleton.cpp | 4 ++-- .../CogEngine/Private/CogEngineWindow_Stats.cpp | 6 +++--- .../Source/CogImgui/Private/CogImguiContext.cpp | 6 +++--- .../Cog/Source/CogImgui/Private/CogImguiHelper.cpp | 6 +++--- .../CogImgui/Private/CogImguiInputHelper.cpp | 10 +++++----- .../Cog/Source/CogImgui/Private/CogImguiWidget.cpp | 4 ++-- .../Cog/Source/CogImgui/Public/CogImguiContext.h | 4 ++-- .../Source/CogImgui/Public/CogImguiInputHelper.h | 14 +++++++------- .../Source/CogWindow/Private/CogWindowManager.cpp | 4 ++-- Plugins/Cog/Source/CogWindow/Public/CogWindow.h | 4 ++-- .../Cog/Source/CogWindow/Public/CogWindowHelper.h | 4 ++-- .../Cog/Source/CogWindow/Public/CogWindowWidgets.h | 6 +++--- .../CogAbility/Private/CogAbilityReplicator.cpp | 4 ++-- .../Private/CogAbilityWindow_Abilities.cpp | 8 ++++---- .../CogInput/Private/CogInputWindow_Actions.cpp | 2 +- .../CogInput/Private/CogInputWindow_Gamepad.cpp | 2 +- .../CogInput/Public/CogInputWindow_Gamepad.h | 4 ++-- 23 files changed, 60 insertions(+), 60 deletions(-) diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineReplicator.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineReplicator.cpp index 8552fc6..fc84325 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineReplicator.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineReplicator.cpp @@ -3,14 +3,14 @@ #include "CogCommon.h" #include "CogCommonPossessorInterface.h" #include "CogEngineDataAsset.h" +#include "Engine/EngineTypes.h" +#include "Engine/World.h" +#include "EngineUtils.h" +#include "GameFramework/Pawn.h" #include "GameFramework/PlayerController.h" #include "GameFramework/WorldSettings.h" -#include "EngineUtils.h" #include "Net/Core/PushModel/PushModel.h" #include "Net/UnrealNetwork.h" -#include "GameFramework/Pawn.h" -#include "Engine/World.h" -#include "Engine/EngineTypes.h" DEFINE_LOG_CATEGORY(LogCogEngine); diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Collisions.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Collisions.cpp index b4482b0..822006c 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Collisions.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Collisions.cpp @@ -10,11 +10,11 @@ #include "Components/PrimitiveComponent.h" #include "Components/SceneComponent.h" #include "Components/SphereComponent.h" +#include "DrawDebugHelpers.h" +#include "Engine/World.h" +#include "GameFramework/Pawn.h" #include "imgui.h" #include "Kismet/GameplayStatics.h" -#include "DrawDebugHelpers.h" -#include "GameFramework/Pawn.h" -#include "Engine/World.h" //-------------------------------------------------------------------------------------------------------------------------- diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_CommandBindings.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_CommandBindings.cpp index 3d88bd9..91216a3 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_CommandBindings.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_CommandBindings.cpp @@ -2,9 +2,9 @@ #include "CogWindowManager.h" #include "CogWindowWidgets.h" +#include "GameFramework/PlayerController.h" #include "GameFramework/PlayerInput.h" #include "imgui.h" -#include "GameFramework/PlayerController.h" //-------------------------------------------------------------------------------------------------------------------------- void FCogEngineWindow_CommandBindings::RenderHelp() diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_NetEmulation.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_NetEmulation.cpp index ab19b2f..3b8f4c7 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_NetEmulation.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_NetEmulation.cpp @@ -3,12 +3,12 @@ #include "CogEngineWindow_Stats.h" #include "CogWindowWidgets.h" #include "Engine/Engine.h" -#include "Engine/NetDriver.h" #include "Engine/NetConnection.h" +#include "Engine/NetDriver.h" #include "Engine/World.h" -#include "GameFramework/PlayerState.h" #include "GameFramework/Controller.h" #include "GameFramework/PlayerController.h" +#include "GameFramework/PlayerState.h" //-------------------------------------------------------------------------------------------------------------------------- void FCogEngineWindow_NetEmulation::RenderHelp() diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Plots.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Plots.cpp index 87f32da..2db6f41 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Plots.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Plots.cpp @@ -1,12 +1,12 @@ #include "CogEngineWindow_Plots.h" -#include "CogImguiHelper.h" #include "CogDebugPlot.h" +#include "CogImguiHelper.h" #include "CogWindowWidgets.h" +#include "Engine/World.h" #include "imgui.h" #include "implot_internal.h" #include "Kismet/GameplayStatics.h" -#include "Engine/World.h" //-------------------------------------------------------------------------------------------------------------------------- void FCogEngineWindow_Plots::Initialize() diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Selection.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Selection.cpp index 1da2093..61f8874 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Selection.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Selection.cpp @@ -3,17 +3,17 @@ #include "CogDebugDraw.h" #include "CogDebugSettings.h" #include "CogEngineReplicator.h" -#include "CogImguiModule.h" #include "CogImguiHelper.h" #include "CogImguiInputHelper.h" +#include "CogImguiModule.h" #include "CogWindowManager.h" #include "CogWindowWidgets.h" +#include "Components/PrimitiveComponent.h" #include "EngineUtils.h" #include "GameFramework/Character.h" #include "HAL/IConsoleManager.h" #include "imgui.h" #include "Kismet/GameplayStatics.h" -#include "Components/PrimitiveComponent.h" FString FCogEngineWindow_Selection::ToggleSelectionModeCommand = TEXT("Cog.ToggleSelectionMode"); diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Skeleton.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Skeleton.cpp index dd31e7a..c5d7854 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Skeleton.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Skeleton.cpp @@ -4,10 +4,10 @@ #include "CogWindowWidgets.h" #include "Components/LineBatchComponent.h" #include "Components/SkeletalMeshComponent.h" -#include "Engine/SkeletalMesh.h" -#include "imgui_internal.h" #include "DrawDebugHelpers.h" +#include "Engine/SkeletalMesh.h" #include "Engine/World.h" +#include "imgui_internal.h" //-------------------------------------------------------------------------------------------------------------------------- void FCogEngineWindow_Skeleton::Initialize() diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Stats.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Stats.cpp index 2928a23..45ee789 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Stats.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Stats.cpp @@ -2,12 +2,12 @@ #include "CogWindowWidgets.h" #include "Engine/Engine.h" -#include "Engine/NetDriver.h" #include "Engine/NetConnection.h" -#include "GameFramework/PlayerState.h" -#include "Net/NetPing.h" +#include "Engine/NetDriver.h" #include "GameFramework/Controller.h" #include "GameFramework/PlayerController.h" +#include "GameFramework/PlayerState.h" +#include "Net/NetPing.h" ImVec4 StatRedColor(1.0f, 0.4f, 0.3f, 1.0f); ImVec4 StatOrangeColor(1.0f, 0.7f, 0.4f, 1.0f); diff --git a/Plugins/Cog/Source/CogImgui/Private/CogImguiContext.cpp b/Plugins/Cog/Source/CogImgui/Private/CogImguiContext.cpp index ab75a22..c9bfff9 100644 --- a/Plugins/Cog/Source/CogImgui/Private/CogImguiContext.cpp +++ b/Plugins/Cog/Source/CogImgui/Private/CogImguiContext.cpp @@ -6,7 +6,10 @@ #include "CogImGuiInputProcessor.h" #include "CogImguiWidget.h" #include "Engine/Console.h" +#include "Engine/Engine.h" +#include "Engine/GameViewportClient.h" #include "Engine/LocalPlayer.h" +#include "Engine/World.h" #include "Framework/Application/SlateApplication.h" #include "Framework/Application/SlateUser.h" #include "GameFramework/PlayerController.h" @@ -17,9 +20,6 @@ #include "TextureResource.h" #include "Widgets/SViewport.h" #include "Widgets/SWindow.h" -#include "Engine/Engine.h" -#include "Engine/GameViewportClient.h" -#include "Engine/World.h" static UPlayerInput* GetPlayerInput(const UWorld* World); diff --git a/Plugins/Cog/Source/CogImgui/Private/CogImguiHelper.cpp b/Plugins/Cog/Source/CogImgui/Private/CogImguiHelper.cpp index 5e5b9af..89b7a10 100644 --- a/Plugins/Cog/Source/CogImgui/Private/CogImguiHelper.cpp +++ b/Plugins/Cog/Source/CogImgui/Private/CogImguiHelper.cpp @@ -1,9 +1,9 @@ #include "CogImguiHelper.h" -#include "InputCoreTypes.h" -#include "imgui_internal.h" -#include "Misc/Paths.h" #include "GenericPlatform/GenericPlatformFile.h" +#include "imgui_internal.h" +#include "InputCoreTypes.h" +#include "Misc/Paths.h" DEFINE_LOG_CATEGORY(LogCogImGui); diff --git a/Plugins/Cog/Source/CogImgui/Private/CogImguiInputHelper.cpp b/Plugins/Cog/Source/CogImgui/Private/CogImguiInputHelper.cpp index dc4c94b..5338968 100644 --- a/Plugins/Cog/Source/CogImgui/Private/CogImguiInputHelper.cpp +++ b/Plugins/Cog/Source/CogImgui/Private/CogImguiInputHelper.cpp @@ -1,23 +1,23 @@ #include "CogImguiInputHelper.h" #include "CogImGuiInputProcessor.h" +#include "CogImguiKeyInfo.h" #include "CogImguiModule.h" +#include "Engine/World.h" +#include "Framework/Application/SlateApplication.h" #include "Framework/Commands/UICommandInfo.h" #include "GameFramework/GameUserSettings.h" #include "GameFramework/InputSettings.h" #include "GameFramework/PlayerController.h" #include "GameFramework/PlayerInput.h" +#include "GenericPlatform/GenericApplication.h" #include "imgui_internal.h" +#include "Input/Events.h" #include "InputCoreTypes.h" #if WITH_EDITOR #include "Kismet2/DebuggerCommands.h" #endif //WITH_EDITOR -#include "Engine/World.h" -#include "Input/Events.h" -#include "CogImguiKeyInfo.h" -#include "Framework/Application/SlateApplication.h" -#include "GenericPlatform/GenericApplication.h" //-------------------------------------------------------------------------------------------------------------------------- APlayerController* FCogImguiInputHelper::GetFirstLocalPlayerController(const UWorld& World) diff --git a/Plugins/Cog/Source/CogImgui/Private/CogImguiWidget.cpp b/Plugins/Cog/Source/CogImgui/Private/CogImguiWidget.cpp index 0370cf4..6d1f499 100644 --- a/Plugins/Cog/Source/CogImgui/Private/CogImguiWidget.cpp +++ b/Plugins/Cog/Source/CogImgui/Private/CogImguiWidget.cpp @@ -1,12 +1,12 @@ #include "CogImguiWidget.h" +#include "CogImguiContext.h" #include "CogImguiInputHelper.h" #include "CogImguiModule.h" #include "CogImguiWidget.h" -#include "CogImguiContext.h" +#include "Engine/GameViewportClient.h" #include "imgui.h" #include "SlateOptMacros.h" -#include "Engine/GameViewportClient.h" #include "Widgets/SWindow.h" //-------------------------------------------------------------------------------------------------------------------------- diff --git a/Plugins/Cog/Source/CogImgui/Public/CogImguiContext.h b/Plugins/Cog/Source/CogImgui/Public/CogImguiContext.h index 677a465..ade8b27 100644 --- a/Plugins/Cog/Source/CogImgui/Public/CogImguiContext.h +++ b/Plugins/Cog/Source/CogImgui/Public/CogImguiContext.h @@ -10,12 +10,12 @@ class FCogImguiContext; class IInputProcessor; class SCogImguiWidget; class SCogImguiWidget; +class SWidget; class SWindow; class UGameViewportClient; +class ULocalPlayer; struct FDisplayMetrics; struct ImPlotContext; -class SWidget; -class ULocalPlayer; struct COGIMGUI_API FImGuiViewportData { diff --git a/Plugins/Cog/Source/CogImgui/Public/CogImguiInputHelper.h b/Plugins/Cog/Source/CogImgui/Public/CogImguiInputHelper.h index ae57bca..6fcb468 100644 --- a/Plugins/Cog/Source/CogImgui/Public/CogImguiInputHelper.h +++ b/Plugins/Cog/Source/CogImgui/Public/CogImguiInputHelper.h @@ -4,15 +4,15 @@ #include "imgui.h" #include "GenericPlatform/ICursor.h" -class UPlayerInput; -struct FCogImGuiKeyInfo; -struct FKeyBind; -class UWorld; -struct FCogImGuiKeyInfo; -struct FKeyEvent; class APlayerController; -struct FKey; +class UPlayerInput; +class UWorld; enum class ECheckBoxState : uint8; +struct FCogImGuiKeyInfo; +struct FCogImGuiKeyInfo; +struct FKey; +struct FKeyBind; +struct FKeyEvent; class COGIMGUI_API FCogImguiInputHelper { diff --git a/Plugins/Cog/Source/CogWindow/Private/CogWindowManager.cpp b/Plugins/Cog/Source/CogWindow/Private/CogWindowManager.cpp index 9ddfffb..ed66664 100644 --- a/Plugins/Cog/Source/CogWindow/Private/CogWindowManager.cpp +++ b/Plugins/Cog/Source/CogWindow/Private/CogWindowManager.cpp @@ -575,7 +575,7 @@ void UCogWindowManager::SettingsHandler_ReadLine(ImGuiContext* Context, ImGuiSet #if PLATFORM_WINDOWS || PLATFORM_MICROSOFT if (sscanf_s(Line, "0x%08X", &Id) == 1) #else - if (sscanf(Line, "0x%08X", &Id) == 1) + if (sscanf(Line, "0x%08X", &Id) == 1) #endif { UCogWindowManager* Manager = (UCogWindowManager*)Handler->UserData; @@ -592,7 +592,7 @@ void UCogWindowManager::SettingsHandler_ReadLine(ImGuiContext* Context, ImGuiSet #if PLATFORM_WINDOWS || PLATFORM_MICROSOFT if (sscanf_s(Line, "0x%08X %d", &Id, &Visible) == 2) #else - if (sscanf(Line, "0x%08X %d", &Id, &Visible) == 2) + if (sscanf(Line, "0x%08X %d", &Id, &Visible) == 2) #endif { UCogWindowManager* Manager = (UCogWindowManager*)Handler->UserData; diff --git a/Plugins/Cog/Source/CogWindow/Public/CogWindow.h b/Plugins/Cog/Source/CogWindow/Public/CogWindow.h index 397b759..ac51da8 100644 --- a/Plugins/Cog/Source/CogWindow/Public/CogWindow.h +++ b/Plugins/Cog/Source/CogWindow/Public/CogWindow.h @@ -6,13 +6,13 @@ #include "UObject/ReflectedTypeAccessors.h" #include "UObject/WeakObjectPtrTemplates.h" +class AActor; class APawn; class APlayerController; class UCogWindowConfig; class UCogWindowManager; -class UWorld; -class AActor; class ULocalPlayer; +class UWorld; class COGWINDOW_API FCogWindow { diff --git a/Plugins/Cog/Source/CogWindow/Public/CogWindowHelper.h b/Plugins/Cog/Source/CogWindow/Public/CogWindowHelper.h index 48b78b8..3e14f7e 100644 --- a/Plugins/Cog/Source/CogWindow/Public/CogWindowHelper.h +++ b/Plugins/Cog/Source/CogWindow/Public/CogWindowHelper.h @@ -1,9 +1,9 @@ #pragma once -#include "CoreMinimal.h" +#include "AssetRegistry/AssetData.h" #include "AssetRegistry/AssetRegistryModule.h" #include "AssetRegistry/IAssetRegistry.h" -#include "AssetRegistry/AssetData.h" +#include "CoreMinimal.h" #include "Templates/SubclassOf.h" diff --git a/Plugins/Cog/Source/CogWindow/Public/CogWindowWidgets.h b/Plugins/Cog/Source/CogWindow/Public/CogWindowWidgets.h index 696f9d8..54995e0 100644 --- a/Plugins/Cog/Source/CogWindow/Public/CogWindowWidgets.h +++ b/Plugins/Cog/Source/CogWindow/Public/CogWindowWidgets.h @@ -4,13 +4,13 @@ #include "imgui.h" #include "UObject/ReflectedTypeAccessors.h" -class UEnum; class FEnumProperty; +class UEnum; +class UObject; +enum class ECheckBoxState : uint8; struct FCogImGuiKeyInfo; struct FKeyBind; -class UObject; struct FKeyBind; -enum class ECheckBoxState : uint8; class COGWINDOW_API FCogWindowWidgets { diff --git a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityReplicator.cpp b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityReplicator.cpp index 498ee65..d1db8ee 100644 --- a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityReplicator.cpp +++ b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityReplicator.cpp @@ -5,12 +5,12 @@ #include "CogAbilityDataAsset.h" #include "CogWindowHelper.h" #include "Components/SceneComponent.h" +#include "Engine/World.h" #include "EngineUtils.h" +#include "GameFramework/PlayerController.h" #include "GameplayEffect.h" #include "Net/Core/PushModel/PushModel.h" #include "Net/UnrealNetwork.h" -#include "GameFramework/PlayerController.h" -#include "Engine/World.h" //-------------------------------------------------------------------------------------------------------------------------- ACogAbilityReplicator* ACogAbilityReplicator::Spawn(APlayerController* Controller) diff --git a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Abilities.cpp b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Abilities.cpp index 554fc6a..5cc4bb8 100644 --- a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Abilities.cpp +++ b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Abilities.cpp @@ -213,10 +213,10 @@ void FCogAbilityWindow_Abilities::RenderAbilitiesTable(UAbilitySystemComponent& } const auto AbilityName = StringCast(*GetAbilityName(Ability)); - if (Filter.PassFilter(AbilityName.Get()) == false) - { - continue; - } + if (Filter.PassFilter(AbilityName.Get()) == false) + { + continue; + } FitleredAbilities.Add(Spec); } diff --git a/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp b/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp index 4b2f316..69e8f49 100644 --- a/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp +++ b/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp @@ -4,11 +4,11 @@ #include "CogWindowHelper.h" #include "CogWindowWidgets.h" #include "Engine/LocalPlayer.h" +#include "Engine/World.h" #include "EnhancedInputSubsystems.h" #include "GameFramework/Pawn.h" #include "InputAction.h" #include "InputMappingContext.h" -#include "Engine/World.h" //-------------------------------------------------------------------------------------------------------------------------- void FCogInputWindow_Actions::Initialize() diff --git a/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Gamepad.cpp b/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Gamepad.cpp index 58892fb..57e2152 100644 --- a/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Gamepad.cpp +++ b/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Gamepad.cpp @@ -5,10 +5,10 @@ #include "CogWindowHelper.h" #include "CogWindowWidgets.h" #include "Engine/LocalPlayer.h" +#include "Engine/World.h" #include "EnhancedInputSubsystems.h" #include "imgui_internal.h" #include "InputMappingContext.h" -#include "Engine/World.h" //-------------------------------------------------------------------------------------------------------------------------- void FCogInputWindow_Gamepad::Initialize() diff --git a/Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Gamepad.h b/Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Gamepad.h index 5074275..c0a79fd 100644 --- a/Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Gamepad.h +++ b/Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Gamepad.h @@ -8,11 +8,11 @@ #include "InputCoreTypes.h" #include "CogInputWindow_Gamepad.generated.h" -class UEnhancedPlayerInput; class UCogInputConfig_Gamepad; class UCogInputDataAsset; -struct ImDrawList; +class UEnhancedPlayerInput; struct FKey; +struct ImDrawList; //-------------------------------------------------------------------------------------------------------------------------- class COGINPUT_API FCogInputWindow_Gamepad : public FCogWindow