izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix non-unity build with camera modifier debug output

Browse Source 
#jira

#ROBOMERGE-OWNER: jeanmichel.dignard
#ROBOMERGE-AUTHOR: peter.knepley
#ROBOMERGE-SOURCE: CL 14502529 via CL 14502532 via CL 14525836 via CL 14525903 via CL 14526294
#ROBOMERGE-BOT: TOOLS (Main -> Dev-Tools-Staging) (v753-14616146)

[CL 14630700 by peter knepley in Dev-Tools-Staging branch]
This commit is contained in:
peter knepley
2020-11-02 13:36:38 -05:00
parent 72a1ed5f99
commit 2267686f52
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Engine/Source/Runtime/Engine/Classes/Camera/CameraModifier.h
View File

@@ -11,6 +11,7 @@
class AActor;
class APlayerCameraManager;
class FDebugDisplayInfo;
//=============================================================================
/**
@@ -74,7 +75,7 @@ public:
* @param YL - Vertical spacing.
* @param YPos - Current vertical space to start writing.
*/
virtual void DisplayDebug(class UCanvas* Canvas, const FDebugDisplayInfo& DebugDisplay, float& YL, float& YPos) {}
virtual void DisplayDebug(class UCanvas* Canvas, const FDebugDisplayInfo& DebugDisplay, float& YL, float& YPos);
/**
* Allows any custom initialization. Called immediately after creation.

10
Engine/Source/Runtime/Engine/Private/Camera/CameraModifier.cpp
View File

@@ -2,7 +2,8 @@
#include "Camera/CameraModifier.h"
#include "Camera/PlayerCameraManager.h"
#include "Engine/Canvas.h"
#include "DisplayDebugHelpers.h"
//////////////////////////////////////////////////////////////////////////
@@ -151,4 +152,9 @@ void UCameraModifier::ModifyCamera(float DeltaTime, FVector ViewLocation, FRotat
void UCameraModifier::ModifyPostProcess(float DeltaTime, float& PostProcessBlendWeight, FPostProcessSettings& PostProcessSettings)
{
}
}
void UCameraModifier::DisplayDebug(class UCanvas* Canvas, const FDebugDisplayInfo& DebugDisplay, float& YL, float& YPos)
{
}

1
Engine/Source/Runtime/Engine/Private/Camera/CameraModifier_CameraShake.cpp
View File

@@ -6,6 +6,7 @@
#include "Camera/PlayerCameraManager.h"
#include "Engine/Canvas.h"
#include "Engine/Engine.h"
#include "DisplayDebugHelpers.h"
#include "EngineGlobals.h"
//////////////////////////////////////////////////////////////////////////