p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor fixes from PR

This commit is contained in:
bernatx 2019-07-12 18:34:24 +02:00
parent e6e4b8c9d2
commit 17ef5f41f9
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaHUD.cpp
View File

@ -10,10 +10,6 @@ void ACarlaHUD::DrawHUD()
{
Super::DrawHUD();
double Now = FPlatformTime::Seconds();
int ScreenWidth = 0;
int ScreenHeight = 0;
auto Player = GetOwningPlayerController();
if (Player == nullptr)
{
@ -22,8 +18,11 @@ void ACarlaHUD::DrawHUD()
}
// get viewport size for culling
int ScreenWidth = 0;
int ScreenHeight = 0;
Player->GetViewportSize(ScreenWidth, ScreenHeight);
double Now = FPlatformTime::Seconds();
int i = 0;
while (i < StringList.Num())
{
@ -39,7 +38,6 @@ void ACarlaHUD::DrawHUD()
// check to remove the string
if (Now >= StringList[i].TimeToDie)
{
// remove the string
StringList.RemoveAt(i);
}
else
@ -47,7 +45,7 @@ void ACarlaHUD::DrawHUD()
}
}
void ACarlaHUD::AddHUDString(FString Str, FVector Location, FColor Color, double LifeTime)
void ACarlaHUD::AddHUDString(const FString Str, const FVector Location, const FColor Color, double LifeTime)
{
double Now = FPlatformTime::Seconds();
HUDString Obj { Str, Location, Color, Now + LifeTime };

2
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaHUD.h
View File

@ -35,7 +35,7 @@ public:
virtual void DrawHUD() override;
void AddHUDString(FString Str, FVector Location, FColor Color, double LifeTime);
void AddHUDString(const FString Str, const FVector Location, const FColor Color, double LifeTime);
private:
TArray<HUDString> StringList;