From 4434b72835356980d5ad38875e448c7c1358bdc1 Mon Sep 17 00:00:00 2001 From: Arnaud Jamin Date: Mon, 8 Jan 2024 16:10:47 -0500 Subject: [PATCH] Fix includes --- Plugins/Cog/Source/CogDebug/CogDebug.Build.cs | 59 ++++++---------- .../Source/CogDebug/Private/CogDebugGizmo.cpp | 4 +- Plugins/Cog/Source/CogDebug/Public/CogDebug.h | 9 +-- .../CogDebug/Public/CogDebugDrawHelper.h | 26 +++---- .../Source/CogDebug/Public/CogDebugGizmo.h | 2 + .../Private/CogEngineCollisionTester.cpp | 1 + .../CogEngine/Private/CogEngineHelper.cpp | 2 + .../CogEngineWindow_CollisionTester.cpp | 2 + .../Private/CogEngineWindow_DebugSettings.cpp | 70 +++++++++---------- .../Private/CogEngineWindow_Transform.cpp | 1 + .../Public/CogEngineCollisionTester.h | 2 + .../Source/CogEngine/Public/CogEngineHelper.h | 2 + .../CogWindow/Private/CogWindowHelper.cpp | 2 + .../CogWindow/Private/CogWindowWidgets.cpp | 2 + .../CogWindow/Public/CogWindowWidgets.h | 3 +- .../Private/CogAbilityWindow_Effects.cpp | 1 + 16 files changed, 96 insertions(+), 92 deletions(-) diff --git a/Plugins/Cog/Source/CogDebug/CogDebug.Build.cs b/Plugins/Cog/Source/CogDebug/CogDebug.Build.cs index 5317901..48c1312 100644 --- a/Plugins/Cog/Source/CogDebug/CogDebug.Build.cs +++ b/Plugins/Cog/Source/CogDebug/CogDebug.Build.cs @@ -2,48 +2,29 @@ using UnrealBuildTool; public class CogDebug : ModuleRules { - public CogDebug(ReadOnlyTargetRules Target) : base(Target) - { - PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs; - - PublicIncludePaths.AddRange( - new string[] { - } - ); - - - PrivateIncludePaths.AddRange( - new string[] { - } - ); - - - PublicDependencyModuleNames.AddRange( - new string[] - { - "Core", + public CogDebug(ReadOnlyTargetRules Target) : base(Target) + { + PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs; + + PublicDependencyModuleNames.AddRange( + new string[] + { + "Engine", + "Core", "CogImgui", - "CogCommon", + "CogCommon", } ); - - - PrivateDependencyModuleNames.AddRange( - new string[] - { - "CoreUObject", - "Engine", - "Slate", - "SlateCore", + + + PrivateDependencyModuleNames.AddRange( + new string[] + { + "CoreUObject", + "Slate", + "SlateCore", "NetCore", } - ); - - - DynamicallyLoadedModuleNames.AddRange( - new string[] - { - } - ); - } + ); + } } diff --git a/Plugins/Cog/Source/CogDebug/Private/CogDebugGizmo.cpp b/Plugins/Cog/Source/CogDebug/Private/CogDebugGizmo.cpp index 8dacbb6..4ad3b7b 100644 --- a/Plugins/Cog/Source/CogDebug/Private/CogDebugGizmo.cpp +++ b/Plugins/Cog/Source/CogDebug/Private/CogDebugGizmo.cpp @@ -5,6 +5,8 @@ #include "CogImGuiHelper.h" #include "Components/PrimitiveComponent.h" #include "Components/SceneComponent.h" +#include "DrawDebugHelpers.h" +#include "Engine/World.h" #include "GameFramework/PlayerController.h" #include "imgui.h" #include "Kismet/GameplayStatics.h" @@ -244,7 +246,7 @@ bool FCogDebug_Gizmo::Draw(const char* Id, const APlayerController& InPlayerCont const FColor GizmoAxisColorsZHigh[] = { Settings.GizmoAxisColorsZHighX, Settings.GizmoAxisColorsZHighY, Settings.GizmoAxisColorsZHighZ, Settings.GizmoAxisColorsZHighW }; const FColor GizmoAxisColorsSelection[] = { Settings.GizmoAxisColorsSelectionX, Settings.GizmoAxisColorsSelectionY, Settings.GizmoAxisColorsSelectionZ, Settings.GizmoAxisColorsSelectionW }; - FCogDebug_GizmoElement GizmoElements[ECogDebug_GizmoElementType::MAX]; + FCogDebug_GizmoElement GizmoElements[(uint8)ECogDebug_GizmoElementType::MAX]; for (FCogDebug_GizmoElement& GizmoElement : GizmoElements) { GizmoElement.Type = ECogDebug_GizmoType::MAX; diff --git a/Plugins/Cog/Source/CogDebug/Public/CogDebug.h b/Plugins/Cog/Source/CogDebug/Public/CogDebug.h index b0b4741..5ff6034 100644 --- a/Plugins/Cog/Source/CogDebug/Public/CogDebug.h +++ b/Plugins/Cog/Source/CogDebug/Public/CogDebug.h @@ -1,15 +1,16 @@ #pragma once #include "CoreMinimal.h" +#include "Engine/EngineTypes.h" #include "UObject/WeakObjectPtrTemplates.h" #include "CogDebug.generated.h" -struct FCogDebugDrawSweepParams; +class AActor; +class UObject; +class UWorld; struct FCogDebugDrawLineTraceParams; struct FCogDebugDrawOverlapParams; -class UObject; -class AActor; -class UWorld; +struct FCogDebugDrawSweepParams; USTRUCT() struct FCogDebugSettings diff --git a/Plugins/Cog/Source/CogDebug/Public/CogDebugDrawHelper.h b/Plugins/Cog/Source/CogDebug/Public/CogDebugDrawHelper.h index 776b1d8..710a66e 100644 --- a/Plugins/Cog/Source/CogDebug/Public/CogDebugDrawHelper.h +++ b/Plugins/Cog/Source/CogDebug/Public/CogDebugDrawHelper.h @@ -1,12 +1,15 @@ #pragma once #include "CoreMinimal.h" +#include "Engine/EngineTypes.h" -namespace EDrawDebugTrace { enum Type : int; } - -class UWorld; -struct FHitResult; class AActor; +class UPrimitiveComponent; +class UWorld; +namespace EDrawDebugTrace { enum Type : int; } +struct FCollisionShape; +struct FHitResult; +struct FOverlapResult; struct FCogDebugDrawOverlapParams { @@ -43,16 +46,16 @@ class COGDEBUG_API FCogDebugDrawHelper { public: - static void DrawArc(const UWorld* World, const FMatrix& Matrix, const float InnterRadius, const float OuterRadius, const float AngleStart, const float AngleEnd, const int32 Segments, const FColor& Color, const bool bPersistentLines = false, const float LifeTime = -1.f, const uint8 DepthPriority = 0U, const float Thickness = 0.0f); + static void DrawArc(const UWorld* World, const FMatrix& Matrix, const float InnerRadius, const float OuterRadius, const float AngleStart, const float AngleEnd, const int32 Segments, const FColor& Color, const bool bPersistentLines = false, const float LifeTime = -1.f, const uint8 DepthPriority = 0U, const float Thickness = 0.0f); - static void DrawArc(const UWorld* World, const FMatrix& Matrix, const float InnterRadius, const float OuterRadius, const float ArcAngle, const int32 Segments, const FColor& Color, const bool bPersistentLines = false, const float LifeTime = -1.f, const uint8 DepthPriority = 0U, const float Thickness = 0.0f); + static void DrawArc(const UWorld* World, const FMatrix& Matrix, const float InnerRadius, const float OuterRadius, const float ArcAngle, const int32 Segments, const FColor& Color, const bool bPersistentLines = false, const float LifeTime = -1.f, const uint8 DepthPriority = 0U, const float Thickness = 0.0f); static void DrawSphere(const UWorld* World, const FVector& Center, const float Radius, const int32 Segments, const FColor& Color, const bool bPersistentLines = false, const float LifeTime = -1.f, const uint8 DepthPriority = 0U, const float Thickness = 0.0f); - + static void DrawFrustum(const UWorld* World, const FMatrix& Matrix, const float Angle, const float AspectRatio, const float NearPlane, const float FarPlane, const FColor& Color, const bool bPersistentLines = false, const float LifeTime = -1.f, const uint8 DepthPriority = 0U, const float Thickness = 0.0f); - + static void DrawFlatCapsule(const UWorld* World, const FVector2D& Start, const FVector2D& End, const float Radius, const float Z, const float Segments, const FColor& Color, const bool bPersistentLines = false, const float LifeTime = -1.0f, const uint8 DepthPriority = 0, const float Thickness = 0.0f); - + static void DrawQuad(const UWorld* World, const FVector& Position, const FQuat& Rotation, const FVector2D& Extents, const FColor& Color, bool bPersistent = false, float LifeTime = -1, uint8 DepthPriority = 0, const float Thickness = 0.0f); static void DrawSolidQuad(const UWorld* World, const FVector& Position, const FQuat& Rotation, const FVector2D& Extents, const FColor& Color, bool bPersistent = false, float LifeTime = -1, uint8 DepthPriority = 0); @@ -62,13 +65,12 @@ public: static void DrawPrimitiveComponent(const UPrimitiveComponent& PrimitiveComponent, const FColor& Color, const bool Persistent, const float LifeTime, const uint8 DepthPriority, const float Thickness); static void DrawOverlap(const UWorld* World, const FCollisionShape& Shape, const FVector& Location, const FQuat& Rotation, TArray& OverlapResults, const FCogDebugDrawOverlapParams& Settings); - - static void DrawHitResult(const UWorld* World, const FHitResult& HitResult, const FCogDebugDrawLineTraceParams& Settings); + + static void DrawHitResult(const UWorld* World, const FHitResult& HitResult, const FCogDebugDrawLineTraceParams& Settings); static void DrawHitResults(const UWorld* World, const TArray& HitResults, const FCogDebugDrawLineTraceParams& Settings); static void DrawLineTrace(const UWorld* World, const FVector& Start, const FVector& End, const bool HasHits, TArray& HitResults, const FCogDebugDrawLineTraceParams& Settings); static void DrawSweep(const UWorld* World, const FCollisionShape& Shape, const FVector& Start, const FVector& End, const FQuat& Rotation, const bool HasHits, TArray& HitResults, const FCogDebugDrawSweepParams& Settings); - }; diff --git a/Plugins/Cog/Source/CogDebug/Public/CogDebugGizmo.h b/Plugins/Cog/Source/CogDebug/Public/CogDebugGizmo.h index f418b49..1c9bc11 100644 --- a/Plugins/Cog/Source/CogDebug/Public/CogDebugGizmo.h +++ b/Plugins/Cog/Source/CogDebug/Public/CogDebugGizmo.h @@ -3,6 +3,8 @@ #include "CoreMinimal.h" #include "CogDebugGizmo.generated.h" +class APlayerController; + //-------------------------------------------------------------------------------------------------------------------------- UENUM(Flags) enum class ECogDebug_GizmoFlags : uint8 diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineCollisionTester.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineCollisionTester.cpp index 88615c2..98ce72e 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineCollisionTester.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineCollisionTester.cpp @@ -4,6 +4,7 @@ #include "CogDebug.h" #include "Components/PrimitiveComponent.h" #include "Components/SceneComponent.h" +#include "Engine/World.h" //-------------------------------------------------------------------------------------------------------------------------- ACogEngineCollisionTester::ACogEngineCollisionTester(const FObjectInitializer& ObjectInitializer) diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineHelper.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineHelper.cpp index f6bd313..5d8dd9b 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineHelper.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineHelper.cpp @@ -4,6 +4,8 @@ #include "CogWindowHelper.h" #include "CogWindowWidgets.h" #include "imgui.h" +#include "GameFramework/Actor.h" +#include "GameFramework/Pawn.h" #if WITH_EDITOR #include "IAssetTools.h" diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_CollisionTester.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_CollisionTester.cpp index 214bae0..135c1d2 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_CollisionTester.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_CollisionTester.cpp @@ -5,6 +5,8 @@ #include "CogWindowWidgets.h" #include "Components/PrimitiveComponent.h" #include "Components/SceneComponent.h" +#include "Engine/CollisionProfile.h" +#include "Engine/World.h" #include "imgui.h" //-------------------------------------------------------------------------------------------------------------------------- diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_DebugSettings.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_DebugSettings.cpp index c3d7179..ac46687 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_DebugSettings.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_DebugSettings.cpp @@ -3,7 +3,7 @@ #include "CogDebug.h" #include "CogImGuiHelper.h" #include "CogWindowWidgets.h" -#include "imgui_internal.h" +#include "Engine/CollisionProfile.h" //-------------------------------------------------------------------------------------------------------------------------- void FCogEngineWindow_DebugSettings::RenderHelp() @@ -47,7 +47,7 @@ void FCogEngineWindow_DebugSettings::PreSaveConfig() void RenderCollisionChannelColor(const UCollisionProfile& CollisionProfile, FColor& Color, ECollisionChannel Channel, ImGuiColorEditFlags ColorEditFlags) { const FString ChannelName = CollisionProfile.ReturnChannelNameFromContainerIndex(Channel).ToString(); - FCogImguiHelper::ColorEdit4(StringCast(*ChannelName).Get(), Color, ColorEditFlags); + FCogImguiHelper::ColorEdit4(StringCast(*ChannelName).Get(), Color, ColorEditFlags); } //-------------------------------------------------------------------------------------------------------------------------- @@ -312,38 +312,38 @@ void FCogEngineWindow_DebugSettings::RenderContent() { if (const UCollisionProfile* CollisionProfile = UCollisionProfile::Get()) { - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorWorldStatic, ECC_WorldStatic, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorWorldDynamic, ECC_WorldDynamic, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorPawn, ECC_Pawn, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorVisibility, ECC_Visibility, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorCamera, ECC_Camera, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorPhysicsBody, ECC_PhysicsBody, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorVehicle, ECC_Vehicle, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorDestructible, ECC_Destructible, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorEngineTraceChannel1, ECC_EngineTraceChannel1, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorEngineTraceChannel2, ECC_EngineTraceChannel2, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorEngineTraceChannel3, ECC_EngineTraceChannel3, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorEngineTraceChannel4, ECC_EngineTraceChannel4, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorEngineTraceChannel5, ECC_EngineTraceChannel5, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorEngineTraceChannel6, ECC_EngineTraceChannel6, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel1, ECC_GameTraceChannel1, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel2, ECC_GameTraceChannel2, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel3, ECC_GameTraceChannel3, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel4, ECC_GameTraceChannel4, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel5, ECC_GameTraceChannel5, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel6, ECC_GameTraceChannel6, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel7, ECC_GameTraceChannel7, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel8, ECC_GameTraceChannel8, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel9, ECC_GameTraceChannel9, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel10, ECC_GameTraceChannel10, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel11, ECC_GameTraceChannel11, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel12, ECC_GameTraceChannel12, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel13, ECC_GameTraceChannel13, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel14, ECC_GameTraceChannel14, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel15, ECC_GameTraceChannel15, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel16, ECC_GameTraceChannel16, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel17, ECC_GameTraceChannel17, ColorEditFlags); - RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel18, ECC_GameTraceChannel18, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorWorldStatic, ECC_WorldStatic, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorWorldDynamic, ECC_WorldDynamic, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorPawn, ECC_Pawn, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorVisibility, ECC_Visibility, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorCamera, ECC_Camera, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorPhysicsBody, ECC_PhysicsBody, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorVehicle, ECC_Vehicle, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorDestructible, ECC_Destructible, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorEngineTraceChannel1, ECC_EngineTraceChannel1, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorEngineTraceChannel2, ECC_EngineTraceChannel2, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorEngineTraceChannel3, ECC_EngineTraceChannel3, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorEngineTraceChannel4, ECC_EngineTraceChannel4, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorEngineTraceChannel5, ECC_EngineTraceChannel5, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorEngineTraceChannel6, ECC_EngineTraceChannel6, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel1, ECC_GameTraceChannel1, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel2, ECC_GameTraceChannel2, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel3, ECC_GameTraceChannel3, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel4, ECC_GameTraceChannel4, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel5, ECC_GameTraceChannel5, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel6, ECC_GameTraceChannel6, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel7, ECC_GameTraceChannel7, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel8, ECC_GameTraceChannel8, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel9, ECC_GameTraceChannel9, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel10, ECC_GameTraceChannel10, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel11, ECC_GameTraceChannel11, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel12, ECC_GameTraceChannel12, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel13, ECC_GameTraceChannel13, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel14, ECC_GameTraceChannel14, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel15, ECC_GameTraceChannel15, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel16, ECC_GameTraceChannel16, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel17, ECC_GameTraceChannel17, ColorEditFlags); + RenderCollisionChannelColor(*CollisionProfile, Settings.ChannelColorGameTraceChannel18, ECC_GameTraceChannel18, ColorEditFlags); } } @@ -361,7 +361,7 @@ void FCogEngineWindow_DebugSettings::RenderContent() FCogWindowWidgets::SetNextItemToShortWidth(); ImGui::DragFloat("Primitive Actors Name Size", &Settings.CollisionQueryHitPrimitiveActorsNameSize); - FCogWindowWidgets::SetNextItemToShortWidth(); + FCogWindowWidgets::SetNextItemToShortWidth(); ImGui::DragFloat("Hit Point Size", &Settings.CollisionQueryHitPointSize); FCogImguiHelper::ColorEdit4("Hit Color", Settings.CollisionQueryHitColor, ColorEditFlags); diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Transform.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Transform.cpp index 635442d..77aebd0 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Transform.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Transform.cpp @@ -3,6 +3,7 @@ #include "CogDebug.h" #include "CogImGuiHelper.h" #include "CogWindowWidgets.h" +#include "GameFramework/Actor.h" #include "imgui.h" #include "imgui_internal.h" diff --git a/Plugins/Cog/Source/CogEngine/Public/CogEngineCollisionTester.h b/Plugins/Cog/Source/CogEngine/Public/CogEngineCollisionTester.h index 49bd5b8..b9ea8eb 100644 --- a/Plugins/Cog/Source/CogEngine/Public/CogEngineCollisionTester.h +++ b/Plugins/Cog/Source/CogEngine/Public/CogEngineCollisionTester.h @@ -1,7 +1,9 @@ #pragma once #include "CoreMinimal.h" +#include "Engine/EngineTypes.h" #include "Engine/HitResult.h" +#include "GameFramework/Actor.h" #include "CogEngineCollisionTester.generated.h" //-------------------------------------------------------------------------------------------------------------------------- diff --git a/Plugins/Cog/Source/CogEngine/Public/CogEngineHelper.h b/Plugins/Cog/Source/CogEngine/Public/CogEngineHelper.h index 945f1fb..071b3c5 100644 --- a/Plugins/Cog/Source/CogEngine/Public/CogEngineHelper.h +++ b/Plugins/Cog/Source/CogEngine/Public/CogEngineHelper.h @@ -2,6 +2,8 @@ #include "CoreMinimal.h" +class AActor; + class COGENGINE_API FCogEngineHelper { public: diff --git a/Plugins/Cog/Source/CogWindow/Private/CogWindowHelper.cpp b/Plugins/Cog/Source/CogWindow/Private/CogWindowHelper.cpp index f3678db..b711717 100644 --- a/Plugins/Cog/Source/CogWindow/Private/CogWindowHelper.cpp +++ b/Plugins/Cog/Source/CogWindow/Private/CogWindowHelper.cpp @@ -3,6 +3,8 @@ #include "AssetRegistry/AssetRegistryModule.h" #include "AssetRegistry/IAssetRegistry.h" #include "CogDebug.h" +#include "GameFramework/PlayerController.h" +#include "imgui.h" //---------------------------------------------------------------------------------------------------------------------- const UObject* FCogWindowHelper::GetFirstAssetByClass(const TSubclassOf AssetClass) diff --git a/Plugins/Cog/Source/CogWindow/Private/CogWindowWidgets.cpp b/Plugins/Cog/Source/CogWindow/Private/CogWindowWidgets.cpp index 70e1982..520df16 100644 --- a/Plugins/Cog/Source/CogWindow/Private/CogWindowWidgets.cpp +++ b/Plugins/Cog/Source/CogWindow/Private/CogWindowWidgets.cpp @@ -5,7 +5,9 @@ #include "CogImguiInputHelper.h" #include "CogImguiKeyInfo.h" #include "CogWindowHelper.h" +#include "Components/PrimitiveComponent.h" #include "EngineUtils.h" +#include "GameFramework/Pawn.h" #include "GameFramework/PlayerInput.h" #include "imgui.h" #include "imgui_internal.h" diff --git a/Plugins/Cog/Source/CogWindow/Public/CogWindowWidgets.h b/Plugins/Cog/Source/CogWindow/Public/CogWindowWidgets.h index 62bee17..ea232f4 100644 --- a/Plugins/Cog/Source/CogWindow/Public/CogWindowWidgets.h +++ b/Plugins/Cog/Source/CogWindow/Public/CogWindowWidgets.h @@ -5,12 +5,13 @@ #include "UObject/ReflectedTypeAccessors.h" class FEnumProperty; +class UCollisionProfile; class UEnum; class UObject; enum class ECheckBoxState : uint8; +enum ECollisionChannel : int; struct FCogImGuiKeyInfo; struct FKeyBind; -struct FKeyBind; using FCogWindowActorContextMenuFunction = TFunction; diff --git a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Effects.cpp b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Effects.cpp index 846e31f..cf0d49d 100644 --- a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Effects.cpp +++ b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Effects.cpp @@ -8,6 +8,7 @@ #include "CogAbilityHelper.h" #include "CogImguiHelper.h" #include "CogWindowWidgets.h" +#include "Engine/World.h" //-------------------------------------------------------------------------------------------------------------------------- void FCogAbilityWindow_Effects::Initialize()