From a220caeee1991d092c482d754d0a3bcbca83bad4 Mon Sep 17 00:00:00 2001 From: nsubiron Date: Mon, 8 Apr 2019 15:04:38 +0200 Subject: [PATCH] Remove "TheNew" from TheNewCarlaServer and TheNewCarlaGameModeBase --- .../Carla/Source/Carla/Game/CarlaEngine.h | 6 ++-- .../Carla/Source/Carla/Game/CarlaEpisode.h | 4 +-- .../Source/Carla/Game/CarlaGameInstance.h | 4 +-- ...GameModeBase.cpp => CarlaGameModeBase.cpp} | 16 +++++----- ...arlaGameModeBase.h => CarlaGameModeBase.h} | 6 ++-- .../Carla/Source/Carla/Game/CarlaStatics.h | 8 ++--- .../Source/Carla/Sensor/CollisionSensor.cpp | 2 +- .../Carla/Sensor/ObstacleDetectionSensor.cpp | 2 +- ...{TheNewCarlaServer.cpp => CarlaServer.cpp} | 30 +++++++++---------- .../{TheNewCarlaServer.h => CarlaServer.h} | 6 ++-- 10 files changed, 42 insertions(+), 42 deletions(-) rename Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/{TheNewCarlaGameModeBase.cpp => CarlaGameModeBase.cpp} (88%) rename Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/{TheNewCarlaGameModeBase.h => CarlaGameModeBase.h} (91%) rename Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/{TheNewCarlaServer.cpp => CarlaServer.cpp} (97%) rename Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/{TheNewCarlaServer.h => CarlaServer.h} (90%) diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaEngine.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaEngine.h index aa4f5a5a9..1b7fbfa94 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaEngine.h +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaEngine.h @@ -7,7 +7,7 @@ #pragma once #include "Carla/Sensor/WorldObserver.h" -#include "Carla/Server/TheNewCarlaServer.h" +#include "Carla/Server/CarlaServer.h" #include "Carla/Util/NonCopyable.h" #include "Misc/CoreDelegates.h" @@ -27,7 +27,7 @@ public: void NotifyEndEpisode(); - const FTheNewCarlaServer &GetServer() const + const FCarlaServer &GetServer() const { return Server; } @@ -49,7 +49,7 @@ private: bool bSynchronousMode = false; - FTheNewCarlaServer Server; + FCarlaServer Server; FWorldObserver WorldObserver; diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaEpisode.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaEpisode.h index 2e208a60e..1c8673843 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaEpisode.h +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaEpisode.h @@ -9,7 +9,7 @@ #include "Carla/Actor/ActorDispatcher.h" #include "Carla/Recorder/CarlaRecorder.h" #include "Carla/Sensor/WorldObserver.h" -#include "Carla/Server/TheNewCarlaServer.h" +#include "Carla/Server/CarlaServer.h" #include "Carla/Settings/EpisodeSettings.h" #include "Carla/Weather/Weather.h" @@ -264,7 +264,7 @@ public: private: - friend class ATheNewCarlaGameModeBase; + friend class ACarlaGameModeBase; friend class FCarlaEngine; void InitializeAtBeginPlay(); diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameInstance.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameInstance.h index 805770e4d..0279c07cd 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameInstance.h +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameInstance.h @@ -9,7 +9,7 @@ #include "Engine/GameInstance.h" #include "Carla/Game/CarlaEngine.h" -#include "Carla/Server/TheNewCarlaServer.h" +#include "Carla/Server/CarlaServer.h" #include "CarlaGameInstance.generated.h" @@ -68,7 +68,7 @@ public: CarlaEngine.NotifyEndEpisode(); } - const FTheNewCarlaServer &GetServer() const + const FCarlaServer &GetServer() const { return CarlaEngine.GetServer(); } diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/TheNewCarlaGameModeBase.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.cpp similarity index 88% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/TheNewCarlaGameModeBase.cpp rename to Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.cpp index 13c80a479..a937f4749 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/TheNewCarlaGameModeBase.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.cpp @@ -5,9 +5,9 @@ // For a copy, see . #include "Carla.h" -#include "Carla/Game/TheNewCarlaGameModeBase.h" +#include "Carla/Game/CarlaGameModeBase.h" -ATheNewCarlaGameModeBase::ATheNewCarlaGameModeBase(const FObjectInitializer& ObjectInitializer) +ACarlaGameModeBase::ACarlaGameModeBase(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer) { PrimaryActorTick.bCanEverTick = true; @@ -22,7 +22,7 @@ ATheNewCarlaGameModeBase::ATheNewCarlaGameModeBase(const FObjectInitializer& Obj CarlaSettingsDelegate = CreateDefaultSubobject(TEXT("CarlaSettingsDelegate")); } -void ATheNewCarlaGameModeBase::InitGame( +void ACarlaGameModeBase::InitGame( const FString &MapName, const FString &Options, FString &ErrorMessage) @@ -86,7 +86,7 @@ void ATheNewCarlaGameModeBase::InitGame( Episode->SetRecorder(Recorder); } -void ATheNewCarlaGameModeBase::RestartPlayer(AController *NewPlayer) +void ACarlaGameModeBase::RestartPlayer(AController *NewPlayer) { if (CarlaSettingsDelegate != nullptr) { @@ -96,7 +96,7 @@ void ATheNewCarlaGameModeBase::RestartPlayer(AController *NewPlayer) Super::RestartPlayer(NewPlayer); } -void ATheNewCarlaGameModeBase::BeginPlay() +void ACarlaGameModeBase::BeginPlay() { Super::BeginPlay(); @@ -110,7 +110,7 @@ void ATheNewCarlaGameModeBase::BeginPlay() GameInstance->NotifyBeginEpisode(*Episode); } -void ATheNewCarlaGameModeBase::Tick(float DeltaSeconds) +void ACarlaGameModeBase::Tick(float DeltaSeconds) { Super::Tick(DeltaSeconds); @@ -118,7 +118,7 @@ void ATheNewCarlaGameModeBase::Tick(float DeltaSeconds) if (Recorder) Recorder->Tick(DeltaSeconds); } -void ATheNewCarlaGameModeBase::EndPlay(const EEndPlayReason::Type EndPlayReason) +void ACarlaGameModeBase::EndPlay(const EEndPlayReason::Type EndPlayReason) { Episode->EndPlay(); GameInstance->NotifyEndEpisode(); @@ -131,7 +131,7 @@ void ATheNewCarlaGameModeBase::EndPlay(const EEndPlayReason::Type EndPlayReason) } } -void ATheNewCarlaGameModeBase::SpawnActorFactories() +void ACarlaGameModeBase::SpawnActorFactories() { auto *World = GetWorld(); check(World != nullptr); diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/TheNewCarlaGameModeBase.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.h similarity index 91% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/TheNewCarlaGameModeBase.h rename to Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.h index 49e56711e..d467a77ec 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/TheNewCarlaGameModeBase.h +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.h @@ -17,17 +17,17 @@ #include "CoreMinimal.h" #include "GameFramework/GameModeBase.h" -#include "TheNewCarlaGameModeBase.generated.h" +#include "CarlaGameModeBase.generated.h" /// Base class for the CARLA Game Mode. UCLASS(HideCategories=(ActorTick)) -class CARLA_API ATheNewCarlaGameModeBase : public AGameModeBase +class CARLA_API ACarlaGameModeBase : public AGameModeBase { GENERATED_BODY() public: - ATheNewCarlaGameModeBase(const FObjectInitializer& ObjectInitializer); + ACarlaGameModeBase(const FObjectInitializer& ObjectInitializer); const UCarlaEpisode &GetCarlaEpisode() const { diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaStatics.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaStatics.h index cbd0a46ef..ac3f0f228 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaStatics.h +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaStatics.h @@ -8,7 +8,7 @@ #include "Carla/Game/CarlaEpisode.h" #include "Carla/Game/CarlaGameInstance.h" -#include "Carla/Game/TheNewCarlaGameModeBase.h" +#include "Carla/Game/CarlaGameModeBase.h" #include "Carla/Settings/CarlaSettings.h" #include "Kismet/GameplayStatics.h" @@ -28,7 +28,7 @@ class CARLA_API UCarlaStatics : public UBlueprintFunctionLibrary public: UFUNCTION(BlueprintPure, Category="CARLA", meta=(WorldContext="WorldContextObject")) - static ATheNewCarlaGameModeBase *GetGameMode(const UObject *WorldContextObject); + static ACarlaGameModeBase *GetGameMode(const UObject *WorldContextObject); UFUNCTION(BlueprintPure, Category="CARLA", meta=(WorldContext="WorldContextObject")) static UCarlaGameInstance *GetGameInstance(const UObject *WorldContextObject); @@ -47,9 +47,9 @@ public: // -- UCarlaStatics implementation --------------------------------------------- // ============================================================================= -inline ATheNewCarlaGameModeBase *UCarlaStatics::GetGameMode(const UObject *WorldContext) +inline ACarlaGameModeBase *UCarlaStatics::GetGameMode(const UObject *WorldContext) { - return Cast(UGameplayStatics::GetGameMode(WorldContext)); + return Cast(UGameplayStatics::GetGameMode(WorldContext)); } inline UCarlaGameInstance *UCarlaStatics::GetGameInstance(const UObject *WorldContext) diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/CollisionSensor.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/CollisionSensor.cpp index 9ab4f252c..733fc889a 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/CollisionSensor.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/CollisionSensor.cpp @@ -11,7 +11,7 @@ #include "Carla/Actor/ActorRegistry.h" #include "Carla/Game/CarlaEpisode.h" #include "Carla/Game/CarlaGameInstance.h" -#include "Carla/Game/TheNewCarlaGameModeBase.h" +#include "Carla/Game/CarlaGameModeBase.h" ACollisionSensor::ACollisionSensor(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer) diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/ObstacleDetectionSensor.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/ObstacleDetectionSensor.cpp index 1d9747677..f5055a424 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/ObstacleDetectionSensor.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/ObstacleDetectionSensor.cpp @@ -11,7 +11,7 @@ #include "Carla/Actor/ActorRegistry.h" #include "Carla/Game/CarlaEpisode.h" #include "Carla/Game/CarlaGameInstance.h" -#include "Carla/Game/TheNewCarlaGameModeBase.h" +#include "Carla/Game/CarlaGameModeBase.h" AObstacleDetectionSensor::AObstacleDetectionSensor(const FObjectInitializer &ObjectInitializer) : Super(ObjectInitializer) diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/TheNewCarlaServer.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/CarlaServer.cpp similarity index 97% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/TheNewCarlaServer.cpp rename to Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/CarlaServer.cpp index 798431725..dd8267eed 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/TheNewCarlaServer.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/CarlaServer.cpp @@ -5,7 +5,7 @@ // For a copy, see . #include "Carla.h" -#include "Carla/Server/TheNewCarlaServer.h" +#include "Carla/Server/CarlaServer.h" #include "Carla/Util/DebugShapeDrawer.h" #include "Carla/Util/OpenDrive.h" @@ -53,10 +53,10 @@ static std::vector MakeVectorFromTArray(const TArray &Array) } // ============================================================================= -// -- FTheNewCarlaServer::FPimpl ----------------------------------------------- +// -- FCarlaServer::FPimpl ----------------------------------------------- // ============================================================================= -class FTheNewCarlaServer::FPimpl +class FCarlaServer::FPimpl { public: @@ -140,7 +140,7 @@ private: // -- Bind Actions ------------------------------------------------------------- // ============================================================================= -void FTheNewCarlaServer::FPimpl::BindActions() +void FCarlaServer::FPimpl::BindActions() { namespace cr = carla::rpc; namespace cg = carla::geom; @@ -847,14 +847,14 @@ void FTheNewCarlaServer::FPimpl::BindActions() #undef CARLA_ENSURE_GAME_THREAD // ============================================================================= -// -- FTheNewCarlaServer ------------------------------------------------------- +// -- FCarlaServer ------------------------------------------------------- // ============================================================================= -FTheNewCarlaServer::FTheNewCarlaServer() : Pimpl(nullptr) {} +FCarlaServer::FCarlaServer() : Pimpl(nullptr) {} -FTheNewCarlaServer::~FTheNewCarlaServer() {} +FCarlaServer::~FCarlaServer() {} -FDataMultiStream FTheNewCarlaServer::Start(uint16_t RPCPort, uint16_t StreamingPort) +FDataMultiStream FCarlaServer::Start(uint16_t RPCPort, uint16_t StreamingPort) { Pimpl = MakeUnique(RPCPort, StreamingPort); StreamingPort = Pimpl->StreamingServer.GetLocalEndpoint().port(); @@ -862,20 +862,20 @@ FDataMultiStream FTheNewCarlaServer::Start(uint16_t RPCPort, uint16_t StreamingP return Pimpl->BroadcastStream; } -void FTheNewCarlaServer::NotifyBeginEpisode(UCarlaEpisode &Episode) +void FCarlaServer::NotifyBeginEpisode(UCarlaEpisode &Episode) { check(Pimpl != nullptr); UE_LOG(LogCarlaServer, Log, TEXT("New episode '%s' started"), *Episode.GetMapName()); Pimpl->Episode = &Episode; } -void FTheNewCarlaServer::NotifyEndEpisode() +void FCarlaServer::NotifyEndEpisode() { check(Pimpl != nullptr); Pimpl->Episode = nullptr; } -void FTheNewCarlaServer::AsyncRun(uint32 NumberOfWorkerThreads) +void FCarlaServer::AsyncRun(uint32 NumberOfWorkerThreads) { check(Pimpl != nullptr); /// @todo Define better the number of threads each server gets. @@ -885,12 +885,12 @@ void FTheNewCarlaServer::AsyncRun(uint32 NumberOfWorkerThreads) Pimpl->StreamingServer.AsyncRun(std::max(2u, StreamingThreads)); } -void FTheNewCarlaServer::RunSome(uint32 Milliseconds) +void FCarlaServer::RunSome(uint32 Milliseconds) { Pimpl->Server.SyncRunFor(carla::time_duration::milliseconds(Milliseconds)); } -bool FTheNewCarlaServer::TickCueReceived() +bool FCarlaServer::TickCueReceived() { if (Pimpl->TickCuesReceived > 0u) { @@ -900,13 +900,13 @@ bool FTheNewCarlaServer::TickCueReceived() return false; } -void FTheNewCarlaServer::Stop() +void FCarlaServer::Stop() { check(Pimpl != nullptr); Pimpl->Server.Stop(); } -FDataStream FTheNewCarlaServer::OpenStream() const +FDataStream FCarlaServer::OpenStream() const { check(Pimpl != nullptr); return Pimpl->StreamingServer.MakeStream(); diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/TheNewCarlaServer.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/CarlaServer.h similarity index 90% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/TheNewCarlaServer.h rename to Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/CarlaServer.h index f7ad32217..215e0b214 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/TheNewCarlaServer.h +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/CarlaServer.h @@ -13,13 +13,13 @@ class UCarlaEpisode; -class FTheNewCarlaServer +class FCarlaServer { public: - FTheNewCarlaServer(); + FCarlaServer(); - ~FTheNewCarlaServer(); + ~FCarlaServer(); FDataMultiStream Start(uint16_t RPCPort, uint16_t StreamingPort);