From 1e27fc0c13ac8f4021118def9cdb17e710ff2cbf Mon Sep 17 00:00:00 2001 From: Arnaud Jamin Date: Thu, 6 Feb 2025 15:46:34 -0500 Subject: [PATCH] Code analysis pass --- .../CogCommon/Private/CogCommonModule.cpp | 2 - .../Cog/Source/CogDebug/Private/CogDebug.cpp | 7 +-- .../Source/CogDebug/Private/CogDebugDraw.cpp | 5 +- .../CogDebug/Private/CogDebugDrawHelper.cpp | 9 ++- .../CogDebug/Private/CogDebugDrawImGui.cpp | 1 - .../Source/CogDebug/Private/CogDebugGizmo.cpp | 42 ++++++------- .../CogDebug/Private/CogDebugHelper.cpp | 7 +-- .../Source/CogDebug/Private/CogDebugLog.cpp | 6 +- .../CogDebug/Private/CogDebugLogBlueprint.cpp | 1 + .../CogDebug/Private/CogDebugPlotEvent.cpp | 6 +- .../CogDebug/Private/CogDebugReplicator.cpp | 39 ++++++------ Plugins/Cog/Source/CogDebug/Public/CogDebug.h | 2 +- .../CogDebug/Public/CogDebugDrawBlueprint.h | 2 +- .../CogDebug/Public/CogDebugDrawHelper.h | 2 +- .../CogDebug/Public/CogDebugDrawImGui.h | 1 - .../Cog/Source/CogDebug/Public/CogDebugLog.h | 4 +- .../Source/CogDebug/Public/CogDebugModule.h | 2 +- .../CogDebug/Public/CogDebugNotification.h | 10 --- .../Cog/Source/CogDebug/Public/CogDebugPlot.h | 1 - .../CogDebug/Public/CogDebugReplicator.h | 8 +-- .../Source/CogDebug/Public/CogDebugShape.h | 2 +- .../Private/CogDebugEditorModule.cpp | 2 +- .../Private/CogDebugLogCategoryDetails.cpp | 2 +- .../Private/SCogDebugLogCategoryWidget.cpp | 12 ++-- .../Public/CogDebugEditorModule.h | 5 +- .../Public/CogDebugGraphPanelPinFactory.h | 2 +- .../Public/CogDebugLogCategoryDetails.h | 2 +- .../CogEngine/Private/CogEngineHelper.cpp | 14 ++++- .../CogEngine/Private/CogEngineReplicator.cpp | 5 +- .../Private/CogEngineWindow_Audio.cpp | 4 +- .../Private/CogEngineWindow_Cheats.cpp | 14 ++--- .../CogEngineWindow_CollisionTester.cpp | 3 +- .../CogEngineWindow_CollisionViewer.cpp | 5 +- .../Private/CogEngineWindow_Console.cpp | 7 +-- .../Private/CogEngineWindow_Inspector.cpp | 43 ++++++------- .../Private/CogEngineWindow_LogCategories.cpp | 14 ++--- .../Private/CogEngineWindow_Metrics.cpp | 2 +- .../Private/CogEngineWindow_NetImGui.cpp | 10 +-- .../Private/CogEngineWindow_Notifications.cpp | 3 - .../Private/CogEngineWindow_OutputLog.cpp | 18 +++--- .../Private/CogEngineWindow_Plots.cpp | 8 +-- .../Private/CogEngineWindow_Selection.cpp | 1 - .../Private/CogEngineWindow_Skeleton.cpp | 6 +- .../Private/CogEngineWindow_Spawns.cpp | 12 ++-- .../Private/CogEngineWindow_Stats.cpp | 2 +- .../Source/CogEngine/Public/CogEngineHelper.h | 2 + .../CogEngine/Public/CogEngineReplicator.h | 4 +- .../Public/CogEngineWindow_CollisionTester.h | 10 +-- .../Public/CogEngineWindow_Console.h | 6 -- .../CogEngine/Public/CogEngineWindow_ImGui.h | 2 - .../Public/CogEngineWindow_Inspector.h | 4 +- .../Public/CogEngineWindow_NetImGui.h | 6 +- .../CogEngine/Public/CogEngineWindow_Spawns.h | 4 +- .../Public/CogEngineWindow_Transform.h | 12 ++-- .../CogImgui/Private/CogImguiConfig.cpp | 1 + .../CogImgui/Private/CogImguiContext.cpp | 38 ++---------- .../CogImgui/Private/CogImguiHelper.cpp | 8 +-- .../Private/CogImguiInputCatcherWidget.cpp | 18 +++--- .../CogImgui/Private/CogImguiInputHelper.cpp | 12 ++-- .../CogImgui/Private/CogImguiWidget.cpp | 22 +++---- .../Source/CogImgui/Public/CogImguiContext.h | 8 +-- .../Source/CogImgui/Public/CogImguiDrawList.h | 1 - .../Public/CogImguiInputCatcherWidget.h | 7 +-- .../CogImgui/Public/CogImguiInputHelper.h | 8 +-- .../Source/CogImgui/Public/CogImguiModule.h | 4 +- .../Source/CogImgui/Public/CogImguiWidget.h | 8 +-- .../Source/CogWindow/Private/CogWindow.cpp | 2 +- .../CogWindow/Private/CogWindowHelper.cpp | 2 +- .../CogWindow/Private/CogWindowManager.cpp | 22 +++---- .../CogWindow/Private/CogWindowWidgets.cpp | 43 ++++++------- .../CogWindow/Private/CogWindow_Inputs.cpp | 2 - .../Cog/Source/CogWindow/Public/CogWindow.h | 4 +- .../Source/CogWindow/Public/CogWindowHelper.h | 2 +- .../CogWindow/Public/CogWindowManager.h | 2 - .../Source/CogWindow/Public/CogWindowModule.h | 1 - .../CogWindow/Public/CogWindowWidgets.h | 14 ++--- .../CogWindow/Public/CogWindow_Inputs.h | 1 - .../CogWindow/Public/CogWindow_Settings.h | 1 - .../CogWindow/Public/CogWindow_Spacing.h | 4 -- .../Private/CogAIWindow_BehaviorTree.cpp | 6 +- .../CogAbilityCheat_Execution_ApplyEffect.cpp | 1 - .../Private/CogAbilityConfig_Alignment.cpp | 61 ++++++++----------- .../CogAbility/Private/CogAbilityHelper.cpp | 14 +++++ .../Private/CogAbilityWindow_Abilities.cpp | 15 +++-- .../Private/CogAbilityWindow_Attributes.cpp | 12 ++-- .../Private/CogAbilityWindow_Cheats.cpp | 2 +- .../Private/CogAbilityWindow_Effects.cpp | 7 +-- .../Private/CogAbilityWindow_Pools.cpp | 18 +++--- .../Private/CogAbilityWindow_Tags.cpp | 2 +- .../Private/CogAbilityWindow_Tasks.cpp | 18 +++--- .../Private/CogAbilityWindow_Tweaks.cpp | 7 ++- .../CogAbility/Public/CogAbilityHelper.h | 4 +- .../Public/CogAbilityWindow_Pools.h | 1 - .../CogAbility/Public/CogAbilityWindow_Tags.h | 4 +- .../Public/CogAbilityWindow_Tasks.h | 2 +- .../Public/CogAbilityWindow_Tweaks.h | 2 +- .../CogAll/Source/CogAll/Private/CogAll.cpp | 4 +- .../Source/CogAll/Public/CogAllModule.h | 2 +- 98 files changed, 357 insertions(+), 465 deletions(-) delete mode 100644 Plugins/Cog/Source/CogDebug/Public/CogDebugNotification.h delete mode 100644 Plugins/Cog/Source/CogWindow/Private/CogWindow_Inputs.cpp delete mode 100644 Plugins/Cog/Source/CogWindow/Public/CogWindow_Inputs.h diff --git a/Plugins/Cog/Source/CogCommon/Private/CogCommonModule.cpp b/Plugins/Cog/Source/CogCommon/Private/CogCommonModule.cpp index b67242c..dc85505 100644 --- a/Plugins/Cog/Source/CogCommon/Private/CogCommonModule.cpp +++ b/Plugins/Cog/Source/CogCommon/Private/CogCommonModule.cpp @@ -1,7 +1,5 @@ #include "CogCommonModule.h" -#include "CogCommonLogCategory.h" - #define LOCTEXT_NAMESPACE "FCogCommonModule" //-------------------------------------------------------------------------------------------------------------------------- diff --git a/Plugins/Cog/Source/CogDebug/Private/CogDebug.cpp b/Plugins/Cog/Source/CogDebug/Private/CogDebug.cpp index ca83704..5084132 100644 --- a/Plugins/Cog/Source/CogDebug/Private/CogDebug.cpp +++ b/Plugins/Cog/Source/CogDebug/Private/CogDebug.cpp @@ -5,7 +5,6 @@ #include "CogDebugReplicator.h" #include "Engine/Engine.h" #include "Engine/World.h" -#include "imgui.h" #include "Kismet/KismetMathLibrary.h" #include "Misc/EngineVersionComparison.h" @@ -144,7 +143,7 @@ bool FCogDebug::GetIsFilteringBySelection() } //-------------------------------------------------------------------------------------------------------------------------- -void FCogDebug::SetIsFilteringBySelection(UWorld* World, bool Value) +void FCogDebug::SetIsFilteringBySelection(const UWorld* World, bool Value) { Settings.bIsFilteringBySelection = Value; @@ -191,7 +190,7 @@ int FCogDebug::GetDebugSegments() //-------------------------------------------------------------------------------------------------------------------------- int FCogDebug::GetCircleSegments() { - return (Settings.Segments * 2) + 2; // because DrawDebugCircle does Segments = FMath::Max((Segments - 2) / 2, 4) for some reason + return (Settings.Segments * 2) + 2; // because DrawDebugCircle do: Segments = FMath::Max((Segments - 2) / 2, 4) for some reason } //-------------------------------------------------------------------------------------------------------------------------- @@ -252,7 +251,7 @@ FColor FCogDebug::ModulateDebugColor(const UWorld* World, const FColor& Color, b case ECogDebugRecolorMode::HueOverFrames: { const FLinearColor BaseColor(Color); - const float Factor = (Settings.RecolorFrameCycle > 0) ? (GFrameCounter % Settings.RecolorFrameCycle) / (float)Settings.RecolorFrameCycle : 0.0f; + const float Factor = (Settings.RecolorFrameCycle > 0) ? (GFrameCounter % Settings.RecolorFrameCycle) / static_cast(Settings.RecolorFrameCycle) : 0.0f; const FLinearColor NewColor(Factor * 360.0f, 1.0f, 1.0f); const FLinearColor BlendColor = BaseColor * (1.0f - Settings.RecolorIntensity) + NewColor.HSVToLinearRGB() * Settings.RecolorIntensity; return BlendColor.ToFColor(true); diff --git a/Plugins/Cog/Source/CogDebug/Private/CogDebugDraw.cpp b/Plugins/Cog/Source/CogDebug/Private/CogDebugDraw.cpp index 1e32374..8cfa2d1 100644 --- a/Plugins/Cog/Source/CogDebug/Private/CogDebugDraw.cpp +++ b/Plugins/Cog/Source/CogDebug/Private/CogDebugDraw.cpp @@ -546,7 +546,7 @@ void FCogDebugDraw::Points(const FLogCategoryBase& LogCategory, const UObject* W int32 Index = 0; for (const FVector& Point : Points) { - const FLinearColor Color = FLinearColor::LerpUsingHSV(FLinearColor(StartColor), FLinearColor(EndColor), Points.Num() <= 1 ? 0.0f : Index / (float)(Points.Num() - 1)); + const FLinearColor Color = FLinearColor::LerpUsingHSV(FLinearColor(StartColor), FLinearColor(EndColor), Points.Num() <= 1 ? 0.0f : Index / static_cast(Points.Num() - 1)); Sphere(LogCategory, WorldContextObject, Point, Radius, Color.ToFColor(true), Persistent, DepthPriority); Index++; } @@ -577,7 +577,7 @@ void FCogDebugDraw::Path(const FLogCategoryBase& LogCategory, const UObject* Wor int32 Index = 0; for (const FVector& Position : Points) { - const FLinearColor LinearColor = FLinearColor::LerpUsingHSV(FLinearColor(StartColor), FLinearColor(EndColor), Points.Num() <= 1 ? 0.0f : Index / (float)(Points.Num() - 1)); + const FLinearColor LinearColor = FLinearColor::LerpUsingHSV(FLinearColor(StartColor), FLinearColor(EndColor), Points.Num() <= 1 ? 0.0f : Index / static_cast(Points.Num() - 1)); FColor Color = LinearColor.ToFColor(true); Point(LogCategory, WorldContextObject, Position, PointSize, Color, Persistent, DepthPriority); @@ -622,7 +622,6 @@ void FCogDebugDraw::Skeleton(const FLogCategoryBase& LogCategory, const USkeleta const FTransform Transform = ComponentSpaceTransforms[BoneIndex] * WorldTransform; const FVector BoneLocation = Transform.GetLocation(); - const FRotator BoneRotation = FRotator(Transform.GetRotation()); const int32 ParentIndex = ReferenceSkeleton.GetParentIndex(BoneIndex); FVector ParentLocation; diff --git a/Plugins/Cog/Source/CogDebug/Private/CogDebugDrawHelper.cpp b/Plugins/Cog/Source/CogDebug/Private/CogDebugDrawHelper.cpp index 56f4bb1..3dcebe4 100644 --- a/Plugins/Cog/Source/CogDebug/Private/CogDebugDrawHelper.cpp +++ b/Plugins/Cog/Source/CogDebug/Private/CogDebugDrawHelper.cpp @@ -78,7 +78,7 @@ void FCogDebugDrawHelper::DrawArc( } float CurrentAngle = AngleStartRad; - const float AngleStep = (AngleEndRad - AngleStartRad) / float(Segments); + const float AngleStep = (AngleEndRad - AngleStartRad) / static_cast(Segments); FVector PrevVertex = Center + OuterRadius * (AxisZ * FMath::Sin(CurrentAngle) + AxisY * FMath::Cos(CurrentAngle)); int32 Count = Segments; while (Count--) @@ -94,7 +94,6 @@ void FCogDebugDrawHelper::DrawArc( CurrentAngle = AngleStartRad; PrevVertex = Center + InnerRadius * (AxisZ * FMath::Sin(CurrentAngle) + AxisY * FMath::Cos(CurrentAngle)); - Count = Segments; while (Segments--) { CurrentAngle += AngleStep; @@ -189,8 +188,8 @@ void FCogDebugDrawHelper::DrawFrustum( const float HozHalfAngleInRadians = FMath::DegreesToRadians(Angle * 0.5f); - float HozLength = 0.0f; - float VertLength = 0.0f; + float HozLength; + float VertLength; if (Angle > 0.0f) { @@ -398,7 +397,7 @@ void FCogDebugDrawHelper::DrawLineTrace( const FVector& Start, const FVector& End, const bool HasHits, - TArray& HitResults, + const TArray& HitResults, const FCogDebugDrawLineTraceParams& Settings ) { diff --git a/Plugins/Cog/Source/CogDebug/Private/CogDebugDrawImGui.cpp b/Plugins/Cog/Source/CogDebug/Private/CogDebugDrawImGui.cpp index d26b4dd..892cd7c 100644 --- a/Plugins/Cog/Source/CogDebug/Private/CogDebugDrawImGui.cpp +++ b/Plugins/Cog/Source/CogDebug/Private/CogDebugDrawImGui.cpp @@ -181,7 +181,6 @@ void FCogDebugDrawImGui::AddText(const ImVec2& Pos, const FString& Text, ImU32 C void FCogDebugDrawImGui::Draw() { ImDrawList* DrawList = ImGui::GetBackgroundDrawList(); - double Time = ImGui::GetCurrentContext()->Time; DrawShapes(Lines, [DrawList](const FLine& Line, const ImColor Color) { DrawList->AddLine(Line.P1, Line.P2, Color, Line.Thickness); }); DrawShapes(Rectangles, [DrawList](const FRectangle& Rectangle, const ImColor Color) { DrawList->AddRect(Rectangle.Min, Rectangle.Max, Color, Rectangle.Rounding, Rectangle.Thickness); }); diff --git a/Plugins/Cog/Source/CogDebug/Private/CogDebugGizmo.cpp b/Plugins/Cog/Source/CogDebug/Private/CogDebugGizmo.cpp index 1d172ed..281b157 100644 --- a/Plugins/Cog/Source/CogDebug/Private/CogDebugGizmo.cpp +++ b/Plugins/Cog/Source/CogDebug/Private/CogDebugGizmo.cpp @@ -74,7 +74,7 @@ float ScreenDistanceToArc(const APlayerController& InPlayerController, const FVe const FVector AxisZ = Matrix.GetScaledAxis(EAxis::Z); float CurrentAngle = AngleStartRad; - const float AngleStep = (AngleEndRad - AngleStartRad) / float(NumSegments); + const float AngleStep = (AngleEndRad - AngleStartRad) / static_cast(NumSegments); FVector P0 = Center + Radius * (AxisZ * FMath::Sin(CurrentAngle) + AxisY * FMath::Cos(CurrentAngle)); @@ -259,7 +259,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[(uint8)ECogDebug_GizmoElementType::MAX]; + FCogDebug_GizmoElement GizmoElements[static_cast(ECogDebug_GizmoElementType::MAX)]; for (FCogDebug_GizmoElement& GizmoElement : GizmoElements) { GizmoElement.Type = ECogDebug_GizmoType::MAX; @@ -267,35 +267,35 @@ bool FCogDebug_Gizmo::Draw(const char* Id, const APlayerController& InPlayerCont if (EnumHasAnyFlags(Flags, ECogDebug_GizmoFlags::NoTranslationAxis) == false) { - GizmoElements[(uint8)ECogDebug_GizmoElementType::MoveX] = { ECogDebug_GizmoType::MoveAxis, ECogDebug_GizmoAxis::X, FVector::XAxisVector, UnitAxisX, RotX, GizmoCenter + UnitAxisX * Settings.GizmoTranslationAxisLength * GizmoScale }; - GizmoElements[(uint8)ECogDebug_GizmoElementType::MoveY] = { ECogDebug_GizmoType::MoveAxis, ECogDebug_GizmoAxis::Y, FVector::YAxisVector, UnitAxisY, RotY, GizmoCenter + UnitAxisY * Settings.GizmoTranslationAxisLength * GizmoScale }; - GizmoElements[(uint8)ECogDebug_GizmoElementType::MoveZ] = { ECogDebug_GizmoType::MoveAxis, ECogDebug_GizmoAxis::Z, FVector::ZAxisVector, UnitAxisZ, RotZ, GizmoCenter + UnitAxisZ * Settings.GizmoTranslationAxisLength * GizmoScale }; + GizmoElements[static_cast(ECogDebug_GizmoElementType::MoveX)] = { ECogDebug_GizmoType::MoveAxis, ECogDebug_GizmoAxis::X, FVector::XAxisVector, UnitAxisX, RotX, GizmoCenter + UnitAxisX * Settings.GizmoTranslationAxisLength * GizmoScale }; + GizmoElements[static_cast(ECogDebug_GizmoElementType::MoveY)] = { ECogDebug_GizmoType::MoveAxis, ECogDebug_GizmoAxis::Y, FVector::YAxisVector, UnitAxisY, RotY, GizmoCenter + UnitAxisY * Settings.GizmoTranslationAxisLength * GizmoScale }; + GizmoElements[static_cast(ECogDebug_GizmoElementType::MoveZ)] = { ECogDebug_GizmoType::MoveAxis, ECogDebug_GizmoAxis::Z, FVector::ZAxisVector, UnitAxisZ, RotZ, GizmoCenter + UnitAxisZ * Settings.GizmoTranslationAxisLength * GizmoScale }; } if (EnumHasAnyFlags(Flags, ECogDebug_GizmoFlags::NoTranslationPlane) == false) { - GizmoElements[(uint8)ECogDebug_GizmoElementType::MoveXY] = { ECogDebug_GizmoType::MovePlane, ECogDebug_GizmoAxis::Z, FVector::ZAxisVector, UnitAxisZ, RotZ, GizmoCenter + ((UnitAxisX + UnitAxisY) * Settings.GizmoTranslationPlaneOffset * GizmoScale) }; - GizmoElements[(uint8)ECogDebug_GizmoElementType::MoveXZ] = { ECogDebug_GizmoType::MovePlane, ECogDebug_GizmoAxis::Y, FVector::YAxisVector, UnitAxisY, RotY, GizmoCenter + ((UnitAxisX + UnitAxisZ) * Settings.GizmoTranslationPlaneOffset * GizmoScale) }; - GizmoElements[(uint8)ECogDebug_GizmoElementType::MoveYZ] = { ECogDebug_GizmoType::MovePlane, ECogDebug_GizmoAxis::X, FVector::XAxisVector, UnitAxisX, RotX, GizmoCenter + ((UnitAxisY + UnitAxisZ) * Settings.GizmoTranslationPlaneOffset * GizmoScale) }; + GizmoElements[static_cast(ECogDebug_GizmoElementType::MoveXY)] = { ECogDebug_GizmoType::MovePlane, ECogDebug_GizmoAxis::Z, FVector::ZAxisVector, UnitAxisZ, RotZ, GizmoCenter + ((UnitAxisX + UnitAxisY) * Settings.GizmoTranslationPlaneOffset * GizmoScale) }; + GizmoElements[static_cast(ECogDebug_GizmoElementType::MoveXZ)] = { ECogDebug_GizmoType::MovePlane, ECogDebug_GizmoAxis::Y, FVector::YAxisVector, UnitAxisY, RotY, GizmoCenter + ((UnitAxisX + UnitAxisZ) * Settings.GizmoTranslationPlaneOffset * GizmoScale) }; + GizmoElements[static_cast(ECogDebug_GizmoElementType::MoveYZ)] = { ECogDebug_GizmoType::MovePlane, ECogDebug_GizmoAxis::X, FVector::XAxisVector, UnitAxisX, RotX, GizmoCenter + ((UnitAxisY + UnitAxisZ) * Settings.GizmoTranslationPlaneOffset * GizmoScale) }; } if (EnumHasAnyFlags(Flags, ECogDebug_GizmoFlags::NoRotation) == false) { - GizmoElements[(uint8)ECogDebug_GizmoElementType::RotateX] = { ECogDebug_GizmoType::Rotate, ECogDebug_GizmoAxis::X, FVector::XAxisVector, UnitAxisX, RotX, FVector::ZeroVector }; - GizmoElements[(uint8)ECogDebug_GizmoElementType::RotateY] = { ECogDebug_GizmoType::Rotate, ECogDebug_GizmoAxis::Y, FVector::YAxisVector, UnitAxisY, RotY, FVector::ZeroVector }; - GizmoElements[(uint8)ECogDebug_GizmoElementType::RotateZ] = { ECogDebug_GizmoType::Rotate, ECogDebug_GizmoAxis::Z, FVector::ZAxisVector, UnitAxisZ, RotZ, FVector::ZeroVector }; + GizmoElements[static_cast(ECogDebug_GizmoElementType::RotateX)] = { ECogDebug_GizmoType::Rotate, ECogDebug_GizmoAxis::X, FVector::XAxisVector, UnitAxisX, RotX, FVector::ZeroVector }; + GizmoElements[static_cast(ECogDebug_GizmoElementType::RotateY)] = { ECogDebug_GizmoType::Rotate, ECogDebug_GizmoAxis::Y, FVector::YAxisVector, UnitAxisY, RotY, FVector::ZeroVector }; + GizmoElements[static_cast(ECogDebug_GizmoElementType::RotateZ)] = { ECogDebug_GizmoType::Rotate, ECogDebug_GizmoAxis::Z, FVector::ZAxisVector, UnitAxisZ, RotZ, FVector::ZeroVector }; } if (EnumHasAnyFlags(Flags, ECogDebug_GizmoFlags::NoScaleUniform) == false) { - GizmoElements[(uint8)ECogDebug_GizmoElementType::ScaleXYZ] = { ECogDebug_GizmoType::ScaleUniform, ECogDebug_GizmoAxis::MAX, FVector::OneVector, FVector::OneVector, RotX, GizmoCenter }; + GizmoElements[static_cast(ECogDebug_GizmoElementType::ScaleXYZ)] = { ECogDebug_GizmoType::ScaleUniform, ECogDebug_GizmoAxis::MAX, FVector::OneVector, FVector::OneVector, RotX, GizmoCenter }; } if (EnumHasAnyFlags(Flags, ECogDebug_GizmoFlags::NoScaleAxis) == false) { - GizmoElements[(uint8)ECogDebug_GizmoElementType::ScaleX] = { ECogDebug_GizmoType::ScaleAxis, ECogDebug_GizmoAxis::X, FVector::XAxisVector, UnitAxisX, RotX, GizmoCenter + UnitAxisX * Settings.GizmoScaleBoxOffset * GizmoScale }; - GizmoElements[(uint8)ECogDebug_GizmoElementType::ScaleY] = { ECogDebug_GizmoType::ScaleAxis, ECogDebug_GizmoAxis::Y, FVector::YAxisVector, UnitAxisY, RotY, GizmoCenter + UnitAxisY * Settings.GizmoScaleBoxOffset * GizmoScale }; - GizmoElements[(uint8)ECogDebug_GizmoElementType::ScaleZ] = { ECogDebug_GizmoType::ScaleAxis, ECogDebug_GizmoAxis::Z, FVector::ZAxisVector, UnitAxisZ, RotZ, GizmoCenter + UnitAxisZ * Settings.GizmoScaleBoxOffset * GizmoScale }; + GizmoElements[static_cast(ECogDebug_GizmoElementType::ScaleX)] = { ECogDebug_GizmoType::ScaleAxis, ECogDebug_GizmoAxis::X, FVector::XAxisVector, UnitAxisX, RotX, GizmoCenter + UnitAxisX * Settings.GizmoScaleBoxOffset * GizmoScale }; + GizmoElements[static_cast(ECogDebug_GizmoElementType::ScaleY)] = { ECogDebug_GizmoType::ScaleAxis, ECogDebug_GizmoAxis::Y, FVector::YAxisVector, UnitAxisY, RotY, GizmoCenter + UnitAxisY * Settings.GizmoScaleBoxOffset * GizmoScale }; + GizmoElements[static_cast(ECogDebug_GizmoElementType::ScaleZ)] = { ECogDebug_GizmoType::ScaleAxis, ECogDebug_GizmoAxis::Z, FVector::ZAxisVector, UnitAxisZ, RotZ, GizmoCenter + UnitAxisZ * Settings.GizmoScaleBoxOffset * GizmoScale }; } ECogDebug_GizmoElementType HoveredElementType = ECogDebug_GizmoElementType::MAX; @@ -306,7 +306,7 @@ bool FCogDebug_Gizmo::Draw(const char* Id, const APlayerController& InPlayerCont else if (IO.WantCaptureMouse == false) { float MinDistanceToMouse = FLT_MAX; - for (uint8 i = (uint8)ECogDebug_GizmoElementType::MoveX; i < (uint8)ECogDebug_GizmoElementType::MAX; ++i) + for (uint8 i = static_cast(ECogDebug_GizmoElementType::MoveX); i < static_cast(ECogDebug_GizmoElementType::MAX); ++i) { FCogDebug_GizmoElement& Elm = GizmoElements[i]; float DistanceToMouse = FLT_MAX; @@ -345,17 +345,17 @@ bool FCogDebug_Gizmo::Draw(const char* Id, const APlayerController& InPlayerCont if (DistanceToMouse < Settings.GizmoCursorSelectionThreshold && DistanceToMouse < MinDistanceToMouse) { - HoveredElementType = (ECogDebug_GizmoElementType)i; + HoveredElementType = static_cast(i); MinDistanceToMouse = DistanceToMouse; } } } - for (uint8 i = (uint8)ECogDebug_GizmoElementType::MoveX; i < (uint8)ECogDebug_GizmoElementType::MAX; ++i) + for (uint8 i = static_cast(ECogDebug_GizmoElementType::MoveX); i < static_cast(ECogDebug_GizmoElementType::MAX); ++i) { const FCogDebug_GizmoElement& Elm = GizmoElements[i]; - const bool IsClosestToMouse = i == (uint8)HoveredElementType; - const uint8 AxisIndex = (uint8)Elm.AxisType; + const bool IsClosestToMouse = i == static_cast(HoveredElementType); + const uint8 AxisIndex = static_cast(Elm.AxisType); const FColor ZLowColor = IsClosestToMouse ? GizmoAxisColorsSelection[AxisIndex] : GizmoAxisColorsZLow[AxisIndex]; const FColor ZHighColor = IsClosestToMouse ? GizmoAxisColorsSelection[AxisIndex] : GizmoAxisColorsZHigh[AxisIndex]; @@ -425,7 +425,7 @@ bool FCogDebug_Gizmo::Draw(const char* Id, const APlayerController& InPlayerCont } else if (ImGui::IsMouseDragging(ImGuiMouseButton_Left, Settings.GizmoCursorDraggingThreshold)) { - const FCogDebug_GizmoElement& DraggedElement = GizmoElements[(uint8)DraggedElementType]; + const FCogDebug_GizmoElement& DraggedElement = GizmoElements[static_cast(DraggedElementType)]; switch (DraggedElement.Type) { diff --git a/Plugins/Cog/Source/CogDebug/Private/CogDebugHelper.cpp b/Plugins/Cog/Source/CogDebug/Private/CogDebugHelper.cpp index 29213bc..693337d 100644 --- a/Plugins/Cog/Source/CogDebug/Private/CogDebugHelper.cpp +++ b/Plugins/Cog/Source/CogDebug/Private/CogDebugHelper.cpp @@ -12,8 +12,8 @@ FColor FCogDebugHelper::GetAutoColor(FName Name, const FColor& UserColor) const uint32 Hash = GetTypeHash(Name.ToString()); FMath::RandInit(Hash); - const uint8 Hue = (uint8)(FMath::FRand() * 255); - const uint8 Saturation = 255; + const uint8 Hue = static_cast(FMath::FRand() * 255); + constexpr uint8 Saturation = 255; const uint8 Value = FMath::Rand() > 0.5f ? 200 : 255; return FLinearColor::MakeFromHSV8(Hue, Saturation, Value).ToFColor(true); @@ -33,9 +33,8 @@ const char* FCogDebugHelper::VerbosityToString(ELogVerbosity::Type Verbosity) case ELogVerbosity::Log: return "Log"; case ELogVerbosity::Verbose: return "Verbose"; case ELogVerbosity::VeryVerbose: return "Very Verbose"; + default: return "None"; } - - return "None"; } //-------------------------------------------------------------------------------------------------------------------------- diff --git a/Plugins/Cog/Source/CogDebug/Private/CogDebugLog.cpp b/Plugins/Cog/Source/CogDebug/Private/CogDebugLog.cpp index 8e2f424..ef25a0b 100644 --- a/Plugins/Cog/Source/CogDebug/Private/CogDebugLog.cpp +++ b/Plugins/Cog/Source/CogDebug/Private/CogDebugLog.cpp @@ -97,16 +97,16 @@ ELogVerbosity::Type FCogDebugLog::GetServerVerbosity(const FName CategoryName) } //-------------------------------------------------------------------------------------------------------------------------- -void FCogDebugLog::SetServerVerbosity(UWorld& World, const FName CategoryName, ELogVerbosity::Type Verbosity) +void FCogDebugLog::SetServerVerbosity(const UWorld& World, const FName CategoryName, ELogVerbosity::Type Verbosity) { if (ACogDebugReplicator* Replicator = ACogDebugReplicator::GetLocalReplicator(World)) { - Replicator->Server_SetCategoryVerbosity(CategoryName, (ECogLogVerbosity)Verbosity); + Replicator->Server_SetCategoryVerbosity(CategoryName, static_cast(Verbosity)); } } //-------------------------------------------------------------------------------------------------------------------------- -void FCogDebugLog::SetServerVerbosityActive(UWorld& World, const FName CategoryName, const bool Value) +void FCogDebugLog::SetServerVerbosityActive(const UWorld& World, const FName CategoryName, const bool Value) { SetServerVerbosity(World, CategoryName, Value ? ELogVerbosity::Verbose : ELogVerbosity::Warning); } diff --git a/Plugins/Cog/Source/CogDebug/Private/CogDebugLogBlueprint.cpp b/Plugins/Cog/Source/CogDebug/Private/CogDebugLogBlueprint.cpp index ed45fb2..3f90a7c 100644 --- a/Plugins/Cog/Source/CogDebug/Private/CogDebugLogBlueprint.cpp +++ b/Plugins/Cog/Source/CogDebug/Private/CogDebugLogBlueprint.cpp @@ -30,6 +30,7 @@ void UCogDebugLogBlueprint::Log(const UObject* WorldContextObject, const FCogLog } //-------------------------------------------------------------------------------------------------------------------------- +// ReSharper disable once CppPassValueParameterByConstReference bool UCogDebugLogBlueprint::IsLogActive(const UObject* WorldContextObject, const FCogLogCategory LogCategory) { #if ENABLE_COG diff --git a/Plugins/Cog/Source/CogDebug/Private/CogDebugPlotEvent.cpp b/Plugins/Cog/Source/CogDebug/Private/CogDebugPlotEvent.cpp index 7e7260d..50c4237 100644 --- a/Plugins/Cog/Source/CogDebug/Private/CogDebugPlotEvent.cpp +++ b/Plugins/Cog/Source/CogDebug/Private/CogDebugPlotEvent.cpp @@ -104,9 +104,9 @@ FCogDebugPlotEvent& FCogDebugEventHistory::AddEvent( //---------------------------- StopEvent(EventId); - FCogDebugPlotEvent* Event = nullptr; - - int32 AddedIndex = 0; + FCogDebugPlotEvent* Event; + int32 AddedIndex; + if (Events.Num() < Events.Max()) { Event = &Events.AddDefaulted_GetRef(); diff --git a/Plugins/Cog/Source/CogDebug/Private/CogDebugReplicator.cpp b/Plugins/Cog/Source/CogDebug/Private/CogDebugReplicator.cpp index a2a95d2..2517fe3 100644 --- a/Plugins/Cog/Source/CogDebug/Private/CogDebugReplicator.cpp +++ b/Plugins/Cog/Source/CogDebug/Private/CogDebugReplicator.cpp @@ -1,12 +1,10 @@ #include "CogDebugReplicator.h" #include "CogDebug.h" -#include "CogDebugDraw.h" #include "CogDebugLog.h" #include "EngineUtils.h" #include "GameFramework/PlayerController.h" #include "GameFramework/WorldSettings.h" -#include "Net/Core/PushModel/PushModel.h" #include "Net/UnrealNetwork.h" //-------------------------------------------------------------------------------------------------------------------------- @@ -27,17 +25,18 @@ ACogDebugReplicator* ACogDebugReplicator::Spawn(APlayerController* Controller) //-------------------------------------------------------------------------------------------------------------------------- ACogDebugReplicator* ACogDebugReplicator::GetLocalReplicator(const UWorld& World) { - for (TActorIterator It(&World, StaticClass()); It; ++It) + const TActorIterator It(&World, StaticClass()); + if (It) { ACogDebugReplicator* Replicator = *It; - return Replicator; + return Replicator; } - + return nullptr; } //-------------------------------------------------------------------------------------------------------------------------- -void ACogDebugReplicator::GetRemoteReplicators(UWorld& World, TArray& Replicators) +void ACogDebugReplicator::GetRemoteReplicators(const UWorld& World, TArray& Replicators) { for (TActorIterator It(&World, ACogDebugReplicator::StaticClass()); It; ++It) { @@ -104,7 +103,7 @@ void ACogDebugReplicator::TickActor(float DeltaTime, enum ELevelTick TickType, F #if !UE_BUILD_SHIPPING Super::TickActor(DeltaTime, TickType, ThisTickFunction); - if (OwnerPlayerController) + if (OwnerPlayerController.IsValid()) { if (GetWorld()->GetNetMode() == NM_Client) { @@ -128,7 +127,7 @@ void ACogDebugReplicator::Server_SetCategoryVerbosity_Implementation(FName LogCa { if (const FCogDebugLogCategoryInfo* LogCategoryInfo = FCogDebugLog::FindLogCategoryInfo(LogCategoryName)) { - LogCategoryInfo->LogCategory->SetVerbosity((ELogVerbosity::Type)Verbosity); + LogCategoryInfo->LogCategory->SetVerbosity(static_cast(Verbosity)); TArray CategoriesData; CategoriesData.Add({ LogCategoryName, Verbosity }); @@ -148,7 +147,7 @@ void ACogDebugReplicator::NetMulticast_SendCategoriesVerbosity_Implementation(co { for (const FCogServerCategoryData& Category : Categories) { - FCogDebugLog::OnServerVerbosityChanged(Category.LogCategoryName, (ELogVerbosity::Type)Category.Verbosity); + FCogDebugLog::OnServerVerbosityChanged(Category.LogCategoryName, static_cast(Category.Verbosity)); } } @@ -164,7 +163,7 @@ void ACogDebugReplicator::Client_SendCategoriesVerbosity_Implementation(const TA { for (const FCogServerCategoryData& Category : Categories) { - FCogDebugLog::OnServerVerbosityChanged(Category.LogCategoryName, (ELogVerbosity::Type)Category.Verbosity); + FCogDebugLog::OnServerVerbosityChanged(Category.LogCategoryName, static_cast(Category.Verbosity)); } } @@ -188,7 +187,7 @@ void ACogDebugReplicator::Server_RequestAllCategoriesVerbosity_Implementation() CategoriesData.Add( { CategoryInfo.LogCategory->GetCategoryName(), - (ECogLogVerbosity)CategoryInfo.LogCategory->GetVerbosity() + static_cast(CategoryInfo.LogCategory->GetVerbosity()) }); } } @@ -248,14 +247,14 @@ public: //-------------------------------------------------------------------------------------------------------------------------- // FCogReplicatorNetPack //-------------------------------------------------------------------------------------------------------------------------- -bool FCogReplicatorNetPack::NetDeltaSerialize(FNetDeltaSerializeInfo& DeltaParms) +bool FCogReplicatorNetPack::NetDeltaSerialize(FNetDeltaSerializeInfo& DeltaParams) { - if (DeltaParms.bUpdateUnmappedObjects || Owner == nullptr) + if (DeltaParams.bUpdateUnmappedObjects || Owner == nullptr) { return true; } - if (DeltaParms.Writer) + if (DeltaParams.Writer) { const bool bIsOwnerClient = !Owner->bHasAuthority; if (bIsOwnerClient) @@ -263,10 +262,10 @@ bool FCogReplicatorNetPack::NetDeltaSerialize(FNetDeltaSerializeInfo& DeltaParms return false; } - const FCogReplicatorNetState* OldState = static_cast(DeltaParms.OldState); + const FCogReplicatorNetState* OldState = static_cast(DeltaParams.OldState); FCogReplicatorNetState* NewState = new FCogReplicatorNetState(); - check(DeltaParms.NewState); - *DeltaParms.NewState = TSharedPtr(NewState); + check(DeltaParams.NewState); + *DeltaParams.NewState = TSharedPtr(NewState); //------------------------------------------------------------------------------------------------------------------ // Find delta to replicate @@ -289,7 +288,7 @@ bool FCogReplicatorNetPack::NetDeltaSerialize(FNetDeltaSerializeInfo& DeltaParms const bool bMissingOldState = (OldState == nullptr); const uint8 ShouldUpdateShapes = bMissingOldState || (OldState->ShapesRepCounter != NewState->ShapesRepCounter); - FBitWriter& Writer = *DeltaParms.Writer; + FBitWriter& Writer = *DeltaParams.Writer; Writer.WriteBit(ShouldUpdateShapes); if (ShouldUpdateShapes) { @@ -297,12 +296,12 @@ bool FCogReplicatorNetPack::NetDeltaSerialize(FNetDeltaSerializeInfo& DeltaParms } } } - else if (DeltaParms.Reader) + else if (DeltaParams.Reader) { //------------------------------------------------------------------------------------------------------------------ // Read //------------------------------------------------------------------------------------------------------------------ - FBitReader& Reader = *DeltaParms.Reader; + FBitReader& Reader = *DeltaParams.Reader; const uint8 ShouldUpdateShapes = Reader.ReadBit(); if (ShouldUpdateShapes) { diff --git a/Plugins/Cog/Source/CogDebug/Public/CogDebug.h b/Plugins/Cog/Source/CogDebug/Public/CogDebug.h index 7a4b517..0ecdc63 100644 --- a/Plugins/Cog/Source/CogDebug/Public/CogDebug.h +++ b/Plugins/Cog/Source/CogDebug/Public/CogDebug.h @@ -392,7 +392,7 @@ public: static bool GetIsFilteringBySelection(); - static void SetIsFilteringBySelection(UWorld* World, bool Value); + static void SetIsFilteringBySelection(const UWorld* World, bool Value); static bool GetDebugPersistent(bool bPersistent); diff --git a/Plugins/Cog/Source/CogDebug/Public/CogDebugDrawBlueprint.h b/Plugins/Cog/Source/CogDebug/Public/CogDebugDrawBlueprint.h index a2adf59..560d9a5 100644 --- a/Plugins/Cog/Source/CogDebug/Public/CogDebugDrawBlueprint.h +++ b/Plugins/Cog/Source/CogDebug/Public/CogDebugDrawBlueprint.h @@ -1,7 +1,7 @@ +// ReSharper disable CppUEBlueprintCallableFunctionUnused #pragma once #include "CoreMinimal.h" -#include "Kismet/KismetSystemLibrary.h" #include "CogDebugDrawBlueprint.generated.h" //-------------------------------------------------------------------------------------------------------------------------- diff --git a/Plugins/Cog/Source/CogDebug/Public/CogDebugDrawHelper.h b/Plugins/Cog/Source/CogDebug/Public/CogDebugDrawHelper.h index 02c7e01..a5eb401 100644 --- a/Plugins/Cog/Source/CogDebug/Public/CogDebugDrawHelper.h +++ b/Plugins/Cog/Source/CogDebug/Public/CogDebugDrawHelper.h @@ -70,7 +70,7 @@ public: 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 DrawLineTrace(const UWorld* World, const FVector& Start, const FVector& End, const bool HasHits, const 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/CogDebugDrawImGui.h b/Plugins/Cog/Source/CogDebug/Public/CogDebugDrawImGui.h index ce81d0c..f23cc4b 100644 --- a/Plugins/Cog/Source/CogDebug/Public/CogDebugDrawImGui.h +++ b/Plugins/Cog/Source/CogDebug/Public/CogDebugDrawImGui.h @@ -92,7 +92,6 @@ private: template static void DrawShapes(TArray& Shapes, TDrawFunction DrawFunction) { - ImDrawList* ImDrawList = ImGui::GetBackgroundDrawList(); const double Time = ImGui::GetCurrentContext()->Time; for (int32 i = 0; i < Shapes.Num(); i++) diff --git a/Plugins/Cog/Source/CogDebug/Public/CogDebugLog.h b/Plugins/Cog/Source/CogDebug/Public/CogDebugLog.h index c589767..d2be2ba 100644 --- a/Plugins/Cog/Source/CogDebug/Public/CogDebugLog.h +++ b/Plugins/Cog/Source/CogDebug/Public/CogDebugLog.h @@ -46,13 +46,13 @@ struct COGDEBUG_API FCogDebugLog static TMap& GetLogCategories() { return LogCategories; } - static void SetServerVerbosityActive(UWorld& World, FName CategoryName, bool Value); + static void SetServerVerbosityActive(const UWorld& World, FName CategoryName, bool Value); static bool IsServerVerbosityActive(FName CategoryName); static ELogVerbosity::Type GetServerVerbosity(FName CategoryName); - static void SetServerVerbosity(UWorld& World, FName CategoryName, ELogVerbosity::Type Verbosity); + static void SetServerVerbosity(const UWorld& World, FName CategoryName, ELogVerbosity::Type Verbosity); static void OnServerVerbosityChanged(FName CategoryName, ELogVerbosity::Type Verbosity); diff --git a/Plugins/Cog/Source/CogDebug/Public/CogDebugModule.h b/Plugins/Cog/Source/CogDebug/Public/CogDebugModule.h index 28e8417..c1aee7f 100644 --- a/Plugins/Cog/Source/CogDebug/Public/CogDebugModule.h +++ b/Plugins/Cog/Source/CogDebug/Public/CogDebugModule.h @@ -10,7 +10,7 @@ class COGDEBUG_API FCogDebugModule : public IModuleInterface { public: - static inline FCogDebugModule& Get() { return FModuleManager::LoadModuleChecked("CogDebug"); } + static FCogDebugModule& Get() { return FModuleManager::LoadModuleChecked("CogDebug"); } virtual void StartupModule() override; diff --git a/Plugins/Cog/Source/CogDebug/Public/CogDebugNotification.h b/Plugins/Cog/Source/CogDebug/Public/CogDebugNotification.h deleted file mode 100644 index 0000efc..0000000 --- a/Plugins/Cog/Source/CogDebug/Public/CogDebugNotification.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -#include "CoreMinimal.h" - - -#ifdef ENABLE_COG - - -#endif //ENABLE_COG - diff --git a/Plugins/Cog/Source/CogDebug/Public/CogDebugPlot.h b/Plugins/Cog/Source/CogDebug/Public/CogDebugPlot.h index bb625d0..ca43c41 100644 --- a/Plugins/Cog/Source/CogDebug/Public/CogDebugPlot.h +++ b/Plugins/Cog/Source/CogDebug/Public/CogDebugPlot.h @@ -3,7 +3,6 @@ #include "CoreMinimal.h" #include "CogCommon.h" #include "imgui.h" -#include "implot.h" #ifdef ENABLE_COG diff --git a/Plugins/Cog/Source/CogDebug/Public/CogDebugReplicator.h b/Plugins/Cog/Source/CogDebug/Public/CogDebugReplicator.h index 8ddcc1a..60d459c 100644 --- a/Plugins/Cog/Source/CogDebug/Public/CogDebugReplicator.h +++ b/Plugins/Cog/Source/CogDebug/Public/CogDebugReplicator.h @@ -32,9 +32,9 @@ struct FCogReplicatorNetPack { GENERATED_USTRUCT_BODY() - ACogDebugReplicator* Owner = nullptr; + TObjectPtr Owner; - bool NetDeltaSerialize(FNetDeltaSerializeInfo& DeltaParms); + bool NetDeltaSerialize(FNetDeltaSerializeInfo& DeltaParams); private: @@ -63,7 +63,7 @@ public: static ACogDebugReplicator* GetLocalReplicator(const UWorld& World); - static void GetRemoteReplicators(UWorld& World, TArray& Replicators); + static void GetRemoteReplicators(const UWorld& World, TArray& Replicators); virtual void BeginPlay() override; @@ -98,7 +98,7 @@ public: protected: friend FCogReplicatorNetPack; - TObjectPtr OwnerPlayerController; + TWeakObjectPtr OwnerPlayerController; uint32 bHasAuthority : 1; diff --git a/Plugins/Cog/Source/CogDebug/Public/CogDebugShape.h b/Plugins/Cog/Source/CogDebug/Public/CogDebugShape.h index de3a1aa..e69b60d 100644 --- a/Plugins/Cog/Source/CogDebug/Public/CogDebugShape.h +++ b/Plugins/Cog/Source/CogDebug/Public/CogDebugShape.h @@ -30,7 +30,7 @@ struct COGDEBUG_API FCogDebugShape { ECogDebugShape Type = ECogDebugShape::Invalid; TArray ShapeData; - FColor Color; + FColor Color = FColor::White; bool bPersistent = false; float Thickness = 0.0f; uint8 DepthPriority = 0; diff --git a/Plugins/Cog/Source/CogDebugEditor/Private/CogDebugEditorModule.cpp b/Plugins/Cog/Source/CogDebugEditor/Private/CogDebugEditorModule.cpp index 25a2e03..3dcd6e8 100644 --- a/Plugins/Cog/Source/CogDebugEditor/Private/CogDebugEditorModule.cpp +++ b/Plugins/Cog/Source/CogDebugEditor/Private/CogDebugEditorModule.cpp @@ -18,7 +18,7 @@ private: /** Pin factory for abilities graph; Cached so it can be unregistered */ TSharedPtr GraphPanelPinFactory; - EAssetTypeCategories::Type AssetCategory; + EAssetTypeCategories::Type AssetCategory = EAssetTypeCategories::None; }; IMPLEMENT_MODULE(FCogDebugEditorModule, CogDebugEditor); diff --git a/Plugins/Cog/Source/CogDebugEditor/Private/CogDebugLogCategoryDetails.cpp b/Plugins/Cog/Source/CogDebugEditor/Private/CogDebugLogCategoryDetails.cpp index bf4e93b..a9b5abc 100644 --- a/Plugins/Cog/Source/CogDebugEditor/Private/CogDebugLogCategoryDetails.cpp +++ b/Plugins/Cog/Source/CogDebugEditor/Private/CogDebugLogCategoryDetails.cpp @@ -64,7 +64,7 @@ void FCogLogCategoryDetails::CustomizeChildren(TSharedRef Struc } //-------------------------------------------------------------------------------------------------------------------------- -void FCogLogCategoryDetails::OnLogCategoryChanged(FName SelectedName) +void FCogLogCategoryDetails::OnLogCategoryChanged(const FName SelectedName) const { if (NameProperty.IsValid()) { diff --git a/Plugins/Cog/Source/CogDebugEditor/Private/SCogDebugLogCategoryWidget.cpp b/Plugins/Cog/Source/CogDebugEditor/Private/SCogDebugLogCategoryWidget.cpp index 9853b55..1e94a1c 100644 --- a/Plugins/Cog/Source/CogDebugEditor/Private/SCogDebugLogCategoryWidget.cpp +++ b/Plugins/Cog/Source/CogDebugEditor/Private/SCogDebugLogCategoryWidget.cpp @@ -123,7 +123,7 @@ public: */ void Construct(const FArguments& InArgs); - virtual ~SLogCategoryListWidget(); + virtual ~SLogCategoryListWidget() override; private: typedef TTextFilter FLogCategoryTextFilter; @@ -132,10 +132,10 @@ private: void OnFilterTextChanged(const FText& InFilterText); /** Creates the row widget when called by Slate when an item appears on the list. */ - TSharedRef< ITableRow > OnGenerateRowForLogCategoryViewer(TSharedPtr Item, const TSharedRef< STableViewBase >& OwnerTable); + TSharedRef< ITableRow > OnGenerateRowForLogCategoryViewer(TSharedPtr Item, const TSharedRef< STableViewBase >& OwnerTable) const; /** Called by Slate when an item is selected from the tree/list. */ - void OnLogCategorySelectionChanged(TSharedPtr Item, ESelectInfo::Type SelectInfo); + void OnLogCategorySelectionChanged(TSharedPtr Item, ESelectInfo::Type SelectInfo) const; /** Updates the list of items in the dropdown menu */ TSharedPtr UpdatePropertyOptions(); @@ -146,7 +146,7 @@ private: /** The search box */ TSharedPtr SearchBoxPtr; - /** Holds the Slate List widget which holds the LogCategorys for the LogCategory Viewer. */ + /** Holds the Slate List widget which holds the LogCategory for the LogCategory Viewer. */ TSharedPtr >> LogCategoryList; /** Array of items that can be selected in the dropdown menu */ @@ -229,7 +229,7 @@ void SLogCategoryListWidget::Construct(const FArguments& InArgs) } //-------------------------------------------------------------------------------------------------------------------------- -TSharedRef SLogCategoryListWidget::OnGenerateRowForLogCategoryViewer(TSharedPtr Item, const TSharedRef< STableViewBase >& OwnerTable) +TSharedRef SLogCategoryListWidget::OnGenerateRowForLogCategoryViewer(TSharedPtr Item, const TSharedRef< STableViewBase >& OwnerTable) const { TSharedRef< SLogCategoryItem > ReturnRow = SNew(SLogCategoryItem, OwnerTable) .HighlightText(SearchBoxPtr->GetText()) @@ -273,7 +273,7 @@ void SLogCategoryListWidget::OnFilterTextChanged(const FText& InFilterText) } //-------------------------------------------------------------------------------------------------------------------------- -void SLogCategoryListWidget::OnLogCategorySelectionChanged(TSharedPtr Item, ESelectInfo::Type SelectInfo) +void SLogCategoryListWidget::OnLogCategorySelectionChanged(TSharedPtr Item, ESelectInfo::Type SelectInfo) const { OnLogCategoryPicked.ExecuteIfBound(Item->Name); } diff --git a/Plugins/Cog/Source/CogDebugEditor/Public/CogDebugEditorModule.h b/Plugins/Cog/Source/CogDebugEditor/Public/CogDebugEditorModule.h index 325d98e..80fdd3f 100644 --- a/Plugins/Cog/Source/CogDebugEditor/Public/CogDebugEditorModule.h +++ b/Plugins/Cog/Source/CogDebugEditor/Public/CogDebugEditorModule.h @@ -1,4 +1,3 @@ - #pragma once #include "Modules/ModuleInterface.h" @@ -9,7 +8,7 @@ class ICogDebugEditorModule : public IModuleInterface public: - static inline ICogDebugEditorModule& Get() { return FModuleManager::LoadModuleChecked("CogDebugEditor"); } + static ICogDebugEditorModule& Get() { return FModuleManager::LoadModuleChecked("CogDebugEditor"); } - static inline bool IsAvailable() { return FModuleManager::Get().IsModuleLoaded("CogDebugEditor"); } + static bool IsAvailable() { return FModuleManager::Get().IsModuleLoaded("CogDebugEditor"); } }; diff --git a/Plugins/Cog/Source/CogDebugEditor/Public/CogDebugGraphPanelPinFactory.h b/Plugins/Cog/Source/CogDebugEditor/Public/CogDebugGraphPanelPinFactory.h index 720c5fb..e985172 100644 --- a/Plugins/Cog/Source/CogDebugEditor/Public/CogDebugGraphPanelPinFactory.h +++ b/Plugins/Cog/Source/CogDebugEditor/Public/CogDebugGraphPanelPinFactory.h @@ -17,6 +17,6 @@ class FCogGraphPanelPinFactory : public FGraphPanelPinFactory { return SNew(SCogLogCategoryGraphPin, InPin); } - return NULL; + return nullptr; } }; diff --git a/Plugins/Cog/Source/CogDebugEditor/Public/CogDebugLogCategoryDetails.h b/Plugins/Cog/Source/CogDebugEditor/Public/CogDebugLogCategoryDetails.h index 9370525..db8f475 100644 --- a/Plugins/Cog/Source/CogDebugEditor/Public/CogDebugLogCategoryDetails.h +++ b/Plugins/Cog/Source/CogDebugEditor/Public/CogDebugLogCategoryDetails.h @@ -20,5 +20,5 @@ private: TSharedPtr NameProperty; TArray> PropertyOptions; - void OnLogCategoryChanged(FName SelectedName); + void OnLogCategoryChanged(FName SelectedName) const; }; diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineHelper.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineHelper.cpp index d663d48..ccea503 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineHelper.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineHelper.cpp @@ -1,7 +1,6 @@ #include "CogEngineHelper.h" #include "CogEngineReplicator.h" -#include "CogWindowHelper.h" #include "CogWindowWidgets.h" #include "imgui.h" #include "GameFramework/Actor.h" @@ -55,4 +54,17 @@ void FCogEngineHelper::ActorContextMenu(AActor& Actor) } } +} + +//-------------------------------------------------------------------------------------------------------------------------- +void FCogEngineHelper::RenderConfigureMessage(const TWeakObjectPtr InAsset) +{ + if (InAsset == nullptr) + { + ImGui::Text("Create a DataAsset child of '%s' to configure. ", StringCast(*UCogEngineDataAsset::StaticClass()->GetName()).Get()); + } + else + { + ImGui::Text("Can be configured in the '%s' DataAsset. ", StringCast(*GetNameSafe(InAsset.Get())).Get()); + } } \ No newline at end of file diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineReplicator.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineReplicator.cpp index 27fe119..75179a7 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineReplicator.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineReplicator.cpp @@ -32,12 +32,13 @@ ACogEngineReplicator* ACogEngineReplicator::Spawn(APlayerController* Controller) //-------------------------------------------------------------------------------------------------------------------------- ACogEngineReplicator* ACogEngineReplicator::GetLocalReplicator(const UWorld& World) { - for (TActorIterator It(&World, StaticClass()); It; ++It) + const TActorIterator It(&World, StaticClass()); + if (It) { ACogEngineReplicator* Replicator = *It; return Replicator; } - + return nullptr; } diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Audio.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Audio.cpp index 5db3d27..3914499 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Audio.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Audio.cpp @@ -5,9 +5,7 @@ //-------------------------------------------------------------------------------------------------------------------------- void FCogEngineWindow_Audio::RenderHelp() { - ImGui::Text( - "This window displays audio settings. " - ); + ImGui::Text("This window displays audio settings."); } //-------------------------------------------------------------------------------------------------------------------------- diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Cheats.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Cheats.cpp index 1df1a32..cd8e798 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Cheats.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Cheats.cpp @@ -3,6 +3,7 @@ #include "CogEngineDataAsset.h" #include "CogEngineReplicator.h" #include "CogCommonAllegianceActorInterface.h" +#include "CogEngineHelper.h" #include "CogImguiHelper.h" #include "CogWindowConsoleCommandManager.h" #include "CogWindowWidgets.h" @@ -22,14 +23,7 @@ void FCogEngineWindow_Cheats::RenderHelp() " [SHIFT] to apply the cheat to the enemies of the selected actor\n" ); - if (Asset == nullptr) - { - ImGui::Text("Create a DataAsset child of 'CogEngineDataAsset' to configure the cheats. "); - } - else - { - ImGui::Text("The cheats can be configured in the '%s' data asset. ", StringCast(*GetNameSafe(Asset.Get())).Get()); - } + FCogEngineHelper::RenderConfigureMessage(Asset); } //-------------------------------------------------------------------------------------------------------------------------- @@ -46,7 +40,7 @@ void FCogEngineWindow_Cheats::Initialize() TEXT("Cog.Cheat"), TEXT("Apply a cheat to the selection. Cog.Cheat -Allies -Enemies -Controlled"), GetWorld(), - FCogWindowConsoleCommandDelegate::CreateLambda([this](const TArray& InArgs, UWorld* InWorld) + FCogWindowConsoleCommandDelegate::CreateLambda([this](const TArray& InArgs, const UWorld* InWorld) { if (InArgs.Num() > 0) { @@ -60,7 +54,7 @@ void FCogEngineWindow_Cheats::Initialize() ACogEngineReplicator* Replicator = ACogEngineReplicator::GetLocalReplicator(*InWorld); if (Replicator == nullptr) { - UE_LOG(LogCogImGui, Warning, TEXT("Cog.Cheat %s | Repliactor not found"), *InArgs[0]); + UE_LOG(LogCogImGui, Warning, TEXT("Cog.Cheat %s | Replicator not found"), *InArgs[0]); return; } diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_CollisionTester.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_CollisionTester.cpp index eaf4046..bb49872 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_CollisionTester.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_CollisionTester.cpp @@ -145,13 +145,12 @@ void FCogEngineWindow_CollisionTester::RenderContent() { CollisionTester->ProfileIndex = i; CollisionTester->ObjectTypesToQuery = 0; - SelectedProfile = CollisionProfile->GetProfileByIndex(CollisionTester->ProfileIndex); if (Profile->CollisionEnabled != ECollisionEnabled::NoCollision) { for (int j = 0; j < ECC_MAX; ++j) { - const ECollisionResponse Response = Profile->ResponseToChannels.GetResponse((ECollisionChannel)j); + const ECollisionResponse Response = Profile->ResponseToChannels.GetResponse(static_cast(j)); if (Response != ECR_Ignore) { CollisionTester->ObjectTypesToQuery |= ECC_TO_BITFIELD(j); diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_CollisionViewer.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_CollisionViewer.cpp index 54f1582..5fbcc21 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_CollisionViewer.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_CollisionViewer.cpp @@ -2,7 +2,6 @@ #include "CogDebugDrawHelper.h" #include "CogDebug.h" -#include "CogEngineCollisionTester.h" #include "CogImguiHelper.h" #include "CogWindowWidgets.h" #include "Components/PrimitiveComponent.h" @@ -120,7 +119,7 @@ void FCogEngineWindow_CollisionViewer::RenderContent() { for (int j = 0; j < ECC_MAX; ++j) { - ECollisionResponse Response = Profile->ResponseToChannels.GetResponse((ECollisionChannel)j); + ECollisionResponse Response = Profile->ResponseToChannels.GetResponse(static_cast(j)); if (Response != ECR_Ignore) { Config->ObjectTypesToQuery |= ECC_TO_BITFIELD(j); @@ -182,6 +181,8 @@ void FCogEngineWindow_CollisionViewer::RenderContent() QueryRadius = Config->QueryThickness; break; } + + default: break; } static const FName TraceTag(TEXT("FCogWindow_Collision")); diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Console.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Console.cpp index 7df8f5a..2d81d41 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Console.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Console.cpp @@ -1,14 +1,9 @@ #include "CogEngineWindow_Console.h" -#include "CogCommon.h" #include "CogImguiHelper.h" #include "CogWindowManager.h" #include "CogWindowWidgets.h" #include "imgui.h" -#include "imgui.h" -#include "imgui.h" -#include "imgui.h" -#include "imgui.h" #include "imgui_internal.h" //-------------------------------------------------------------------------------------------------------------------------- @@ -200,7 +195,7 @@ void FCogEngineWindow_Console::RenderMenu() RefreshCommandList(); } - ImGui::ColorEdit4("History Color", (float*)&Config->HistoryColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); + ImGui::ColorEdit4("History Color", &Config->HistoryColor.X, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); FCogWindowWidgets::ThinSeparatorText("Window"); diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Inspector.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Inspector.cpp index 1c0785c..5bed8a9 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Inspector.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Inspector.cpp @@ -57,14 +57,14 @@ void FCogEngineWindow_Inspector::SetInspectedObject(UObject* Value) //-------------------------------------------------------------------------------------------------------------------------- void FCogEngineWindow_Inspector::AddFavorite(UObject* Object) { - Favorite& Favorite = Favorites.AddDefaulted_GetRef(); + FFavorite& Favorite = Favorites.AddDefaulted_GetRef(); Favorite.Object = Object; } //-------------------------------------------------------------------------------------------------------------------------- void FCogEngineWindow_Inspector::AddFavorite(UObject* Object, FCogEngineInspectorApplyFunction ApplyFunction) { - Favorite& Favorite = Favorites.AddDefaulted_GetRef(); + FFavorite& Favorite = Favorites.AddDefaulted_GetRef(); Favorite.Object = Object; Favorite.ApplyFunction = ApplyFunction; } @@ -110,7 +110,7 @@ void FCogEngineWindow_Inspector::RenderContent() //-------------------------------------------------------------------------------------------------------------------------- FCogEngineInspectorApplyFunction FCogEngineWindow_Inspector::FindObjectApplyFunction(const UObject* Object) const { - for (const Favorite& Favorite : Favorites) + for (const FFavorite& Favorite : Favorites) { if (Favorite.Object == Object) { @@ -206,7 +206,7 @@ void FCogEngineWindow_Inspector::RenderMenu() } ImGui::PushID("Favorites"); - for (Favorite& Favorite : Favorites) + for (FFavorite& Favorite : Favorites) { const TWeakObjectPtr& Object = Favorite.Object; if (ImGui::MenuItem(TCHAR_TO_ANSI(*GetNameSafe(Object.Get())))) @@ -273,7 +273,7 @@ void FCogEngineWindow_Inspector::RenderMenu() ImGui::Checkbox("Sort by Name", &Config->bSortByName); ImGui::Checkbox("Show Background", &Config->bShowRowBackground); - ImGui::Checkbox("Show Sorders", &Config->bShowBorders); + ImGui::Checkbox("Show Borders", &Config->bShowBorders); #if WITH_EDITORONLY_DATA ImGui::Checkbox("Show Display Name", &Config->bShowDisplayName); ImGui::Checkbox("Show Categories", &Config->bShowCategories); @@ -680,7 +680,7 @@ bool FCogEngineWindow_Inspector::RenderByte(const FByteProperty* ByteProperty, u if (ImGui::InputInt("##Byte", &Value)) { HasChanged = true; - ByteProperty->SetPropertyValue(PointerToValue, (uint8)Value); + ByteProperty->SetPropertyValue(PointerToValue, static_cast(Value)); } return HasChanged; @@ -695,7 +695,7 @@ bool FCogEngineWindow_Inspector::RenderInt8(const FInt8Property* Int8Property, u if (ImGui::InputInt("##Int8", &Value)) { HasChanged = true; - Int8Property->SetPropertyValue(PointerToValue, (int8)Value); + Int8Property->SetPropertyValue(PointerToValue, static_cast(Value)); } return HasChanged; @@ -721,11 +721,11 @@ bool FCogEngineWindow_Inspector::RenderInt64(const FInt64Property* Int64Property { bool HasChanged = false; - int Value = (int)Int64Property->GetPropertyValue(PointerToValue); + int Value = static_cast(Int64Property->GetPropertyValue(PointerToValue)); if (ImGui::InputInt("##UInt64", &Value)) { HasChanged = true; - Int64Property->SetPropertyValue(PointerToValue, (uint64)Value); + Int64Property->SetPropertyValue(PointerToValue, static_cast(Value)); } return HasChanged; @@ -736,11 +736,11 @@ bool FCogEngineWindow_Inspector::RenderUInt32(const FUInt32Property* UInt32Prope { bool HasChanged = false; - int Value = (int)UInt32Property->GetPropertyValue(PointerToValue); + int Value = static_cast(UInt32Property->GetPropertyValue(PointerToValue)); if (ImGui::InputInt("##UInt32", &Value)) { HasChanged = true; - UInt32Property->SetPropertyValue(PointerToValue, (uint32)Value); + UInt32Property->SetPropertyValue(PointerToValue, static_cast(Value)); } return HasChanged; @@ -963,28 +963,25 @@ bool FCogEngineWindow_Inspector::HasPropertyAnyChildren(const FProperty* Propert const TFieldIterator It(StructProperty->Struct); return It ? true : false; } - else if (const FArrayProperty* ArrayProperty = CastField(Property)) + + if (const FArrayProperty* ArrayProperty = CastField(Property)) { const FScriptArrayHelper Helper(ArrayProperty, PointerToValue); const int32 Num = Helper.Num(); if (Num == 0) - { - return false; - } + { return false; } return true; } - else if (const FClassProperty* ClassProperty = CastField(Property)) - { - return false; - } - else if (const FObjectProperty* ObjectProperty = CastField(Property)) + + if (const FClassProperty* ClassProperty = CastField(Property)) + { return false; } + + if (const FObjectProperty* ObjectProperty = CastField(Property)) { const UObject* ReferencedObject = ObjectProperty->GetObjectPropertyValue(PointerToValue); if (ReferencedObject == nullptr) - { - return false; - } + { return false; } return true; } diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_LogCategories.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_LogCategories.cpp index f2d535e..9758980 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_LogCategories.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_LogCategories.cpp @@ -111,8 +111,6 @@ void FCogEngineWindow_LogCategories::RenderContent() const bool IsClient = World->GetNetMode() == NM_Client; - ImGuiStyle& Style = ImGui::GetStyle(); - int Index = 0; for (const auto& Entry : FCogDebugLog::GetLogCategories()) { @@ -224,10 +222,10 @@ void FCogEngineWindow_LogCategories::RenderContent() FCogWindowWidgets::SetNextItemToShortWidth(); if (ImGui::BeginCombo("##Server", FCogDebugHelper::VerbosityToString(CurrentVerbosity))) { - for (int32 i = (int32)ELogVerbosity::Error; i <= (int32)ELogVerbosity::VeryVerbose; ++i) + for (int32 i = ELogVerbosity::Error; i <= static_cast(ELogVerbosity::VeryVerbose); ++i) { - const bool IsSelected = i == (int32)CurrentVerbosity; - const ELogVerbosity::Type Verbosity = (ELogVerbosity::Type)i; + const bool IsSelected = i == static_cast(CurrentVerbosity); + const ELogVerbosity::Type Verbosity = static_cast(i); if (ImGui::Selectable(FCogDebugHelper::VerbosityToString(Verbosity), IsSelected)) { @@ -254,10 +252,10 @@ void FCogEngineWindow_LogCategories::RenderContent() FCogWindowWidgets::SetNextItemToShortWidth(); if (ImGui::BeginCombo("##Local", FCogDebugHelper::VerbosityToString(CurrentVerbosity))) { - for (int32 i = (int32)ELogVerbosity::Error; i <= (int32)ELogVerbosity::VeryVerbose; ++i) + for (int32 i = ELogVerbosity::Error; i <= static_cast(ELogVerbosity::VeryVerbose); ++i) { - const bool IsSelected = i == (int32)CurrentVerbosity; - const ELogVerbosity::Type Verbosity = (ELogVerbosity::Type)i; + const bool IsSelected = i == static_cast(CurrentVerbosity); + const ELogVerbosity::Type Verbosity = static_cast(i); if (ImGui::Selectable(FCogDebugHelper::VerbosityToString(Verbosity), IsSelected)) { diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Metrics.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Metrics.cpp index 1f8b8d7..6d70ac4 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Metrics.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Metrics.cpp @@ -121,7 +121,7 @@ void FCogEngineWindow_Metrics::DrawMetric(FCogDebugMetricEntry& Metric) ImGui::Text("Crits"); ImGui::SameLine(FCogWindowWidgets::GetFontWidth() * 20); - FCogWindowWidgets::ProgressBarCentered(Metric.Count == 0 ? 0.0f : Metric.Crits / (float)Metric.Count, ImVec2(-1, 0), TCHAR_TO_ANSI(*FString::Printf(TEXT("%d / %d"), Metric.Crits, Metric.Count))); + FCogWindowWidgets::ProgressBarCentered(Metric.Count == 0 ? 0.0f : Metric.Crits / static_cast(Metric.Count), ImVec2(-1, 0), TCHAR_TO_ANSI(*FString::Printf(TEXT("%d / %d"), Metric.Crits, Metric.Count))); if (FCogDebugMetric::MaxDurationSetting > 0.0f) { diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_NetImGui.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_NetImGui.cpp index e3c0850..6bb42d0 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_NetImGui.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_NetImGui.cpp @@ -100,7 +100,7 @@ void FCogEngineWindow_NetImgui::RenderTick(float DeltaTime) RunServer(); } - ECogNetImguiAutoConnectionMode AutoConnectMode = ECogNetImguiAutoConnectionMode::NoAutoConnect; + ECogNetImguiAutoConnectionMode AutoConnectMode; switch (GetWorld()->GetNetMode()) { case NM_Client: AutoConnectMode = Config->AutoConnectOnClient; break; @@ -265,7 +265,7 @@ void FCogEngineWindow_NetImgui::RenderContent() FCogWindowWidgets::InputText("Server Arguments", Config->ServerArguments); ImGui::SetItemTooltip("Argument used when launching the NetImgui server executable."); } -#endif // #if NETIMGUI_ENABLED +#endif } //-------------------------------------------------------------------------------------------------------------------------- @@ -285,7 +285,7 @@ FString FCogEngineWindow_NetImgui::GetClientName() const //-------------------------------------------------------------------------------------------------------------------------- -void FCogEngineWindow_NetImgui::ConnectTo() +void FCogEngineWindow_NetImgui::ConnectTo() const { FCogImGuiContextScope ImGuiContextScope(GetOwner()->GetContext()); @@ -302,7 +302,7 @@ void FCogEngineWindow_NetImgui::ConnectTo() } //-------------------------------------------------------------------------------------------------------------------------- -void FCogEngineWindow_NetImgui::ConnectFrom() +void FCogEngineWindow_NetImgui::ConnectFrom() const { FCogImGuiContextScope ImGuiContextScope(GetOwner()->GetContext()); @@ -318,7 +318,7 @@ void FCogEngineWindow_NetImgui::ConnectFrom() } //-------------------------------------------------------------------------------------------------------------------------- -void FCogEngineWindow_NetImgui::Disconnect() +void FCogEngineWindow_NetImgui::Disconnect() const { FCogImGuiContextScope ImGuiContextScope(GetOwner()->GetContext()); diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Notifications.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Notifications.cpp index 2787709..914d5a3 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Notifications.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Notifications.cpp @@ -2,9 +2,6 @@ #include "CogCommon.h" #include "CogCommonLogCategory.h" -#include "CogDebugDraw.h" -#include "CogDebugDrawHelper.h" -#include "CogDebugDrawImGui.h" #include "CogImguiHelper.h" #include "CogWindowWidgets.h" #include "Engine/Engine.h" diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_OutputLog.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_OutputLog.cpp index 7a0cc5b..76830a5 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_OutputLog.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_OutputLog.cpp @@ -5,10 +5,8 @@ #include "CogDebugHelper.h" #include "CogImguiHelper.h" #include "CogWindowWidgets.h" -#include "imgui_internal.h" #include "Engine/Engine.h" #include "HAL/PlatformApplicationMisc.h" -#include "Math/UnitConversion.h" #include "Misc/StringBuilder.h" //-------------------------------------------------------------------------------------------------------------------------- @@ -237,12 +235,12 @@ void FCogEngineWindow_OutputLog::RenderContent() ImGui::SameLine(); ImGui::SetNextItemWidth(ImGui::GetFontSize() * 9); - if (ImGui::BeginCombo("##Verbosity", FCogDebugHelper::VerbosityToString((ELogVerbosity::Type)Config->VerbosityFilter))) + if (ImGui::BeginCombo("##Verbosity", FCogDebugHelper::VerbosityToString(static_cast(Config->VerbosityFilter)))) { - for (int32 i = ELogVerbosity::Error; i <= (int32)ELogVerbosity::VeryVerbose; ++i) + for (int32 i = ELogVerbosity::Error; i <= static_cast(ELogVerbosity::VeryVerbose); ++i) { const bool IsSelected = i == Config->VerbosityFilter; - const ELogVerbosity::Type Verbosity = (ELogVerbosity::Type)i; + const ELogVerbosity::Type Verbosity = static_cast(i); if (ImGui::Selectable(FCogDebugHelper::VerbosityToString(Verbosity), IsSelected)) { @@ -258,10 +256,10 @@ void FCogEngineWindow_OutputLog::RenderContent() } int32 ColumnCount = 1; - ColumnCount += (int32)Config->ShowFrame; - ColumnCount += (int32)Config->ShowTime; - ColumnCount += (int32)Config->ShowCategory; - ColumnCount += (int32)Config->ShowVerbosity; + ColumnCount += Config->ShowFrame ? 1 : 0; + ColumnCount += Config->ShowTime ? 1 : 0; + ColumnCount += Config->ShowCategory ? 1 : 0; + ColumnCount += Config->ShowVerbosity ? 1 : 0; bool IsTableShown = false; if (Config->ShowAsTable) @@ -314,7 +312,7 @@ void FCogEngineWindow_OutputLog::RenderContent() { const FLogInfo& LineInfo = LogInfos[LineIndex]; - if (LineInfo.Verbosity <= (ELogVerbosity::Type)Config->VerbosityFilter) + if (LineInfo.Verbosity <= static_cast(Config->VerbosityFilter)) { DrawRow(BufferStart, LineInfo, IsTableShown); } diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Plots.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Plots.cpp index dc3e344..28c8384 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Plots.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Plots.cpp @@ -714,9 +714,9 @@ void FCogEngineWindow_Plots::RenderEventTooltip(const FCogDebugPlotEvent* Hovere ImGui::Text("Frames"); ImGui::TableNextColumn(); ImGui::Text("%d [%d-%d]", - (int32)(ActualEndFrame - HoveredEvent->StartFrame), - (int32)(HoveredEvent->StartFrame % 1000), - (int32)(ActualEndFrame % 1000)); + static_cast(ActualEndFrame - HoveredEvent->StartFrame), + static_cast(HoveredEvent->StartFrame % 1000), + static_cast(ActualEndFrame % 1000)); } else { @@ -724,7 +724,7 @@ void FCogEngineWindow_Plots::RenderEventTooltip(const FCogDebugPlotEvent* Hovere ImGui::TableNextColumn(); ImGui::Text("Frame"); ImGui::TableNextColumn(); - ImGui::Text("%d", (int32)(HoveredEvent->StartFrame % 1000)); + ImGui::Text("%d", static_cast(HoveredEvent->StartFrame % 1000)); } //------------------------ diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Selection.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Selection.cpp index bba5ab7..495dc58 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Selection.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Selection.cpp @@ -15,7 +15,6 @@ #include "GameFramework/Character.h" #include "HAL/IConsoleManager.h" #include "imgui.h" -#include "imgui_internal.h" #include "Kismet/GameplayStatics.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 3a80c40..a9391c2 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Skeleton.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Skeleton.cpp @@ -225,8 +225,8 @@ void FCogEngineWindow_Skeleton::RenderBoneEntry(int32 BoneIndex, bool OpenAllChi } FCogWindowWidgets::PopStyleCompact(); - const bool HasCustomVisiblity = BoneInfo.ShowName || BoneInfo.ShowAxes || BoneInfo.ShowLocalVelocity || BoneInfo.ShowTrajectory; - if (HasCustomVisiblity) + const bool HasCustomVisibility = BoneInfo.ShowName || BoneInfo.ShowAxes || BoneInfo.ShowLocalVelocity || BoneInfo.ShowTrajectory; + if (HasCustomVisibility) { BoneInfo.ShowBone = true; } @@ -235,7 +235,7 @@ void FCogEngineWindow_Skeleton::RenderBoneEntry(int32 BoneIndex, bool OpenAllChi // Name //------------------------ ImGui::SameLine(); - ImVec4 NameColor = HasCustomVisiblity ? ImVec4(1.0f, 1.0f, 0.0f, 1.0f) : ImVec4(1.0f, 1.0f, 1.0f, 1.0f); + ImVec4 NameColor = HasCustomVisibility ? ImVec4(1.0f, 1.0f, 0.0f, 1.0f) : ImVec4(1.0f, 1.0f, 1.0f, 1.0f); ImGui::TextColored(NameColor, "%s", BoneName.Get()); } diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Spawns.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Spawns.cpp index 258d04f..4ea09a5 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Spawns.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Spawns.cpp @@ -47,18 +47,19 @@ void FCogEngineWindow_Spawns::RenderContent() return; } + int32 GroupIndex = 0; for (const FCogEngineSpawnGroup& SpawnGroup : Asset->SpawnGroups) { - RenderSpawnGroup(*Replicator, SpawnGroup); + RenderSpawnGroup(*Replicator, SpawnGroup, GroupIndex); + GroupIndex++; } } //-------------------------------------------------------------------------------------------------------------------------- -void FCogEngineWindow_Spawns::RenderSpawnGroup(ACogEngineReplicator& Replicator, const FCogEngineSpawnGroup& SpawnGroup) +void FCogEngineWindow_Spawns::RenderSpawnGroup(ACogEngineReplicator& Replicator, const FCogEngineSpawnGroup& SpawnGroup, int32 GroupIndex) { if (FCogWindowWidgets::DarkCollapsingHeader(TCHAR_TO_ANSI(*SpawnGroup.Name), ImGuiTreeNodeFlags_DefaultOpen)) { - int32 GroupIndex = 0; ImGui::PushID(GroupIndex); const bool PushColor = (SpawnGroup.Color != FColor::Transparent); @@ -86,7 +87,6 @@ void FCogEngineWindow_Spawns::RenderSpawnGroup(ACogEngineReplicator& Replicator, } ImGui::PopID(); - GroupIndex++; } } @@ -95,7 +95,7 @@ bool FCogEngineWindow_Spawns::RenderSpawnAsset(ACogEngineReplicator& Replicator, { bool IsPressed = false; - ImGui::PushStyleColor(ImGuiCol_Button, IsLastSelected ? ImGui::GetStyleColorVec4(ImGuiCol_ButtonActive) : ImGui::GetStyleColorVec4(ImGuiCol_Button)); + //ImGui::PushStyleColor(ImGuiCol_Button, IsLastSelected ? ImGui::GetStyleColorVec4(ImGuiCol_ButtonActive) : ImGui::GetStyleColorVec4(ImGuiCol_Button)); ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(0.0f, 0.5f)); FString EntryName; @@ -115,7 +115,7 @@ bool FCogEngineWindow_Spawns::RenderSpawnAsset(ACogEngineReplicator& Replicator, } ImGui::PopStyleVar(1); - ImGui::PopStyleColor(1); + //ImGui::PopStyleColor(1); return IsPressed; } \ No newline at end of file diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Stats.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Stats.cpp index ac3ee81..9c384ca 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Stats.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Stats.cpp @@ -202,7 +202,7 @@ void FCogEngineWindow_Stats::RenderMainMenuWidgetPacketLoss() const float TotalPacketLost = (OutPacketLost + InPacketLost) / 2; ImGui::PushStyleColor(ImGuiCol_Text, Config->GetPacketLossColor(TotalPacketLost)); - const bool Open = ImGui::BeginMenu(TCHAR_TO_ANSI(*FString::Printf(TEXT("%2d%% ###PacketLossButton"), (int32)TotalPacketLost))); + const bool Open = ImGui::BeginMenu(TCHAR_TO_ANSI(*FString::Printf(TEXT("%2d%% ###PacketLossButton"), static_cast(TotalPacketLost)))); const float Width = ImGui::GetItemRectSize().x; ImGui::PopStyleColor(1); diff --git a/Plugins/Cog/Source/CogEngine/Public/CogEngineHelper.h b/Plugins/Cog/Source/CogEngine/Public/CogEngineHelper.h index 071b3c5..8044aa4 100644 --- a/Plugins/Cog/Source/CogEngine/Public/CogEngineHelper.h +++ b/Plugins/Cog/Source/CogEngine/Public/CogEngineHelper.h @@ -1,6 +1,7 @@ #pragma once #include "CoreMinimal.h" +#include "CogEngineDataAsset.h" class AActor; @@ -10,4 +11,5 @@ public: static void ActorContextMenu(AActor& Actor); + static void RenderConfigureMessage(TWeakObjectPtr InAsset); }; diff --git a/Plugins/Cog/Source/CogEngine/Public/CogEngineReplicator.h b/Plugins/Cog/Source/CogEngine/Public/CogEngineReplicator.h index 67a4e55..6325fc0 100644 --- a/Plugins/Cog/Source/CogEngine/Public/CogEngineReplicator.h +++ b/Plugins/Cog/Source/CogEngine/Public/CogEngineReplicator.h @@ -33,7 +33,7 @@ public: FCogEngineSpawnFunction GetSpawnFunction() const { return SpawnFunction; } - void SetSpawnFunction(FCogEngineSpawnFunction Value) { SpawnFunction = Value; } + void SetSpawnFunction(const FCogEngineSpawnFunction& Value) { SpawnFunction = Value; } UFUNCTION(Server, Reliable) void Server_Spawn(const FCogEngineSpawnEntry& SpawnEntry); @@ -64,7 +64,7 @@ protected: UFUNCTION() void OnRep_TimeDilation() const; - TObjectPtr OwnerPlayerController; + TWeakObjectPtr OwnerPlayerController; uint32 bHasAuthority : 1; uint32 bIsLocal : 1; diff --git a/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_CollisionTester.h b/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_CollisionTester.h index d459b4e..15ac7c4 100644 --- a/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_CollisionTester.h +++ b/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_CollisionTester.h @@ -35,11 +35,12 @@ protected: FColor Color; }; - FChannel Channels[ECC_MAX]; - TObjectPtr Config = nullptr; + FChannel Channels[ECC_MAX] = {}; + FCogDebug_Gizmo StartGizmo; + FCogDebug_Gizmo EndGizmo; }; @@ -90,11 +91,6 @@ public: UPROPERTY(Config) FVector ShapeExtent; - UCogEngineConfig_CollisionTester() - { - Reset(); - } - virtual void Reset() override { Super::Reset(); diff --git a/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_Console.h b/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_Console.h index 19eb5d5..28fb17f 100644 --- a/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_Console.h +++ b/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_Console.h @@ -115,12 +115,6 @@ public: UPROPERTY(Config) FVector4f HistoryColor = FVector4f(1.0f, 1.0f, 1.0f, 0.5f); - - UCogEngineConfig_Console() - { - Reset(); - } - virtual void Reset() override { Super::Reset(); diff --git a/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_ImGui.h b/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_ImGui.h index 67cde25..0f17e2e 100644 --- a/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_ImGui.h +++ b/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_ImGui.h @@ -7,8 +7,6 @@ class COGENGINE_API FCogEngineWindow_ImGui : public FCogWindow { typedef FCogWindow Super; -public: - protected: virtual void RenderTick(float DeltaTime) override; diff --git a/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_Inspector.h b/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_Inspector.h index 8218f42..c67f794 100644 --- a/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_Inspector.h +++ b/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_Inspector.h @@ -84,7 +84,7 @@ protected: FCogEngineInspectorApplyFunction FindObjectApplyFunction(const UObject* Object) const; - struct Favorite + struct FFavorite { TWeakObjectPtr Object = nullptr; @@ -99,7 +99,7 @@ protected: bool bCollapseAllCategories = false; - TArray Favorites; + TArray Favorites; TArray> History; diff --git a/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_NetImGui.h b/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_NetImGui.h index b326296..2802f0b 100644 --- a/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_NetImGui.h +++ b/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_NetImGui.h @@ -33,11 +33,11 @@ protected: virtual void RenderTick(float DeltaTime) override; - void ConnectTo(); + void ConnectTo() const; - void ConnectFrom(); + void ConnectFrom() const; - void Disconnect(); + void Disconnect() const; void RunServer(); diff --git a/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_Spawns.h b/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_Spawns.h index 221e9c9..759c581 100644 --- a/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_Spawns.h +++ b/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_Spawns.h @@ -18,11 +18,11 @@ public: protected: - virtual void RenderHelp(); + virtual void RenderHelp() override; virtual void RenderContent() override; - virtual void RenderSpawnGroup(ACogEngineReplicator& Replicator, const FCogEngineSpawnGroup& SpawnGroup); + virtual void RenderSpawnGroup(ACogEngineReplicator& Replicator, const FCogEngineSpawnGroup& SpawnGroup, int32 GroupIndex); virtual bool RenderSpawnAsset(ACogEngineReplicator& Replicator, const FCogEngineSpawnEntry& SpawnEntry, bool IsLastSelected); diff --git a/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_Transform.h b/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_Transform.h index 2bf370b..ffdb094 100644 --- a/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_Transform.h +++ b/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_Transform.h @@ -22,17 +22,17 @@ protected: virtual void RenderContent() override; - bool RenderComponent(const char* Label, double* Value, float Speed, double Min, double Max, double Reset); + virtual bool RenderComponent(const char* Label, double* Value, float Speed, double Min, double Max, double Reset); - void RenderSnap(const char* CheckboxLabel, const char* InputLabel, bool* SnapEnable, float* Snap); + virtual void RenderSnap(const char* CheckboxLabel, const char* InputLabel, bool* SnapEnable, float* Snap); - bool RenderLocation(FTransform& InOutTransform); + virtual bool RenderLocation(FTransform& InOutTransform); - bool RenderRotation(FTransform& InOutTransform); + virtual bool RenderRotation(FTransform& InOutTransform); - bool RenderScale(FTransform& InOutTransform); + virtual bool RenderScale(FTransform& InOutTransform); - bool RenderTransform(FTransform& InOutTransform); + virtual bool RenderTransform(FTransform& InOutTransform); private: diff --git a/Plugins/Cog/Source/CogImgui/Private/CogImguiConfig.cpp b/Plugins/Cog/Source/CogImgui/Private/CogImguiConfig.cpp index 2dd03d5..ef8de74 100644 --- a/Plugins/Cog/Source/CogImgui/Private/CogImguiConfig.cpp +++ b/Plugins/Cog/Source/CogImgui/Private/CogImguiConfig.cpp @@ -1,3 +1,4 @@ +// ReSharper disable CppUnusedIncludeDirective #include "CogImguiConfig.h" THIRD_PARTY_INCLUDES_START diff --git a/Plugins/Cog/Source/CogImgui/Private/CogImguiContext.cpp b/Plugins/Cog/Source/CogImgui/Private/CogImguiContext.cpp index fd8adf0..d98b8e5 100644 --- a/Plugins/Cog/Source/CogImgui/Private/CogImguiContext.cpp +++ b/Plugins/Cog/Source/CogImgui/Private/CogImguiContext.cpp @@ -13,7 +13,6 @@ #include "Framework/Application/SlateApplication.h" #include "Framework/Application/SlateUser.h" #include "GameFramework/PlayerController.h" -#include "GameFramework/PlayerInput.h" #include "HAL/PlatformApplicationMisc.h" #include "imgui.h" #include "imgui_internal.h" @@ -24,10 +23,8 @@ #include "Widgets/SViewport.h" #include "Widgets/SWindow.h" -static UPlayerInput* GetPlayerInput(const UWorld* World); - //-------------------------------------------------------------------------------------------------------------------------- -FCogImGuiContextScope::FCogImGuiContextScope(FCogImguiContext& CogImguiContext) +FCogImGuiContextScope::FCogImGuiContextScope(const FCogImguiContext& CogImguiContext) { PrevContext = ImGui::GetCurrentContext(); PrevPlotContext = ImPlot::GetCurrentContext(); @@ -244,7 +241,7 @@ bool FCogImguiContext::BeginFrame(float InDeltaTime) //------------------------------------------------------------------------------------------------------- // Skip the first frame, to let the main widget update its TickSpaceGeometry which is returned by the - // plateform callback ImGui_GetWindowPos. When using viewports Imgui needs to know the main viewport + // platform callback ImGui_GetWindowPos. When using viewports Imgui needs to know the main viewport // absolute position to correctly place the initial imgui windows. //------------------------------------------------------------------------------------------------------- if (bIsFirstFrame) @@ -367,7 +364,7 @@ bool FCogImguiContext::BeginFrame(float InDeltaTime) } //-------------------------------------------------------------------------------------------------------------------------- -ImVec2 FCogImguiContext::GetImguiMousePos() +ImVec2 FCogImguiContext::GetImguiMousePos() const { const FVector2D& MousePosition = FSlateApplication::Get().GetCursorPos(); if (ImGui::GetIO().ConfigFlags & ImGuiConfigFlags_ViewportsEnable) @@ -686,41 +683,18 @@ void FCogImguiContext::ImGui_SetClipboardTextFn(ImGuiContext* InImGuiContext, co static APlayerController* GetLocalPlayerController(const UWorld* World) { if (World == nullptr) - { - return nullptr; - } + { return nullptr; } - APlayerController* PlayerController = nullptr; for (FConstPlayerControllerIterator Iterator = World->GetPlayerControllerIterator(); Iterator; ++Iterator) { APlayerController* ItPlayerController = Iterator->Get(); if (ItPlayerController->IsLocalController()) - { - return ItPlayerController; - } + { return ItPlayerController; } } return nullptr; } -//-------------------------------------------------------------------------------------------------------------------------- -static UPlayerInput* GetPlayerInput(const UWorld* World) -{ - if (World == nullptr) - { - return nullptr; - } - - APlayerController* PlayerController = GetLocalPlayerController(World); - if (PlayerController == nullptr) - { - return nullptr; - } - - UPlayerInput* PlayerInput = PlayerController->PlayerInput; - return PlayerInput; -} - //-------------------------------------------------------------------------------------------------------------------------- void FCogImguiContext::SetEnableInput(bool Value) { @@ -891,7 +865,7 @@ bool FCogImguiContext::IsConsoleOpened() const } //-------------------------------------------------------------------------------------------------------------------------- -void FCogImguiContext::DrawDebug() +void FCogImguiContext::DrawDebug() const { if (ImGui::Begin("ImGui Integration Debug")) { diff --git a/Plugins/Cog/Source/CogImgui/Private/CogImguiHelper.cpp b/Plugins/Cog/Source/CogImgui/Private/CogImguiHelper.cpp index b829150..082ecce 100644 --- a/Plugins/Cog/Source/CogImgui/Private/CogImguiHelper.cpp +++ b/Plugins/Cog/Source/CogImgui/Private/CogImguiHelper.cpp @@ -56,10 +56,10 @@ FColor FCogImguiHelper::ToFColor(ImU32 Color) { return FColor { - (uint8)((Color >> IM_COL32_R_SHIFT) & 0xFF), - (uint8)((Color >> IM_COL32_G_SHIFT) & 0xFF), - (uint8)((Color >> IM_COL32_B_SHIFT) & 0xFF), - (uint8)((Color >> IM_COL32_A_SHIFT) & 0xFF) + static_cast((Color >> IM_COL32_R_SHIFT) & 0xFF), + static_cast((Color >> IM_COL32_G_SHIFT) & 0xFF), + static_cast((Color >> IM_COL32_B_SHIFT) & 0xFF), + static_cast((Color >> IM_COL32_A_SHIFT) & 0xFF) }; } diff --git a/Plugins/Cog/Source/CogImgui/Private/CogImguiInputCatcherWidget.cpp b/Plugins/Cog/Source/CogImgui/Private/CogImguiInputCatcherWidget.cpp index ec99bca..55f087e 100644 --- a/Plugins/Cog/Source/CogImgui/Private/CogImguiInputCatcherWidget.cpp +++ b/Plugins/Cog/Source/CogImgui/Private/CogImguiInputCatcherWidget.cpp @@ -1,6 +1,7 @@ #include "CogImguiInputCatcherWidget.h" #include "CogImguiContext.h" +#include "CogImguiHelper.h" #include "CogImguiInputHelper.h" #include "Engine/GameViewportClient.h" #include "imgui.h" @@ -17,11 +18,6 @@ void SCogImguiInputCatcherWidget::Construct(const FArguments& InArgs) } END_SLATE_FUNCTION_BUILD_OPTIMIZATION -//-------------------------------------------------------------------------------------------------------------------------- -SCogImguiInputCatcherWidget::~SCogImguiInputCatcherWidget() -{ -} - //-------------------------------------------------------------------------------------------------------------------------- void SCogImguiInputCatcherWidget::Tick(const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime) { @@ -91,7 +87,7 @@ FReply SCogImguiInputCatcherWidget::OnMouseButtonUp(const FGeometry& MyGeometry, } //-------------------------------------------------------------------------------------------------------------------------- -FReply SCogImguiInputCatcherWidget::HandleMouseButtonEvent(const FPointerEvent& MouseEvent, bool Down) +FReply SCogImguiInputCatcherWidget::HandleMouseButtonEvent(const FPointerEvent& MouseEvent, bool Down) const { FCogImGuiContextScope ImGuiContextScope(*Context); @@ -132,19 +128,19 @@ FReply SCogImguiInputCatcherWidget::OnMouseMove(const FGeometry& MyGeometry, con //-------------------------------------------------------------------------------------------------------------------------- void SCogImguiInputCatcherWidget::RefreshVisibility() { - EVisibility DesiredVisiblity = EVisibility::SelfHitTestInvisible; + EVisibility DesiredVisibility; if (Context->GetEnableInput() && Context->GetShareMouseWithGameplay() == false) { - DesiredVisiblity = EVisibility::Visible; + DesiredVisibility = EVisibility::Visible; } else { - DesiredVisiblity = EVisibility::SelfHitTestInvisible; + DesiredVisibility = EVisibility::SelfHitTestInvisible; } - if (DesiredVisiblity != GetVisibility()) + if (DesiredVisibility != GetVisibility()) { - SetVisibility(DesiredVisiblity); + SetVisibility(DesiredVisibility); } } diff --git a/Plugins/Cog/Source/CogImgui/Private/CogImguiInputHelper.cpp b/Plugins/Cog/Source/CogImgui/Private/CogImguiInputHelper.cpp index 291a0ad..e2e7d27 100644 --- a/Plugins/Cog/Source/CogImgui/Private/CogImguiInputHelper.cpp +++ b/Plugins/Cog/Source/CogImgui/Private/CogImguiInputHelper.cpp @@ -1,7 +1,5 @@ #include "CogImguiInputHelper.h" -#include - #include "CogImguiKeyInfo.h" #include "Engine/World.h" #include "Framework/Application/SlateApplication.h" @@ -50,14 +48,14 @@ UPlayerInput* FCogImguiInputHelper::GetPlayerInput(const UWorld& World) } //-------------------------------------------------------------------------------------------------------------------------- -bool FCogImguiInputHelper::IsTopPriorityKey(UWorld* InWorld, const FKey& InKey) +bool FCogImguiInputHelper::IsTopPriorityKey(const UWorld* InWorld, const FKey& InKey) { FKeyEvent KeyEvent(InKey, FModifierKeysState(), 0, false, 0, 0); return IsTopPriorityKeyEvent(InWorld, KeyEvent); } //-------------------------------------------------------------------------------------------------------------------------- -bool FCogImguiInputHelper::IsTopPriorityKeyEvent(UWorld* InWorld, const FKeyEvent& InKeyEvent) +bool FCogImguiInputHelper::IsTopPriorityKeyEvent(const UWorld* InWorld, const FKeyEvent& InKeyEvent) { //------------------------------------------------------------------------------------------------ // We want the user to be able to use Cog shortcuts when imgui has the input. @@ -202,7 +200,7 @@ bool FCogImguiInputHelper::IsKeyBindMatchingKeyInfo(const FKeyBind& InKeyBind, c } //-------------------------------------------------------------------------------------------------------------------------- -bool FCogImguiInputHelper::WasKeyInfoJustPressed(APlayerController& PlayerController, const FCogImGuiKeyInfo& KeyInfo) +bool FCogImguiInputHelper::WasKeyInfoJustPressed(const APlayerController& PlayerController, const FCogImGuiKeyInfo& KeyInfo) { if (PlayerController.WasInputKeyJustPressed(KeyInfo.Key)) { @@ -221,7 +219,7 @@ bool FCogImguiInputHelper::WasKeyInfoJustPressed(APlayerController& PlayerContro } //-------------------------------------------------------------------------------------------------------------------------- -bool FCogImguiInputHelper::IsKeyBoundToCommand(UWorld* World, const FKeyEvent& KeyEvent) +bool FCogImguiInputHelper::IsKeyBoundToCommand(const UWorld* World, const FKeyEvent& KeyEvent) { if (World == nullptr) { @@ -452,7 +450,7 @@ bool FCogImguiInputHelper::IsKeyBoundToCommand(const UPlayerInput* InPlayerInput //-------------------------------------------------------------------------------------------------------------------------- bool FCogImguiInputHelper::IsMouseInsideMainViewport() { - if (ImGuiViewportP* Viewport = (ImGuiViewportP*)ImGui::GetMainViewport()) + if (ImGuiViewportP* Viewport = static_cast(ImGui::GetMainViewport())) { ImGuiIO& IO = ImGui::GetIO(); const bool Result = Viewport->GetMainRect().Contains(IO.MousePos); diff --git a/Plugins/Cog/Source/CogImgui/Private/CogImguiWidget.cpp b/Plugins/Cog/Source/CogImgui/Private/CogImguiWidget.cpp index c9ba3da..37996df 100644 --- a/Plugins/Cog/Source/CogImgui/Private/CogImguiWidget.cpp +++ b/Plugins/Cog/Source/CogImgui/Private/CogImguiWidget.cpp @@ -1,6 +1,7 @@ #include "CogImguiWidget.h" #include "CogImguiContext.h" +#include "CogImguiHelper.h" #include "CogImguiInputHelper.h" #include "Engine/GameViewportClient.h" #include "imgui.h" @@ -17,11 +18,6 @@ void SCogImguiWidget::Construct(const FArguments& InArgs) } END_SLATE_FUNCTION_BUILD_OPTIMIZATION -//-------------------------------------------------------------------------------------------------------------------------- -SCogImguiWidget::~SCogImguiWidget() -{ -} - //-------------------------------------------------------------------------------------------------------------------------- void SCogImguiWidget::SetDrawData(const ImDrawData* InDrawData) { @@ -143,7 +139,7 @@ FReply SCogImguiWidget::OnKeyUp(const FGeometry& MyGeometry, const FKeyEvent& Ke } //-------------------------------------------------------------------------------------------------------------------------- -FReply SCogImguiWidget::HandleKeyEvent(const FKeyEvent& KeyEvent, bool Down) +FReply SCogImguiWidget::HandleKeyEvent(const FKeyEvent& KeyEvent, bool Down) const { FCogImGuiContextScope ImGuiContextScope(*Context); @@ -212,7 +208,7 @@ FReply SCogImguiWidget::OnMouseButtonUp(const FGeometry& MyGeometry, const FPoin } //-------------------------------------------------------------------------------------------------------------------------- -FReply SCogImguiWidget::HandleMouseButtonEvent(const FPointerEvent& MouseEvent, bool Down) +FReply SCogImguiWidget::HandleMouseButtonEvent(const FPointerEvent& MouseEvent, bool Down) const { FCogImGuiContextScope ImGuiContextScope(*Context); @@ -278,26 +274,26 @@ FReply SCogImguiWidget::OnFocusReceived(const FGeometry& MyGeometry, const FFocu //-------------------------------------------------------------------------------------------------------------------------- void SCogImguiWidget::RefreshVisibility() { - EVisibility DesiredVisiblity = EVisibility::SelfHitTestInvisible; + EVisibility DesiredVisibility; if (Context->GetEnableInput()) { if (Context->GetShareMouse() && Context->GetWantCaptureMouse() == false) { - DesiredVisiblity = EVisibility::SelfHitTestInvisible; + DesiredVisibility = EVisibility::SelfHitTestInvisible; } else { - DesiredVisiblity = EVisibility::Visible; + DesiredVisibility = EVisibility::Visible; } } else { - DesiredVisiblity = EVisibility::SelfHitTestInvisible; + DesiredVisibility = EVisibility::SelfHitTestInvisible; } - if (DesiredVisiblity != GetVisibility()) + if (DesiredVisibility != GetVisibility()) { - SetVisibility(DesiredVisiblity); + SetVisibility(DesiredVisibility); } } diff --git a/Plugins/Cog/Source/CogImgui/Public/CogImguiContext.h b/Plugins/Cog/Source/CogImgui/Public/CogImguiContext.h index e7687b1..15f5445 100644 --- a/Plugins/Cog/Source/CogImgui/Public/CogImguiContext.h +++ b/Plugins/Cog/Source/CogImgui/Public/CogImguiContext.h @@ -28,7 +28,7 @@ struct COGIMGUI_API FCogImGuiViewportData struct COGIMGUI_API FCogImGuiContextScope { - UE_NODISCARD_CTOR explicit FCogImGuiContextScope(FCogImguiContext& CogImguiContext); + UE_NODISCARD_CTOR explicit FCogImGuiContextScope(const FCogImguiContext& CogImguiContext); UE_NODISCARD_CTOR explicit FCogImGuiContextScope(ImGuiContext* GuiCtx, ImPlotContext* PlotCtx); ~FCogImGuiContextScope(); @@ -65,8 +65,6 @@ public: bool BeginFrame(float InDeltaTime); - void GetCursorPos(ImGuiIO& IO); - void EndFrame(); float GetDpiScale() const { return DpiScale; } @@ -77,7 +75,7 @@ public: void SetSkipRendering(bool Value); - ImVec2 GetImguiMousePos(); + ImVec2 GetImguiMousePos() const; TObjectPtr GetGameViewport() const { return GameViewport; } @@ -93,7 +91,7 @@ private: bool IsConsoleOpened() const; - void DrawDebug(); + void DrawDebug() const; void BuildFont(); diff --git a/Plugins/Cog/Source/CogImgui/Public/CogImguiDrawList.h b/Plugins/Cog/Source/CogImgui/Public/CogImguiDrawList.h index 415f155..4dc2d6e 100644 --- a/Plugins/Cog/Source/CogImgui/Public/CogImguiDrawList.h +++ b/Plugins/Cog/Source/CogImgui/Public/CogImguiDrawList.h @@ -1,7 +1,6 @@ #pragma once #include "CoreMinimal.h" -#include "CogImguiHelper.h" #include "imgui.h" #include "Rendering/RenderingCommon.h" diff --git a/Plugins/Cog/Source/CogImgui/Public/CogImguiInputCatcherWidget.h b/Plugins/Cog/Source/CogImgui/Public/CogImguiInputCatcherWidget.h index 7e54002..21d7d5e 100644 --- a/Plugins/Cog/Source/CogImgui/Public/CogImguiInputCatcherWidget.h +++ b/Plugins/Cog/Source/CogImgui/Public/CogImguiInputCatcherWidget.h @@ -1,7 +1,6 @@ #pragma once #include "CoreMinimal.h" -#include "CogImguiDrawList.h" #include "Rendering/RenderingCommon.h" #include "UObject/WeakObjectPtr.h" #include "Widgets/DeclarativeSyntaxSupport.h" @@ -24,8 +23,6 @@ public: void Construct(const FArguments& InArgs); - ~SCogImguiInputCatcherWidget(); - virtual void Tick(const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime) override; virtual int32 OnPaint(const FPaintArgs& Args, const FGeometry& AllottedGeometry, const FSlateRect& MyClippingRect, FSlateWindowElementList& OutDrawElements, int32 LayerId, const FWidgetStyle& WidgetStyle, bool bParentEnabled) const override; @@ -58,9 +55,7 @@ public: protected: - FReply HandleKeyEvent(const FKeyEvent& KeyEvent, bool Down); - - FReply HandleMouseButtonEvent(const FPointerEvent& MouseEvent, bool Down); + FReply HandleMouseButtonEvent(const FPointerEvent& MouseEvent, bool Down) const; void RefreshVisibility(); diff --git a/Plugins/Cog/Source/CogImgui/Public/CogImguiInputHelper.h b/Plugins/Cog/Source/CogImgui/Public/CogImguiInputHelper.h index f091139..f2b128f 100644 --- a/Plugins/Cog/Source/CogImgui/Public/CogImguiInputHelper.h +++ b/Plugins/Cog/Source/CogImgui/Public/CogImguiInputHelper.h @@ -22,11 +22,11 @@ public: static UPlayerInput* GetPlayerInput(const UWorld& World); - static bool IsTopPriorityKey(UWorld* InWorld, const FKey& InKey); + static bool IsTopPriorityKey(const UWorld* InWorld, const FKey& InKey); - static bool IsTopPriorityKeyEvent(UWorld* InWorld, const FKeyEvent& InKeyEvent); + static bool IsTopPriorityKeyEvent(const UWorld* InWorld, const FKeyEvent& InKeyEvent); - static bool WasKeyInfoJustPressed(APlayerController& PlayerController, const FCogImGuiKeyInfo& KeyInfo); + static bool WasKeyInfoJustPressed(const APlayerController& PlayerController, const FCogImGuiKeyInfo& KeyInfo); static bool IsCheckBoxStateMatchingValue(ECheckBoxState CheckBoxState, bool bValue); @@ -48,7 +48,7 @@ public: static bool IsConsoleEvent(const FKeyEvent& KeyEvent); - static bool IsKeyBoundToCommand(UWorld* World, const FKeyEvent& KeyEvent); + static bool IsKeyBoundToCommand(const UWorld* World, const FKeyEvent& KeyEvent); static bool IsStopPlaySessionEvent(const FKeyEvent& KeyEvent); diff --git a/Plugins/Cog/Source/CogImgui/Public/CogImguiModule.h b/Plugins/Cog/Source/CogImgui/Public/CogImguiModule.h index 73a474c..9eeef79 100644 --- a/Plugins/Cog/Source/CogImgui/Public/CogImguiModule.h +++ b/Plugins/Cog/Source/CogImgui/Public/CogImguiModule.h @@ -7,7 +7,7 @@ class COGIMGUI_API FCogImguiModule : public IModuleInterface { public: - static inline FCogImguiModule& Get() + static FCogImguiModule& Get() { return FModuleManager::LoadModuleChecked("CogImgui"); } @@ -18,6 +18,4 @@ public: virtual void StartupModule() override; virtual void ShutdownModule() override; -private: - }; diff --git a/Plugins/Cog/Source/CogImgui/Public/CogImguiWidget.h b/Plugins/Cog/Source/CogImgui/Public/CogImguiWidget.h index 8ae187e..54347d2 100644 --- a/Plugins/Cog/Source/CogImgui/Public/CogImguiWidget.h +++ b/Plugins/Cog/Source/CogImgui/Public/CogImguiWidget.h @@ -24,8 +24,6 @@ public: void Construct(const FArguments& InArgs); - ~SCogImguiWidget(); - virtual void Tick(const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime) override; virtual int32 OnPaint(const FPaintArgs& Args, const FGeometry& AllottedGeometry, const FSlateRect& MyClippingRect, FSlateWindowElementList& OutDrawElements, int32 LayerId, const FWidgetStyle& WidgetStyle, bool bParentEnabled) const override; @@ -58,13 +56,13 @@ public: TSharedPtr GetWindow() const { return Window; } - void SetWindow(TSharedPtr Value) { Window = Value; } + void SetWindow(const TSharedPtr& Value) { Window = Value; } protected: - FReply HandleKeyEvent(const FKeyEvent& KeyEvent, bool Down); + FReply HandleKeyEvent(const FKeyEvent& KeyEvent, bool Down) const; - FReply HandleMouseButtonEvent(const FPointerEvent& MouseEvent, bool Down); + FReply HandleMouseButtonEvent(const FPointerEvent& MouseEvent, bool Down) const; void RefreshVisibility(); diff --git a/Plugins/Cog/Source/CogWindow/Private/CogWindow.cpp b/Plugins/Cog/Source/CogWindow/Private/CogWindow.cpp index f6e2c9a..c5b9fc3 100644 --- a/Plugins/Cog/Source/CogWindow/Private/CogWindow.cpp +++ b/Plugins/Cog/Source/CogWindow/Private/CogWindow.cpp @@ -223,7 +223,7 @@ void FCogWindow::ResetConfig() } //-------------------------------------------------------------------------------------------------------------------------- -const UObject* FCogWindow::GetAsset(const TSubclassOf AssetClass) const +const UObject* FCogWindow::GetAsset(const TSubclassOf& AssetClass) const { return GetOwner()->GetAsset(AssetClass); } diff --git a/Plugins/Cog/Source/CogWindow/Private/CogWindowHelper.cpp b/Plugins/Cog/Source/CogWindow/Private/CogWindowHelper.cpp index b711717..273e973 100644 --- a/Plugins/Cog/Source/CogWindow/Private/CogWindowHelper.cpp +++ b/Plugins/Cog/Source/CogWindow/Private/CogWindowHelper.cpp @@ -7,7 +7,7 @@ #include "imgui.h" //---------------------------------------------------------------------------------------------------------------------- -const UObject* FCogWindowHelper::GetFirstAssetByClass(const TSubclassOf AssetClass) +const UObject* FCogWindowHelper::GetFirstAssetByClass(const TSubclassOf& AssetClass) { const IAssetRegistry& AssetRegistry = FModuleManager::LoadModuleChecked(TEXT("AssetRegistry")).Get(); diff --git a/Plugins/Cog/Source/CogWindow/Private/CogWindowManager.cpp b/Plugins/Cog/Source/CogWindow/Private/CogWindowManager.cpp index 143ae46..76ff7e5 100644 --- a/Plugins/Cog/Source/CogWindow/Private/CogWindowManager.cpp +++ b/Plugins/Cog/Source/CogWindow/Private/CogWindowManager.cpp @@ -368,8 +368,6 @@ UCogWindowManager::FMenu* UCogWindowManager::AddMenu(const FString& Name) //-------------------------------------------------------------------------------------------------------------------------- void UCogWindowManager::RenderMainMenu() { - const UPlayerInput* PlayerInput = FCogImguiInputHelper::GetPlayerInput(*GetWorld()); - IsRenderingInMainMenu = true; //----------------------------------------------------------------------------------------------- @@ -623,7 +621,7 @@ void UCogWindowManager::SettingsHandler_ClearAll(ImGuiContext* Context, ImGuiSet //-------------------------------------------------------------------------------------------------------------------------- void UCogWindowManager::SettingsHandler_ApplyAll(ImGuiContext* Context, ImGuiSettingsHandler* Handler) { - UCogWindowManager* Manager = (UCogWindowManager*)Handler->UserData; + UCogWindowManager* Manager = static_cast(Handler->UserData); Manager->Widgets.Sort([](const FCogWindow& Window1, const FCogWindow& Window2) { @@ -636,15 +634,15 @@ void* UCogWindowManager::SettingsHandler_ReadOpen(ImGuiContext* Context, ImGuiSe { if (strcmp(Name, "Windows") == 0) { - return (void*)1; + return reinterpret_cast(1); } if (strcmp(Name, "Widgets") == 0) { - UCogWindowManager* Manager = (UCogWindowManager*)Handler->UserData; + UCogWindowManager* Manager = static_cast(Handler->UserData); Manager->WidgetsOrderIndex = 0; - return (void*)2; + return reinterpret_cast(2); } return nullptr; @@ -656,7 +654,7 @@ void UCogWindowManager::SettingsHandler_ReadLine(ImGuiContext* Context, ImGuiSet //----------------------------------------------------------------------------------- // Load the visibility of windows. //----------------------------------------------------------------------------------- - if (Entry == (void*)1) + if (Entry == reinterpret_cast(1)) { ImGuiID Id; int32 ShowMenu; @@ -666,7 +664,7 @@ void UCogWindowManager::SettingsHandler_ReadLine(ImGuiContext* Context, ImGuiSet if (sscanf(Line, "0x%08X", &Id) == 1) #endif { - UCogWindowManager* Manager = (UCogWindowManager*)Handler->UserData; + UCogWindowManager* Manager = static_cast(Handler->UserData); if (FCogWindow* Window = Manager->FindWindowByID(Id)) { Window->SetIsVisible(true); @@ -677,7 +675,7 @@ void UCogWindowManager::SettingsHandler_ReadLine(ImGuiContext* Context, ImGuiSet //----------------------------------------------------------------------------------- // Load which widgets are present in the main menu bar and with what order. //----------------------------------------------------------------------------------- - else if (Entry == (void*)2) + else if (Entry == reinterpret_cast(2)) { ImGuiID Id; int32 Visible = false; @@ -687,7 +685,7 @@ void UCogWindowManager::SettingsHandler_ReadLine(ImGuiContext* Context, ImGuiSet if (sscanf(Line, "0x%08X %d", &Id, &Visible) == 2) #endif { - UCogWindowManager* Manager = (UCogWindowManager*)Handler->UserData; + UCogWindowManager* Manager = static_cast(Handler->UserData); if (FCogWindow* Window = Manager->FindWindowByID(Id)) { Window->SetWidgetOrderIndex(Manager->WidgetsOrderIndex); @@ -702,7 +700,7 @@ void UCogWindowManager::SettingsHandler_ReadLine(ImGuiContext* Context, ImGuiSet //-------------------------------------------------------------------------------------------------------------------------- void UCogWindowManager::SettingsHandler_WriteAll(ImGuiContext* Context, ImGuiSettingsHandler* Handler, ImGuiTextBuffer* Buffer) { - const UCogWindowManager* Manager = (UCogWindowManager*)Handler->UserData; + const UCogWindowManager* Manager = static_cast(Handler->UserData); //----------------------------------------------------------------------------------- // Save the visibility of windows. Example: @@ -715,7 +713,7 @@ void UCogWindowManager::SettingsHandler_WriteAll(ImGuiContext* Context, ImGuiSet { if (Window->GetIsVisible()) { - Buffer->appendf("0x%08X %d\n", Window->GetID(), (int32)Window->bShowMenu); + Buffer->appendf("0x%08X %d\n", Window->GetID(), static_cast(Window->bShowMenu)); } } Buffer->append("\n"); diff --git a/Plugins/Cog/Source/CogWindow/Private/CogWindowWidgets.cpp b/Plugins/Cog/Source/CogWindow/Private/CogWindowWidgets.cpp index a38b7af..3e0aa73 100644 --- a/Plugins/Cog/Source/CogWindow/Private/CogWindowWidgets.cpp +++ b/Plugins/Cog/Source/CogWindow/Private/CogWindowWidgets.cpp @@ -129,7 +129,6 @@ void FCogWindowWidgets::ProgressBarCentered(float Fraction, const ImVec2& Size, Fraction = ImSaturate(Fraction); ImGui::RenderFrame(bb.Min, bb.Max, ImGui::GetColorU32(ImGuiCol_FrameBg), true, style.FrameRounding); bb.Expand(ImVec2(-style.FrameBorderSize, -style.FrameBorderSize)); - const ImVec2 fill_br = ImVec2(ImLerp(bb.Min.x, bb.Max.x, Fraction), bb.Max.y); ImGui::RenderRectFilledRangeH(window->DrawList, bb, ImGui::GetColorU32(ImGuiCol_PlotHistogram), 0.0f, Fraction, style.FrameRounding); // Default displaying the fraction as percentage string, but user can override it @@ -140,7 +139,7 @@ void FCogWindowWidgets::ProgressBarCentered(float Fraction, const ImVec2& Size, Overlay = overlay_buf; } - ImVec2 overlay_size = ImGui::CalcTextSize(Overlay, NULL); + ImVec2 overlay_size = ImGui::CalcTextSize(Overlay, nullptr); if (overlay_size.x > 0.0f) { @@ -148,17 +147,16 @@ void FCogWindowWidgets::ProgressBarCentered(float Fraction, const ImVec2& Size, ImVec2 pos2(pos1.x + 1, pos1.y + 1); ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(0, 0, 0, 255)); - ImGui::RenderTextClipped(pos2, bb.Max, Overlay, NULL, &overlay_size, ImVec2(0.0f, 0.5f), &bb); + ImGui::RenderTextClipped(pos2, bb.Max, Overlay, nullptr, &overlay_size, ImVec2(0.0f, 0.5f), &bb); ImGui::PopStyleColor(); - ImGui::RenderTextClipped(pos1, bb.Max, Overlay, NULL, &overlay_size, ImVec2(0.0f, 0.5f), &bb); + ImGui::RenderTextClipped(pos1, bb.Max, Overlay, nullptr, &overlay_size, ImVec2(0.0f, 0.5f), &bb); } } //-------------------------------------------------------------------------------------------------------------------------- bool FCogWindowWidgets::ToggleMenuButton(bool* Value, const char* Text, const ImVec4& TrueColor) { - bool IsPressed = false; bool IsTrue = *Value; if (IsTrue) { @@ -171,7 +169,7 @@ bool FCogWindowWidgets::ToggleMenuButton(bool* Value, const char* Text, const Im ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0)); } - IsPressed = ImGui::Button(Text); + bool IsPressed = ImGui::Button(Text); if (IsPressed) { *Value = !*Value; @@ -270,9 +268,9 @@ void FCogWindowWidgets::HelpMarker(const char* Text) void FCogWindowWidgets::PushStyleCompact() { ImGuiStyle& style = ImGui::GetStyle(); - ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(style.WindowPadding.x * 0.60f, (float)(int)(style.WindowPadding.y * 0.60f))); - ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(style.FramePadding.x * 0.60f, (float)(int)(style.FramePadding.y * 0.60f))); - ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(style.ItemSpacing.x * 0.60f, (float)(int)(style.ItemSpacing.y * 0.60f))); + ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(style.WindowPadding.x * 0.60f, static_cast(style.WindowPadding.y * 0.60f))); + ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(style.FramePadding.x * 0.60f, static_cast(style.FramePadding.y * 0.60f))); + ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(style.ItemSpacing.x * 0.60f, static_cast(style.ItemSpacing.y * 0.60f))); } //-------------------------------------------------------------------------------------------------------------------------- @@ -344,7 +342,7 @@ float FCogWindowWidgets::GetFontWidth() } //-------------------------------------------------------------------------------------------------------------------------- -bool FCogWindowWidgets::ComboboxEnum(const char* Label, UObject* Object, const char* FieldName, uint8* PointerToEnumValue) +bool FCogWindowWidgets::ComboboxEnum(const char* Label, const UObject* Object, const char* FieldName, uint8* PointerToEnumValue) { const FEnumProperty* EnumProperty = CastField(Object->GetClass()->FindPropertyByName(FName(FieldName))); if (EnumProperty == nullptr) @@ -374,7 +372,7 @@ bool FCogWindowWidgets::ComboboxEnum(const char* Label, const FEnumProperty* Enu } //-------------------------------------------------------------------------------------------------------------------------- -bool FCogWindowWidgets::ComboboxEnum(const char* Label, UEnum* Enum, int64 CurrentValue, int64& NewValue) +bool FCogWindowWidgets::ComboboxEnum(const char* Label, const UEnum* Enum, int64 CurrentValue, int64& NewValue) { bool HasChanged = false; @@ -666,9 +664,9 @@ bool FCogWindowWidgets::MultiChoiceButton(const char* Label, bool IsSelected, co bool FCogWindowWidgets::MultiChoiceButtonsInt(TArray& InValues, int32& InCurrentValue, const ImVec2& InSize, bool InInline) { ImGuiStyle& Style = ImGui::GetStyle(); - ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(Style.WindowPadding.x * 0.40f, (float)(int)(Style.WindowPadding.y * 0.60f))); - ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(Style.FramePadding.x * 0.40f, (float)(int)(Style.FramePadding.y * 0.60f))); - ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(Style.ItemSpacing.x * 0.30f, (float)(int)(Style.ItemSpacing.y * 0.60f))); + ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(Style.WindowPadding.x * 0.40f, static_cast(Style.WindowPadding.y * 0.60f))); + ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(Style.FramePadding.x * 0.40f, static_cast(Style.FramePadding.y * 0.60f))); + ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(Style.ItemSpacing.x * 0.30f, static_cast(Style.ItemSpacing.y * 0.60f))); ImGui::PushStyleColor(ImGuiCol_Border, IM_COL32(255, 255, 255, 180)); bool IsPressed = false; @@ -711,9 +709,9 @@ FString FCogWindowWidgets::FormatSmallFloat(float InValue) bool FCogWindowWidgets::MultiChoiceButtonsFloat(TArray& InValues, float& InValue, const ImVec2& InSize, bool InInline) { ImGuiStyle& Style = ImGui::GetStyle(); - ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(Style.WindowPadding.x * 0.40f, (float)(int)(Style.WindowPadding.y * 0.60f))); - ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(Style.FramePadding.x * 0.40f, (float)(int)(Style.FramePadding.y * 0.60f))); - ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(Style.ItemSpacing.x * 0.30f, (float)(int)(Style.ItemSpacing.y * 0.60f))); + ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(Style.WindowPadding.x * 0.40f, static_cast(Style.WindowPadding.y * 0.60f))); + ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(Style.FramePadding.x * 0.40f, static_cast(Style.FramePadding.y * 0.60f))); + ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(Style.ItemSpacing.x * 0.30f, static_cast(Style.ItemSpacing.y * 0.60f))); ImGui::PushStyleColor(ImGuiCol_Border, IM_COL32(255, 255, 255, 180)); bool IsPressed = false; @@ -759,7 +757,7 @@ bool FCogWindowWidgets::ComboCollisionChannel(const char* Label, ECollisionChann bool Result = false; if (ImGui::BeginCombo(Label, TCHAR_TO_ANSI(*SelectedChannelName.ToString()), ImGuiComboFlags_HeightLarge)) { - for (int32 ChannelIndex = 0; ChannelIndex < (int32)ECC_OverlapAll_Deprecated; ++ChannelIndex) + for (int32 ChannelIndex = 0; ChannelIndex < static_cast(ECC_OverlapAll_Deprecated); ++ChannelIndex) { FColor Color = ChannelColors[ChannelIndex]; if (Color == FColor::Transparent) @@ -778,7 +776,7 @@ bool FCogWindowWidgets::ComboCollisionChannel(const char* Label, ECollisionChann { if (ImGui::Selectable(TCHAR_TO_ANSI(*ChannelName.ToString()))) { - Channel = (ECollisionChannel)ChannelIndex; + Channel = static_cast(ChannelIndex); Result = true; } } @@ -832,7 +830,7 @@ bool FCogWindowWidgets::CollisionProfileChannels(int32& Channels) bool Result = false; - for (int32 ChannelIndex = 0; ChannelIndex < (int32)ECC_OverlapAll_Deprecated; ++ChannelIndex) + for (int32 ChannelIndex = 0; ChannelIndex < static_cast(ECC_OverlapAll_Deprecated); ++ChannelIndex) { FColor Color = ChannelColors[ChannelIndex]; if (Color == FColor::Transparent) @@ -905,7 +903,7 @@ bool FCogWindowWidgets::ActorsListWithFilters(AActor*& NewSelection, const UWorl } //-------------------------------------------------------------------------------------------------------------------------- -bool FCogWindowWidgets::ActorsList(AActor*& NewSelection, const UWorld& World, const TSubclassOf ActorClass, const ImGuiTextFilter* Filter, const APawn* LocalPlayerPawn, const FCogWindowActorContextMenuFunction& ContextMenuFunction) +bool FCogWindowWidgets::ActorsList(AActor*& NewSelection, const UWorld& World, const TSubclassOf& ActorClass, const ImGuiTextFilter* Filter, const APawn* LocalPlayerPawn, const FCogWindowActorContextMenuFunction& ContextMenuFunction) { TArray Actors; for (TActorIterator It(&World, ActorClass); It; ++It) @@ -977,12 +975,11 @@ bool FCogWindowWidgets::ActorsList(AActor*& NewSelection, const UWorld& World, c } //-------------------------------------------------------------------------------------------------------------------------- -bool FCogWindowWidgets::MenuActorsCombo(const char* StrID, AActor*& NewSelection, const UWorld& World, TSubclassOf ActorClass, const FCogWindowActorContextMenuFunction& ContextMenuFunction) +bool FCogWindowWidgets::MenuActorsCombo(const char* StrID, AActor*& NewSelection, const UWorld& World, const TSubclassOf& ActorClass, const FCogWindowActorContextMenuFunction& ContextMenuFunction) { int32 SelectedActorClassIndex = 0; const TArray ActorClasses = { ActorClass }; - AActor* Actor = nullptr; return MenuActorsCombo(StrID, NewSelection, World, ActorClasses, SelectedActorClassIndex, nullptr, nullptr, ContextMenuFunction); } diff --git a/Plugins/Cog/Source/CogWindow/Private/CogWindow_Inputs.cpp b/Plugins/Cog/Source/CogWindow/Private/CogWindow_Inputs.cpp deleted file mode 100644 index 5a44d55..0000000 --- a/Plugins/Cog/Source/CogWindow/Private/CogWindow_Inputs.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include "CogWindow_Inputs.h" - diff --git a/Plugins/Cog/Source/CogWindow/Public/CogWindow.h b/Plugins/Cog/Source/CogWindow/Public/CogWindow.h index 750e7ac..9c7dcce 100644 --- a/Plugins/Cog/Source/CogWindow/Public/CogWindow.h +++ b/Plugins/Cog/Source/CogWindow/Public/CogWindow.h @@ -34,7 +34,7 @@ public: /** Called every frame with a valid imgui context even if the window is hidden. */ virtual void RenderTick(float DeltaTime); - /** Called every frame without a valid imgui context (outside of the imgui NewFrame/EndFrame) even if the window is hidden. */ + /** Called every frame without a valid imgui context (outside the imgui NewFrame/EndFrame) even if the window is hidden. */ virtual void GameTick(float DeltaTime); /** */ @@ -80,7 +80,7 @@ public: template const T* GetAsset() const { return Cast(GetAsset(T::StaticClass())); } - const UObject* GetAsset(const TSubclassOf AssetClass) const; + const UObject* GetAsset(const TSubclassOf& AssetClass) const; protected: diff --git a/Plugins/Cog/Source/CogWindow/Public/CogWindowHelper.h b/Plugins/Cog/Source/CogWindow/Public/CogWindowHelper.h index ff7fa51..aec6609 100644 --- a/Plugins/Cog/Source/CogWindow/Public/CogWindowHelper.h +++ b/Plugins/Cog/Source/CogWindow/Public/CogWindowHelper.h @@ -18,7 +18,7 @@ public: template static const T* GetFirstAssetByClass(); - static const UObject* GetFirstAssetByClass(const TSubclassOf AssetClass); + static const UObject* GetFirstAssetByClass(const TSubclassOf& AssetClass); }; //---------------------------------------------------------------------------------------------------------------------- diff --git a/Plugins/Cog/Source/CogWindow/Public/CogWindowManager.h b/Plugins/Cog/Source/CogWindow/Public/CogWindowManager.h index 2b75475..5e07959 100644 --- a/Plugins/Cog/Source/CogWindow/Public/CogWindowManager.h +++ b/Plugins/Cog/Source/CogWindow/Public/CogWindowManager.h @@ -126,8 +126,6 @@ protected: static void SettingsHandler_WriteAll(ImGuiContext* ctx, ImGuiSettingsHandler* handler, ImGuiTextBuffer* buf); - static void DisableConflictingCommand(UPlayerInput* InPlayerInput, const FCogImGuiKeyInfo& InShortcut); - static FString ToggleInputCommand; static FString DisableInputCommand; diff --git a/Plugins/Cog/Source/CogWindow/Public/CogWindowModule.h b/Plugins/Cog/Source/CogWindow/Public/CogWindowModule.h index 6ae7c71..b194dc7 100644 --- a/Plugins/Cog/Source/CogWindow/Public/CogWindowModule.h +++ b/Plugins/Cog/Source/CogWindow/Public/CogWindowModule.h @@ -13,5 +13,4 @@ public: virtual void ShutdownModule() override; -private: }; diff --git a/Plugins/Cog/Source/CogWindow/Public/CogWindowWidgets.h b/Plugins/Cog/Source/CogWindow/Public/CogWindowWidgets.h index 2d47f33..619b533 100644 --- a/Plugins/Cog/Source/CogWindow/Public/CogWindowWidgets.h +++ b/Plugins/Cog/Source/CogWindow/Public/CogWindowWidgets.h @@ -63,7 +63,7 @@ public: static void PopStyleCompact(); - static void AddTextWithShadow(ImDrawList* DrawList, const ImVec2& Position, ImU32 Color, const char* TextBegin, const char* TextEnd = NULL); + static void AddTextWithShadow(ImDrawList* DrawList, const ImVec2& Position, ImU32 Color, const char* TextBegin, const char* TextEnd = nullptr); static bool SearchBar(const char* InLabel, ImGuiTextFilter& InFilter, float InWidth = -1.0f); @@ -83,9 +83,9 @@ public: template static bool ComboboxEnum(const char* Label, EnumType& Value); - static bool ComboboxEnum(const char* Label, UEnum* Enum, int64 CurrentValue, int64& NewValue); + static bool ComboboxEnum(const char* Label, const UEnum* Enum, int64 CurrentValue, int64& NewValue); - static bool ComboboxEnum(const char* Label, UObject* Object, const char* FieldName, uint8* PointerToEnumValue); + static bool ComboboxEnum(const char* Label, const UObject* Object, const char* FieldName, uint8* PointerToEnumValue); static bool ComboboxEnum(const char* Label, const FEnumProperty* EnumProperty, uint8* PointerToEnumValue); @@ -107,13 +107,13 @@ public: static bool CollisionProfileChannels(int32& Channels); - static bool MenuActorsCombo(const char* StrID, AActor*& NewSelection, const UWorld& World, TSubclassOf ActorClass, const FCogWindowActorContextMenuFunction& ContextMenuFunction = nullptr); + static bool MenuActorsCombo(const char* StrID, AActor*& NewSelection, const UWorld& World, const TSubclassOf& ActorClass, const FCogWindowActorContextMenuFunction& ContextMenuFunction = nullptr); static bool MenuActorsCombo(const char* StrID, AActor*& NewSelection, const UWorld& World, const TArray>& ActorClasses, int32& SelectedActorClassIndex, ImGuiTextFilter* Filter, const APawn* LocalPlayerPawn, const FCogWindowActorContextMenuFunction& ContextMenuFunction = nullptr); static bool ActorsListWithFilters(AActor*& NewSelection, const UWorld& World, const TArray>& ActorClasses, int32& SelectedActorClassIndex, ImGuiTextFilter* Filter, const APawn* LocalPlayerPawn, const FCogWindowActorContextMenuFunction& ContextMenuFunction = nullptr); - static bool ActorsList(AActor*& NewSelection, const UWorld& World, const TSubclassOf ActorClass, const ImGuiTextFilter* Filter = nullptr, const APawn* LocalPlayerPawn = nullptr, const FCogWindowActorContextMenuFunction& ContextMenuFunction = nullptr); + static bool ActorsList(AActor*& NewSelection, const UWorld& World, const TSubclassOf& ActorClass, const ImGuiTextFilter* Filter = nullptr, const APawn* LocalPlayerPawn = nullptr, const FCogWindowActorContextMenuFunction& ContextMenuFunction = nullptr); static void ActorContextMenu(AActor& Selection, const FCogWindowActorContextMenuFunction& ContextMenuFunction); @@ -159,9 +159,9 @@ template bool FCogWindowWidgets::ComboboxEnum(const char* Label, const EnumType CurrentValue, EnumType& NewValue) { int64 NewValueInt; - if (ComboboxEnum(Label, StaticEnum(), (int64)CurrentValue, NewValueInt)) + if (ComboboxEnum(Label, StaticEnum(), static_cast(CurrentValue), NewValueInt)) { - NewValue = (EnumType)NewValueInt; + NewValue = static_cast(NewValueInt); return true; } diff --git a/Plugins/Cog/Source/CogWindow/Public/CogWindow_Inputs.h b/Plugins/Cog/Source/CogWindow/Public/CogWindow_Inputs.h deleted file mode 100644 index 6f70f09..0000000 --- a/Plugins/Cog/Source/CogWindow/Public/CogWindow_Inputs.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/Plugins/Cog/Source/CogWindow/Public/CogWindow_Settings.h b/Plugins/Cog/Source/CogWindow/Public/CogWindow_Settings.h index 54bf835..48c31fc 100644 --- a/Plugins/Cog/Source/CogWindow/Public/CogWindow_Settings.h +++ b/Plugins/Cog/Source/CogWindow/Public/CogWindow_Settings.h @@ -4,7 +4,6 @@ #include "CogCommonConfig.h" #include "CogImguiKeyInfo.h" #include "CogWindow.h" -#include "GameFramework/PlayerInput.h" #include "CogWindow_Settings.generated.h" class UCogEngineConfig_Settings; diff --git a/Plugins/Cog/Source/CogWindow/Public/CogWindow_Spacing.h b/Plugins/Cog/Source/CogWindow/Public/CogWindow_Spacing.h index 15997a2..a4ffb64 100644 --- a/Plugins/Cog/Source/CogWindow/Public/CogWindow_Spacing.h +++ b/Plugins/Cog/Source/CogWindow/Public/CogWindow_Spacing.h @@ -7,14 +7,10 @@ class COGWINDOW_API FCogWindow_Spacing : public FCogWindow { typedef FCogWindow Super; -public: - protected: virtual void PreRender(ImGuiWindowFlags& WindowFlags) override; virtual void PostRender() override; -private: - }; diff --git a/Plugins/CogAI/Source/CogAI/Private/CogAIWindow_BehaviorTree.cpp b/Plugins/CogAI/Source/CogAI/Private/CogAIWindow_BehaviorTree.cpp index 6d3f74a..65cb6a0 100644 --- a/Plugins/CogAI/Source/CogAI/Private/CogAIWindow_BehaviorTree.cpp +++ b/Plugins/CogAI/Source/CogAI/Private/CogAIWindow_BehaviorTree.cpp @@ -135,8 +135,8 @@ void FCogAIWindow_BehaviorTree::RenderContent() { if (ImGui::BeginMenu("Options")) { - ImGui::ColorEdit4("Active Color", (float*)&Config->ActiveColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); - ImGui::ColorEdit4("Inactive Color", (float*)&Config->InactiveColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); + ImGui::ColorEdit4("Active Color", &Config->ActiveColor.X, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); + ImGui::ColorEdit4("Inactive Color", &Config->InactiveColor.X, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); ImGui::EndMenu(); } @@ -276,7 +276,7 @@ void FCogAIWindow_BehaviorTree::RenderNode(UBehaviorTreeComponent& BehaviorTreeC ImGui::TableSetupColumn("Property"); ImGui::TableSetupColumn("Value", ImGuiTableColumnFlags_WidthStretch); - const ImVec4 TextColor(1.0f, 1.0f, 1.0f, 0.5f); + constexpr ImVec4 TextColor(1.0f, 1.0f, 1.0f, 0.5f); //------------------------ // Name diff --git a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityCheat_Execution_ApplyEffect.cpp b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityCheat_Execution_ApplyEffect.cpp index 8bd0b58..e61250a 100644 --- a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityCheat_Execution_ApplyEffect.cpp +++ b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityCheat_Execution_ApplyEffect.cpp @@ -7,7 +7,6 @@ #include "CogAbilityConfig_Alignment.h" #include "CogImguiHelper.h" #include "CogWindow.h" -#include "MeshPaintVisualize.h" //-------------------------------------------------------------------------------------------------------------------------- void UCogAbilityCheat_Execution_ApplyEffect::Execute_Implementation(const UObject* WorldContextObject, const AActor* Instigator, const TArray& Targets) const diff --git a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityConfig_Alignment.cpp b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityConfig_Alignment.cpp index 2ca4385..8b501f2 100644 --- a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityConfig_Alignment.cpp +++ b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityConfig_Alignment.cpp @@ -86,62 +86,53 @@ FVector4f UCogAbilityConfig_Alignment::GetEffectModifierColor(float ModifierValu { switch (ModifierOp) { - case EGameplayModOp::Additive: + case EGameplayModOp::AddBase: + case EGameplayModOp::AddFinal: { if (ModifierValue > 0.0f) - { - return PositiveColor; - } + { return PositiveColor; } if (ModifierValue < 0.0f) - { - return NegativeColor; - } - break; + { return NegativeColor; } + + return NeutralColor; } - case EGameplayModOp::Multiplicitive: + case EGameplayModOp::MultiplyAdditive: + case EGameplayModOp::MultiplyCompound: { if (ModifierValue > 1.0f) - { - return PositiveColor; - } - else if (ModifierValue < 1.0f) - { - return NegativeColor; - } - break; + { return PositiveColor; } + + if (ModifierValue < 1.0f) + { return NegativeColor; } + + return NeutralColor; } - case EGameplayModOp::Division: + case EGameplayModOp::DivideAdditive: { if (ModifierValue < 1.0f) - { - return PositiveColor; - } + { return PositiveColor; } if (ModifierValue > 1.0f) - { - return NegativeColor; - } - break; + { return NegativeColor; } + + return NeutralColor; } case EGameplayModOp::Override: { if (ModifierValue > BaseValue) - { - return PositiveColor; - } + { return PositiveColor; } if (ModifierValue < BaseValue) - { - return NegativeColor; - } - break; - } - } + { return NegativeColor; } - return NeutralColor; + return NeutralColor; + } + + default: return NeutralColor; + } } diff --git a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityHelper.cpp b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityHelper.cpp index bfe67fa..8a47bcd 100644 --- a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityHelper.cpp +++ b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityHelper.cpp @@ -1,5 +1,6 @@ #include "CogAbilityHelper.h" +#include "CogAbilityDataAsset.h" #include "CogWindowWidgets.h" #include "GameplayTagContainer.h" #include "imgui.h" @@ -56,4 +57,17 @@ void FCogAbilityHelper::RenderTagContainer( ImGui::SameLine(); } } +} + +//-------------------------------------------------------------------------------------------------------------------------- +void FCogAbilityHelper::RenderConfigureMessage(const TWeakObjectPtr InAsset) +{ + if (InAsset == nullptr) + { + ImGui::Text("Create a DataAsset child of '%s' to configure. ", StringCast(*UCogAbilityDataAsset::StaticClass()->GetName()).Get()); + } + else + { + ImGui::Text("Can be configured in the '%s' DataAsset. ", StringCast(*GetNameSafe(InAsset.Get())).Get()); + } } \ No newline at end of file diff --git a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Abilities.cpp b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Abilities.cpp index a9ad30d..fcaf61b 100644 --- a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Abilities.cpp +++ b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Abilities.cpp @@ -32,8 +32,7 @@ void FCogAbilityWindow_Abilities::RenderHelp() "This window displays the gameplay abilities of the selected actor. " "Click the ability check box to force its activation or deactivation. " "Right click an ability to open or close the ability separate window. " - "Use the 'Give Ability' menu to manually give an ability from a list defined in the '%s' data asset. " - , TCHAR_TO_ANSI(*GetNameSafe(Asset.Get()))); + ); } //-------------------------------------------------------------------------------------------------------------------------- @@ -185,12 +184,12 @@ void FCogAbilityWindow_Abilities::RenderAbilitiesMenuFilters() //-------------------------------------------------------------------------------------------------------------------------- void FCogAbilityWindow_Abilities::RenderAbilitiesMenuColorSettings() { - ImGui::ColorEdit4("Active Color", (float*)&Config->ActiveAbilityColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); - ImGui::ColorEdit4("Inactive Color", (float*)&Config->InactiveAbilityColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); - ImGui::ColorEdit4("Blocked Color", (float*)&Config->BlockedAbilityColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); - ImGui::ColorEdit4("Default Tag Color", (float*)&Config->DefaultTagsColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); - ImGui::ColorEdit4("Blocked Tag Color", (float*)&Config->BlockedTagsColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); - ImGui::ColorEdit4("Input Pressed Color", (float*)&Config->InputPressedColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); + ImGui::ColorEdit4("Active Color", &Config->ActiveAbilityColor.X, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); + ImGui::ColorEdit4("Inactive Color", &Config->InactiveAbilityColor.X, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); + ImGui::ColorEdit4("Blocked Color", &Config->BlockedAbilityColor.X, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); + ImGui::ColorEdit4("Default Tag Color", &Config->DefaultTagsColor.X, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); + ImGui::ColorEdit4("Blocked Tag Color", &Config->BlockedTagsColor.X, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); + ImGui::ColorEdit4("Input Pressed Color", &Config->InputPressedColor.X, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); } //-------------------------------------------------------------------------------------------------------------------------- diff --git a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Attributes.cpp b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Attributes.cpp index 99af1aa..d32cd8b 100644 --- a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Attributes.cpp +++ b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Attributes.cpp @@ -87,11 +87,11 @@ void FCogAbilityWindow_Attributes::RenderContent() ImGui::SetItemTooltip("Prefixes to remove from the attribute set name. Separate multiple prefixes with the semicolon character ';'"); ImGui::Separator(); - ImGui::ColorEdit4("Positive Color", (float*)&AlignmentConfig->PositiveColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); - ImGui::ColorEdit4("Negative Color", (float*)&AlignmentConfig->NegativeColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); - ImGui::ColorEdit4("Neutral Color", (float*)&AlignmentConfig->NeutralColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); - ImGui::ColorEdit4("AttributeSet Color", (float*)&Config->AttributeSetColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); - ImGui::ColorEdit4("Category Color", (float*)&Config->CategoryColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); + ImGui::ColorEdit4("Positive Color", &AlignmentConfig->PositiveColor.X, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); + ImGui::ColorEdit4("Negative Color", &AlignmentConfig->NegativeColor.X, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); + ImGui::ColorEdit4("Neutral Color", &AlignmentConfig->NeutralColor.X, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); + ImGui::ColorEdit4("AttributeSet Color", &Config->AttributeSetColor.X, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); + ImGui::ColorEdit4("Category Color", &Config->CategoryColor.X, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); ImGui::Separator(); if (ImGui::MenuItem("Reset")) { @@ -108,7 +108,7 @@ void FCogAbilityWindow_Attributes::RenderContent() const bool bGroupByAttributeSetValue = Filter.IsActive() == false && Config->ShowOnlyModified == false && Config->GroupByAttributeSet; const bool bGroupByCategoryValue = Filter.IsActive() == false && Config->ShowOnlyModified == false && Config->GroupByCategory; const float bShowGroup = bGroupByAttributeSetValue | bGroupByCategoryValue; - const float FirstColWidth = ((int32)bGroupByAttributeSetValue + (int32)bGroupByCategoryValue) * ImGui::GetFontSize() * 2; + const float FirstColWidth = (static_cast(bGroupByAttributeSetValue) + static_cast(bGroupByCategoryValue)) * ImGui::GetFontSize() * 2; if (ImGui::BeginTable("Attributes", 5, ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_Resizable diff --git a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Cheats.cpp b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Cheats.cpp index 6c0d82e..7adb40c 100644 --- a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Cheats.cpp +++ b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Cheats.cpp @@ -5,7 +5,7 @@ //-------------------------------------------------------------------------------------------------------------------------- void FCogAbilityWindow_Cheats::RenderHelp() { - ImGui::TextDisabled("This window is deprecated. Please use the CogEngineWindow_Cheat instead as it provide more functionnalities."); + ImGui::TextDisabled("This window is deprecated. Please use the CogEngineWindow_Cheat instead as it provide more functionalities."); } //-------------------------------------------------------------------------------------------------------------------------- diff --git a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Effects.cpp b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Effects.cpp index 3af1525..5c31206 100644 --- a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Effects.cpp +++ b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Effects.cpp @@ -53,9 +53,9 @@ void FCogAbilityWindow_Effects::RenderContent() ImGui::Checkbox("Sort by Alignment", &Config->SortByAlignment); ImGui::Separator(); - ImGui::ColorEdit4("Positive Color", (float*)&AlignmentConfig->PositiveColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); - ImGui::ColorEdit4("Negative Color", (float*)&AlignmentConfig->NegativeColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); - ImGui::ColorEdit4("Neutral Color", (float*)&AlignmentConfig->NeutralColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); + ImGui::ColorEdit4("Positive Color", &AlignmentConfig->PositiveColor.X, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); + ImGui::ColorEdit4("Negative Color", &AlignmentConfig->NegativeColor.X, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); + ImGui::ColorEdit4("Neutral Color", &AlignmentConfig->NeutralColor.X, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); ImGui::Separator(); if (ImGui::MenuItem("Reset")) @@ -128,7 +128,6 @@ void FCogAbilityWindow_Effects::RenderEffectsTable() } } - bool AlignmentOrder = false; if (Config->SortByAlignment && Asset != nullptr) { const FGameplayTagContainer& Tags1 = Effect1->GetAssetTags(); diff --git a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Pools.cpp b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Pools.cpp index 0374bdd..2753a99 100644 --- a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Pools.cpp +++ b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Pools.cpp @@ -3,6 +3,7 @@ #include "AbilitySystemComponent.h" #include "AbilitySystemGlobals.h" #include "CogAbilityDataAsset.h" +#include "CogAbilityHelper.h" #include "CogImguiHelper.h" #include "CogWindowWidgets.h" #include "imgui_internal.h" @@ -18,11 +19,8 @@ void FCogAbilityWindow_Pools::Initialize() //-------------------------------------------------------------------------------------------------------------------------- void FCogAbilityWindow_Pools::RenderHelp() { - ImGui::Text( - "This window displays attributes of the selected actor as pools. " - "The pools can be configured in the '%s' data asset." - , TCHAR_TO_ANSI(*GetNameSafe(Asset.Get())) - ); + ImGui::Text("This window displays attributes of the selected actor as pools. "); + FCogAbilityHelper::RenderConfigureMessage(Asset); } //-------------------------------------------------------------------------------------------------------------------------- @@ -87,13 +85,13 @@ void FCogAbilityWindow_Pools::DrawPool(const UAbilitySystemComponent* AbilitySys //------------------------------------------------------------------------------------------- // Use a different format base on max value for all pools to be nicely aligned at the center //------------------------------------------------------------------------------------------- - const char* format = nullptr; - if (Max >= 100) { format = "%3.0f / %3.0f"; } // |200 / 200| |__1 / 200| 3 characters with 0 floating point - else if (Max >= 10) { format = "%4.1f / %4.1f"; } // |20.0 / 20.0| |_1.1 / 20.0| 4 characters with 1 floating point - else { format = "%3.2f / %3.2f"; } // |2.00 / 2.00| |1.11 / 2.00| 3 characters with 2 floating points + const char* Format; + if (Max >= 100) { Format = "%3.0f / %3.0f"; } // |200 / 200| |__1 / 200| 3 characters with 0 floating point + else if (Max >= 10) { Format = "%4.1f / %4.1f"; } // |20.0 / 20.0| |_1.1 / 20.0| 4 characters with 1 floating point + else { Format = "%3.2f / %3.2f"; } // |2.00 / 2.00| |1.11 / 2.00| 3 characters with 2 floating points char Buffer[64]; - ImFormatString(Buffer, IM_ARRAYSIZE(Buffer), format, Value, Max); + ImFormatString(Buffer, IM_ARRAYSIZE(Buffer), Format, Value, Max); const float Ratio = Max > 0.0f ? Value / Max : 0.0f; diff --git a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Tags.cpp b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Tags.cpp index a35e319..42da23c 100644 --- a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Tags.cpp +++ b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Tags.cpp @@ -145,7 +145,7 @@ void FCogAbilityWindow_Tags::RenderTag(const UAbilitySystemComponent& AbilitySys { if (ImGui::BeginTable("Tag", 2, ImGuiTableFlags_Borders)) { - const ImVec4 TextColor(1.0f, 1.0f, 1.0f, 0.5f); + constexpr ImVec4 TextColor(1.0f, 1.0f, 1.0f, 0.5f); ImGui::TableSetupColumn("Property"); ImGui::TableSetupColumn("Value", ImGuiTableColumnFlags_WidthStretch); diff --git a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Tasks.cpp b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Tasks.cpp index e88e98e..5c74742 100644 --- a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Tasks.cpp +++ b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Tasks.cpp @@ -27,9 +27,9 @@ void FCogAbilityWindow_Tasks::RenderHelp() } //-------------------------------------------------------------------------------------------------------------------------- -void FCogAbilityWindow_Tasks::RenderTick(float DetlaTime) +void FCogAbilityWindow_Tasks::RenderTick(float DeltaTime) { - Super::RenderTick(DetlaTime); + Super::RenderTick(DeltaTime); } //-------------------------------------------------------------------------------------------------------------------------- @@ -74,11 +74,11 @@ void FCogAbilityWindow_Tasks::RenderTaskMenu(AActor* Selection) ImGui::Separator(); - ImGui::ColorEdit4("Uninitialized Color", (float*)&Config->UninitializedColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); - ImGui::ColorEdit4("Awaiting Activation Color", (float*)&Config->AwaitingActivationColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); - ImGui::ColorEdit4("Active Color", (float*)&Config->ActiveColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); - ImGui::ColorEdit4("Paused Color", (float*)&Config->PausedColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); - ImGui::ColorEdit4("Finished Color", (float*)&Config->FinishedColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); + ImGui::ColorEdit4("Uninitialized Color", &Config->UninitializedColor.X, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); + ImGui::ColorEdit4("Awaiting Activation Color", &Config->AwaitingActivationColor.X, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); + ImGui::ColorEdit4("Active Color", &Config->ActiveColor.X, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); + ImGui::ColorEdit4("Paused Color", &Config->PausedColor.X, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); + ImGui::ColorEdit4("Finished Color", &Config->FinishedColor.X, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf); ImGui::Separator(); @@ -102,8 +102,6 @@ void FCogAbilityWindow_Tasks::RenderTasksTable(UAbilitySystemComponent& AbilityS TArray FilteredTasks; FilteredTasks.Reserve(16); - const AActor* Selection = GetSelection(); - for (FConstGameplayTaskIterator it = AbilitySystemComponent.GetKnownTaskIterator(); it; ++it) { const UGameplayTask* Task = Cast(*it); @@ -311,7 +309,7 @@ void FCogAbilityWindow_Tasks::RenderTaskInfo(const UGameplayTask* Task) ImGui::TableNextColumn(); ImGui::TextColored(TextColor, "Priority"); ImGui::TableNextColumn(); - ImGui::Text("%d", (int32)Task->GetPriority()); + ImGui::Text("%d", static_cast(Task->GetPriority())); //------------------------ // IsTicking diff --git a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Tweaks.cpp b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Tweaks.cpp index 14e3592..7477ce9 100644 --- a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Tweaks.cpp +++ b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Tweaks.cpp @@ -1,6 +1,7 @@ #include "CogAbilityWindow_Tweaks.h" #include "CogAbilityDataAsset.h" +#include "CogAbilityHelper.h" #include "CogAbilityReplicator.h" #include "CogImguiHelper.h" #include "CogWindowWidgets.h" @@ -20,10 +21,10 @@ void FCogAbilityWindow_Tweaks::RenderHelp() { ImGui::Text( "This window can be used to apply tweaks to all the loaded actors. " - "The tweaks are used to test various gameplay settings by actor category. " - "The tweaks can be configured in the '%s' data asset. " - , TCHAR_TO_ANSI(*GetNameSafe(Asset.Get())) + "Tweaks are used to test various gameplay settings by actor category. " ); + + FCogAbilityHelper::RenderConfigureMessage(Asset); } //-------------------------------------------------------------------------------------------------------------------------- diff --git a/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityHelper.h b/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityHelper.h index f0a7fd4..c24e6bb 100644 --- a/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityHelper.h +++ b/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityHelper.h @@ -3,7 +3,6 @@ #include "CoreMinimal.h" #include "imgui.h" - class UCogAbilityDataAsset; class UGameplayEffect; namespace EGameplayModOp { enum Type : int; } @@ -25,5 +24,6 @@ public: const bool Inline = false, const ImVec4& DefaultColor = ImVec4(0.4f, 0.4f, 0.4f, 1.0f), const ImVec4& MatchColor = ImVec4(1.0f, 0.0f, 0.0f, 1.0f)); - + + static void RenderConfigureMessage(TWeakObjectPtr InAsset); }; diff --git a/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Pools.h b/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Pools.h index bf66e8e..5887bc3 100644 --- a/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Pools.h +++ b/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Pools.h @@ -1,7 +1,6 @@ #pragma once #include "CoreMinimal.h" -#include "GameplayTagContainer.h" #include "CogWindow.h" class UCogAbilityDataAsset; diff --git a/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Tags.h b/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Tags.h index 8a12abc..b8eee8c 100644 --- a/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Tags.h +++ b/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Tags.h @@ -47,7 +47,7 @@ class COGABILITY_API FCogAbilityWindow_OwnedTags : public FCogAbilityWindow_Tags virtual void RenderHelp() override; - virtual void GetTagContainer(FGameplayTagContainer& TagContainer); + virtual void GetTagContainer(FGameplayTagContainer& TagContainer) override; }; @@ -60,7 +60,7 @@ class COGABILITY_API FCogAbilityWindow_BlockedTags : public FCogAbilityWindow_Ta virtual void RenderHelp() override; - virtual void GetTagContainer(FGameplayTagContainer& TagContainer); + virtual void GetTagContainer(FGameplayTagContainer& TagContainer) override; }; //-------------------------------------------------------------------------------------------------------------------------- diff --git a/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Tasks.h b/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Tasks.h index 38d9001..fd19184 100644 --- a/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Tasks.h +++ b/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Tasks.h @@ -21,7 +21,7 @@ protected: virtual void RenderHelp() override; - virtual void RenderTick(float DetlaTime) override; + virtual void RenderTick(float DeltaTime) override; virtual void RenderContent() override; diff --git a/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Tweaks.h b/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Tweaks.h index d84c04c..ec655e3 100644 --- a/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Tweaks.h +++ b/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Tweaks.h @@ -25,5 +25,5 @@ protected: private: - TObjectPtr Asset = nullptr; + TWeakObjectPtr Asset; }; diff --git a/Plugins/CogAll/Source/CogAll/Private/CogAll.cpp b/Plugins/CogAll/Source/CogAll/Private/CogAll.cpp index b9733dc..c9c9cfb 100644 --- a/Plugins/CogAll/Source/CogAll/Private/CogAll.cpp +++ b/Plugins/CogAll/Source/CogAll/Private/CogAll.cpp @@ -37,8 +37,6 @@ #include "CogWindowManager.h" #include "Engine/Engine.h" -#include "GameFramework/Character.h" -#include "GameFramework/GameStateBase.h" #include "GameFramework/GameUserSettings.h" //-------------------------------------------------------------------------------------------------------------------------- @@ -92,7 +90,7 @@ void Cog::AddAllWindows(UCogWindowManager& CogWindowManager) CogWindowManager.AddWindow("Engine.Spawns"); - FCogEngineWindow_Stats* StatsWindow = CogWindowManager.AddWindow("Engine.Stats"); + CogWindowManager.AddWindow("Engine.Stats"); CogWindowManager.AddWindow("Engine.Time Scale"); diff --git a/Plugins/CogAll/Source/CogAll/Public/CogAllModule.h b/Plugins/CogAll/Source/CogAll/Public/CogAllModule.h index b3c8ac0..63b5832 100644 --- a/Plugins/CogAll/Source/CogAll/Public/CogAllModule.h +++ b/Plugins/CogAll/Source/CogAll/Public/CogAllModule.h @@ -8,7 +8,7 @@ class COGALL_API FCogAllModule : public IModuleInterface public: - static inline FCogAllModule &Get() { return FModuleManager::LoadModuleChecked("CogAll"); } + static FCogAllModule &Get() { return FModuleManager::LoadModuleChecked("CogAll"); } /** IModuleInterface implementation */ virtual void StartupModule() override;