From 6a6acd9a86033e0f436d559cf8cd9c5822fa02f2 Mon Sep 17 00:00:00 2001 From: MarcelPiNacy Date: Mon, 4 Mar 2024 13:32:48 +0100 Subject: [PATCH 1/9] Rename CarlaUE4 -> CarlaUnreal --- Unreal/{CarlaUE4 => CarlaUnreal}/.gitignore | 0 Unreal/{CarlaUE4 => CarlaUnreal}/.vsconfig | 0 Unreal/{CarlaUE4 => CarlaUnreal}/CarlaUE4.png | Bin Unreal/{CarlaUE4 => CarlaUnreal}/CarlaUE4.uproject | 0 Unreal/{CarlaUE4 => CarlaUnreal}/Config/.gitignore | 0 .../Config/DefaultEngine.ini | 0 .../Config/DefaultGame.ini | 0 .../Config/DefaultGameUserSettings.ini | 0 .../Config/DefaultInput.ini | 0 .../Config/DefaultScalability.ini | 0 .../Plugins/Carla/Carla.uplugin | 0 .../Carla/Content/Icons/OpenDriveActorIcon.uasset | Bin .../Content/PostProcessingMaterials/.gitignore | 0 .../PostProcessingMaterials/AnnotationColor.uasset | Bin .../DepthEffectMaterial.uasset | Bin .../DepthEffectMaterial_GLSL.uasset | Bin .../PostProcessingMaterials/GTMaterial.uasset | Bin .../PostProcessingMaterials/LensDistortion.uasset | Bin .../MPC/MPC_Tesselation.uasset | Bin .../NormalsEffectMaterial.uasset | Bin .../PhysicLensDistortion.uasset | Bin .../TMTextures/T_Deformation2k.uasset | Bin .../TMTextures/T_Deformation4k.uasset | Bin .../TMTextures/T_ParticlesHeightmap.uasset | Bin .../TMTextures/T_ParticlesHeightmap_1024.uasset | Bin .../TMTextures/T_ParticlesHeightmap_256.uasset | Bin .../PostProcessingMaterials/VelocityMaterial.uasset | Bin .../Plugins/Carla/Resources/Icon128.png | Bin .../Plugins/Carla/Source/Carla/.gitignore | 0 .../Carla/Source/Carla/AI/AIControllerFactory.cpp | 0 .../Carla/Source/Carla/AI/AIControllerFactory.h | 0 .../Carla/Source/Carla/AI/WalkerAIController.h | 0 .../Carla/Source/Carla/Actor/ActorAttribute.h | 0 .../Carla/Actor/ActorBlueprintFunctionLibrary.cpp | 0 .../Carla/Actor/ActorBlueprintFunctionLibrary.h | 0 .../Plugins/Carla/Source/Carla/Actor/ActorData.cpp | 0 .../Plugins/Carla/Source/Carla/Actor/ActorData.h | 0 .../Carla/Source/Carla/Actor/ActorDefinition.h | 0 .../Carla/Source/Carla/Actor/ActorDescription.h | 0 .../Carla/Source/Carla/Actor/ActorDispatcher.cpp | 0 .../Carla/Source/Carla/Actor/ActorDispatcher.h | 0 .../Plugins/Carla/Source/Carla/Actor/ActorInfo.h | 0 .../Carla/Source/Carla/Actor/ActorROS2Handler.cpp | 0 .../Carla/Source/Carla/Actor/ActorROS2Handler.h | 0 .../Carla/Source/Carla/Actor/ActorRegistry.cpp | 0 .../Carla/Source/Carla/Actor/ActorRegistry.h | 0 .../Carla/Source/Carla/Actor/ActorSpawnResult.cpp | 0 .../Carla/Source/Carla/Actor/ActorSpawnResult.h | 0 .../Plugins/Carla/Source/Carla/Actor/CarlaActor.cpp | 0 .../Plugins/Carla/Source/Carla/Actor/CarlaActor.h | 0 .../Carla/Source/Carla/Actor/CarlaActorFactory.h | 0 .../Source/Carla/Actor/CarlaActorFactoryBlueprint.h | 0 .../Source/Carla/Actor/CarlaBlueprintRegistry.cpp | 0 .../Source/Carla/Actor/CarlaBlueprintRegistry.h | 0 .../Carla/Source/Carla/Actor/PedestrianParameters.h | 0 .../Carla/Source/Carla/Actor/PropParameters.h | 0 .../Carla/Source/Carla/Actor/StaticMeshFactory.cpp | 0 .../Carla/Source/Carla/Actor/StaticMeshFactory.h | 0 .../Carla/Source/Carla/Actor/UtilActorFactory.cpp | 0 .../Carla/Source/Carla/Actor/UtilActorFactory.h | 0 .../Carla/Source/Carla/Actor/VehicleParameters.h | 0 .../Carla/BlueprintLibary/MapGenFunctionLibrary.cpp | 0 .../Carla/BlueprintLibary/MapGenFunctionLibrary.h | 0 .../Plugins/Carla/Source/Carla/Carla.Build.cs.in | 0 .../Plugins/Carla/Source/Carla/Carla.cpp | 0 .../Plugins/Carla/Source/Carla/Carla.h | 0 .../Plugins/Carla/Source/Carla/CityMapGenerator.cpp | 0 .../Plugins/Carla/Source/Carla/CityMapGenerator.h | 0 .../Commandlet/LoadAssetMaterialsCommandlet.cpp | 0 .../Carla/Commandlet/LoadAssetMaterialsCommandlet.h | 0 .../Carla/Commandlet/MoveAssetsCommandlet.cpp | 0 .../Source/Carla/Commandlet/MoveAssetsCommandlet.h | 0 .../PrepareAssetsForCookingCommandlet.cpp | 0 .../Commandlet/PrepareAssetsForCookingCommandlet.h | 0 .../Plugins/Carla/Source/Carla/Commandlet/SSTags.h | 0 .../Plugins/Carla/Source/Carla/Game/CarlaEngine.cpp | 0 .../Plugins/Carla/Source/Carla/Game/CarlaEngine.h | 0 .../Carla/Source/Carla/Game/CarlaEpisode.cpp | 0 .../Plugins/Carla/Source/Carla/Game/CarlaEpisode.h | 0 .../Carla/Source/Carla/Game/CarlaGameInstance.cpp | 0 .../Carla/Source/Carla/Game/CarlaGameInstance.h | 0 .../Carla/Source/Carla/Game/CarlaGameModeBase.cpp | 0 .../Carla/Source/Carla/Game/CarlaGameModeBase.h | 0 .../Plugins/Carla/Source/Carla/Game/CarlaHUD.cpp | 0 .../Plugins/Carla/Source/Carla/Game/CarlaHUD.h | 0 .../Source/Carla/Game/CarlaStaticDelegates.cpp | 0 .../Carla/Source/Carla/Game/CarlaStaticDelegates.h | 0 .../Carla/Source/Carla/Game/CarlaStatics.cpp | 0 .../Plugins/Carla/Source/Carla/Game/CarlaStatics.h | 0 .../Plugins/Carla/Source/Carla/Game/FrameData.cpp | 0 .../Plugins/Carla/Source/Carla/Game/FrameData.h | 0 .../Carla/Source/Carla/Game/TaggedComponent.cpp | 0 .../Carla/Source/Carla/Game/TaggedComponent.h | 0 .../Plugins/Carla/Source/Carla/Game/Tagger.cpp | 0 .../Plugins/Carla/Source/Carla/Game/Tagger.h | 0 .../Carla/Source/Carla/Game/TaggerDelegate.cpp | 0 .../Carla/Source/Carla/Game/TaggerDelegate.h | 0 .../Carla/Source/Carla/Lights/CarlaLight.cpp | 0 .../Plugins/Carla/Source/Carla/Lights/CarlaLight.h | 0 .../Source/Carla/Lights/CarlaLightSubsystem.cpp | 0 .../Carla/Source/Carla/Lights/CarlaLightSubsystem.h | 0 .../Carla/Source/Carla/MapGen/CityAreaDescription.h | 0 .../Carla/Source/Carla/MapGen/CityMapDefinitions.h | 0 .../Carla/Source/Carla/MapGen/CityMapMeshHolder.cpp | 0 .../Carla/Source/Carla/MapGen/CityMapMeshHolder.h | 0 .../Carla/Source/Carla/MapGen/CityMapMeshTag.cpp | 0 .../Carla/Source/Carla/MapGen/CityMapMeshTag.h | 0 .../Source/Carla/MapGen/DoublyConnectedEdgeList.cpp | 0 .../Source/Carla/MapGen/DoublyConnectedEdgeList.h | 0 .../Carla/Source/Carla/MapGen/GraphGenerator.cpp | 0 .../Carla/Source/Carla/MapGen/GraphGenerator.h | 0 .../Carla/Source/Carla/MapGen/GraphParser.cpp | 0 .../Plugins/Carla/Source/Carla/MapGen/GraphParser.h | 0 .../Carla/Source/Carla/MapGen/GraphTypes.cpp | 0 .../Plugins/Carla/Source/Carla/MapGen/GraphTypes.h | 0 .../Carla/Source/Carla/MapGen/LargeMapManager.cpp | 0 .../Carla/Source/Carla/MapGen/LargeMapManager.h | 0 .../Plugins/Carla/Source/Carla/MapGen/Position.h | 0 .../Source/Carla/MapGen/ProceduralBuilding.cpp | 0 .../Carla/Source/Carla/MapGen/ProceduralBuilding.h | 0 .../Plugins/Carla/Source/Carla/MapGen/RoadMap.cpp | 0 .../Plugins/Carla/Source/Carla/MapGen/RoadMap.h | 0 .../Source/Carla/MapGen/RoadSegmentDescription.h | 0 .../Carla/Source/Carla/MapGen/SoilTypeManager.cpp | 0 .../Carla/Source/Carla/MapGen/SoilTypeManager.h | 0 .../Source/Carla/MapGen/StaticMeshCollection.cpp | 0 .../Source/Carla/MapGen/StaticMeshCollection.h | 0 .../Carla/Source/Carla/MapGen/USDImporterActor.cpp | 0 .../Carla/Source/Carla/MapGen/USDImporterActor.h | 0 .../Carla/MapGen/UncenteredPivotPointMesh.cpp | 0 .../Source/Carla/MapGen/UncenteredPivotPointMesh.h | 0 .../Plugins/Carla/Source/Carla/Math/DVector.h | 0 .../Carla/Source/Carla/OpenDrive/OpenDrive.cpp | 0 .../Carla/Source/Carla/OpenDrive/OpenDrive.h | 0 .../Carla/Source/Carla/OpenDrive/OpenDriveActor.cpp | 0 .../Carla/Source/Carla/OpenDrive/OpenDriveActor.h | 0 .../Source/Carla/OpenDrive/OpenDriveGenerator.cpp | 0 .../Source/Carla/OpenDrive/OpenDriveGenerator.h | 0 .../Carla/Source/Carla/OpenDrive/OpenDriveMap.cpp | 0 .../Carla/Source/Carla/OpenDrive/OpenDriveMap.h | 0 .../Carla/Source/Carla/Recorder/CarlaRecorder.cpp | 0 .../Carla/Source/Carla/Recorder/CarlaRecorder.h | 0 .../Carla/Recorder/CarlaRecorderAnimBiker.cpp | 0 .../Source/Carla/Recorder/CarlaRecorderAnimBiker.h | 0 .../Carla/Recorder/CarlaRecorderAnimVehicle.cpp | 0 .../Carla/Recorder/CarlaRecorderAnimVehicle.h | 0 .../Recorder/CarlaRecorderAnimVehicleWheels.cpp | 0 .../Carla/Recorder/CarlaRecorderAnimVehicleWheels.h | 0 .../Carla/Recorder/CarlaRecorderAnimWalker.cpp | 0 .../Source/Carla/Recorder/CarlaRecorderAnimWalker.h | 0 .../Carla/Recorder/CarlaRecorderBoundingBox.cpp | 0 .../Carla/Recorder/CarlaRecorderBoundingBox.h | 0 .../Carla/Recorder/CarlaRecorderCollision.cpp | 0 .../Source/Carla/Recorder/CarlaRecorderCollision.h | 0 .../Carla/Recorder/CarlaRecorderDoorVehicle.cpp | 0 .../Carla/Recorder/CarlaRecorderDoorVehicle.h | 0 .../Source/Carla/Recorder/CarlaRecorderEventAdd.cpp | 0 .../Source/Carla/Recorder/CarlaRecorderEventAdd.h | 0 .../Source/Carla/Recorder/CarlaRecorderEventDel.cpp | 0 .../Source/Carla/Recorder/CarlaRecorderEventDel.h | 0 .../Carla/Recorder/CarlaRecorderEventParent.cpp | 0 .../Carla/Recorder/CarlaRecorderEventParent.h | 0 .../Carla/Recorder/CarlaRecorderFrameCounter.cpp | 0 .../Carla/Recorder/CarlaRecorderFrameCounter.h | 0 .../Source/Carla/Recorder/CarlaRecorderFrames.cpp | 0 .../Source/Carla/Recorder/CarlaRecorderFrames.h | 0 .../Source/Carla/Recorder/CarlaRecorderHelpers.cpp | 0 .../Source/Carla/Recorder/CarlaRecorderHelpers.h | 0 .../Carla/Source/Carla/Recorder/CarlaRecorderInfo.h | 0 .../Carla/Recorder/CarlaRecorderKinematics.cpp | 0 .../Source/Carla/Recorder/CarlaRecorderKinematics.h | 0 .../Carla/Recorder/CarlaRecorderLightScene.cpp | 0 .../Source/Carla/Recorder/CarlaRecorderLightScene.h | 0 .../Carla/Recorder/CarlaRecorderLightVehicle.cpp | 0 .../Carla/Recorder/CarlaRecorderLightVehicle.h | 0 .../Carla/Recorder/CarlaRecorderPhysicsControl.cpp | 0 .../Carla/Recorder/CarlaRecorderPhysicsControl.h | 0 .../Carla/Recorder/CarlaRecorderPlatformTime.cpp | 0 .../Carla/Recorder/CarlaRecorderPlatformTime.h | 0 .../Source/Carla/Recorder/CarlaRecorderPosition.cpp | 0 .../Source/Carla/Recorder/CarlaRecorderPosition.h | 0 .../Source/Carla/Recorder/CarlaRecorderQuery.cpp | 0 .../Source/Carla/Recorder/CarlaRecorderQuery.h | 0 .../Source/Carla/Recorder/CarlaRecorderState.cpp | 0 .../Source/Carla/Recorder/CarlaRecorderState.h | 0 .../Carla/Recorder/CarlaRecorderTraficLightTime.cpp | 0 .../Carla/Recorder/CarlaRecorderTraficLightTime.h | 0 .../Carla/Recorder/CarlaRecorderVisualTime.cpp | 0 .../Source/Carla/Recorder/CarlaRecorderVisualTime.h | 0 .../Carla/Recorder/CarlaRecorderWalkerBones.cpp | 0 .../Carla/Recorder/CarlaRecorderWalkerBones.h | 0 .../Carla/Source/Carla/Recorder/CarlaReplayer.cpp | 0 .../Carla/Source/Carla/Recorder/CarlaReplayer.h | 0 .../Source/Carla/Recorder/CarlaReplayerHelper.cpp | 0 .../Source/Carla/Recorder/CarlaReplayerHelper.h | 0 .../Carla/Source/Carla/Sensor/AsyncDataStream.h | 0 .../Carla/Source/Carla/Sensor/AsyncDataStreamImpl.h | 0 .../Carla/Source/Carla/Sensor/CollisionSensor.cpp | 0 .../Carla/Source/Carla/Sensor/CollisionSensor.h | 0 .../Plugins/Carla/Source/Carla/Sensor/DVSCamera.cpp | 0 .../Plugins/Carla/Source/Carla/Sensor/DVSCamera.h | 0 .../Plugins/Carla/Source/Carla/Sensor/DataStream.h | 0 .../Carla/Source/Carla/Sensor/DepthCamera.cpp | 0 .../Plugins/Carla/Source/Carla/Sensor/DepthCamera.h | 0 .../Carla/Source/Carla/Sensor/GnssSensor.cpp | 0 .../Plugins/Carla/Source/Carla/Sensor/GnssSensor.h | 0 .../Plugins/Carla/Source/Carla/Sensor/ImageUtil.cpp | 0 .../Plugins/Carla/Source/Carla/Sensor/ImageUtil.h | 0 .../Source/Carla/Sensor/InertialMeasurementUnit.cpp | 0 .../Source/Carla/Sensor/InertialMeasurementUnit.h | 0 .../Carla/Sensor/InstanceSegmentationCamera.cpp | 0 .../Carla/Sensor/InstanceSegmentationCamera.h | 0 .../Source/Carla/Sensor/LaneInvasionSensor.cpp | 0 .../Carla/Source/Carla/Sensor/LaneInvasionSensor.h | 0 .../Carla/Source/Carla/Sensor/LidarDescription.h | 0 .../Carla/Source/Carla/Sensor/NormalsCamera.cpp | 0 .../Carla/Source/Carla/Sensor/NormalsCamera.h | 0 .../Source/Carla/Sensor/ObstacleDetectionSensor.cpp | 0 .../Source/Carla/Sensor/ObstacleDetectionSensor.h | 0 .../Carla/Source/Carla/Sensor/OpticalFlowCamera.cpp | 0 .../Carla/Source/Carla/Sensor/OpticalFlowCamera.h | 0 .../Carla/Source/Carla/Sensor/PixelReader.cpp | 0 .../Plugins/Carla/Source/Carla/Sensor/PixelReader.h | 0 .../Plugins/Carla/Source/Carla/Sensor/Radar.cpp | 0 .../Plugins/Carla/Source/Carla/Sensor/Radar.h | 0 .../Carla/Source/Carla/Sensor/RayCastLidar.cpp | 0 .../Carla/Source/Carla/Sensor/RayCastLidar.h | 0 .../Source/Carla/Sensor/RayCastSemanticLidar.cpp | 0 .../Source/Carla/Sensor/RayCastSemanticLidar.h | 0 .../Plugins/Carla/Source/Carla/Sensor/RssSensor.cpp | 0 .../Plugins/Carla/Source/Carla/Sensor/RssSensor.h | 0 .../Source/Carla/Sensor/SceneCaptureCamera.cpp | 0 .../Carla/Source/Carla/Sensor/SceneCaptureCamera.h | 0 .../Source/Carla/Sensor/SceneCaptureSensor.cpp | 0 .../Carla/Source/Carla/Sensor/SceneCaptureSensor.h | 0 .../Carla/Sensor/SemanticSegmentationCamera.cpp | 0 .../Carla/Sensor/SemanticSegmentationCamera.h | 0 .../Plugins/Carla/Source/Carla/Sensor/Sensor.cpp | 0 .../Plugins/Carla/Source/Carla/Sensor/Sensor.h | 0 .../Carla/Source/Carla/Sensor/SensorFactory.cpp | 0 .../Carla/Source/Carla/Sensor/SensorFactory.h | 0 .../Carla/Source/Carla/Sensor/SensorManager.cpp | 0 .../Carla/Source/Carla/Sensor/SensorManager.h | 0 .../Carla/Source/Carla/Sensor/ShaderBasedSensor.cpp | 0 .../Carla/Source/Carla/Sensor/ShaderBasedSensor.h | 0 .../SceneCaptureComponent2D_CARLA.cpp | 0 .../UE4_Overridden/SceneCaptureComponent2D_CARLA.h | 0 .../SceneCaptureComponentCube_CARLA.cpp | 0 .../SceneCaptureComponentCube_CARLA.h | 0 .../UE4_Overridden/SceneCaptureComponent_CARLA.cpp | 0 .../UE4_Overridden/SceneCaptureComponent_CARLA.h | 0 .../Carla/Source/Carla/Sensor/WorldObserver.cpp | 0 .../Carla/Source/Carla/Sensor/WorldObserver.h | 0 .../Carla/Source/Carla/Server/CarlaServer.cpp | 0 .../Plugins/Carla/Source/Carla/Server/CarlaServer.h | 0 .../Source/Carla/Server/CarlaServerResponse.cpp | 0 .../Carla/Source/Carla/Server/CarlaServerResponse.h | 0 .../Carla/Source/Carla/Settings/CarlaSettings.cpp | 0 .../Carla/Source/Carla/Settings/CarlaSettings.h | 0 .../Source/Carla/Settings/CarlaSettingsDelegate.cpp | 0 .../Source/Carla/Settings/CarlaSettingsDelegate.h | 0 .../Carla/Source/Carla/Settings/EpisodeSettings.h | 0 .../Carla/Source/Carla/Settings/QualityLevelUE.h | 0 .../Carla/Source/Carla/Traffic/RoutePlanner.cpp | 0 .../Carla/Source/Carla/Traffic/RoutePlanner.h | 0 .../Carla/Source/Carla/Traffic/SignComponent.cpp | 0 .../Carla/Source/Carla/Traffic/SignComponent.h | 0 .../Source/Carla/Traffic/SpeedLimitComponent.cpp | 0 .../Source/Carla/Traffic/SpeedLimitComponent.h | 0 .../Source/Carla/Traffic/StopSignComponent.cpp | 0 .../Carla/Source/Carla/Traffic/StopSignComponent.h | 0 .../Carla/Source/Carla/Traffic/TrafficLightBase.cpp | 0 .../Carla/Source/Carla/Traffic/TrafficLightBase.h | 0 .../Source/Carla/Traffic/TrafficLightComponent.cpp | 0 .../Source/Carla/Traffic/TrafficLightComponent.h | 0 .../Source/Carla/Traffic/TrafficLightController.cpp | 0 .../Source/Carla/Traffic/TrafficLightController.h | 0 .../Source/Carla/Traffic/TrafficLightGroup.cpp | 0 .../Carla/Source/Carla/Traffic/TrafficLightGroup.h | 0 .../Source/Carla/Traffic/TrafficLightInterface.h | 0 .../Source/Carla/Traffic/TrafficLightManager.cpp | 0 .../Source/Carla/Traffic/TrafficLightManager.h | 0 .../Carla/Source/Carla/Traffic/TrafficLightState.h | 0 .../Carla/Source/Carla/Traffic/TrafficSignBase.cpp | 0 .../Carla/Source/Carla/Traffic/TrafficSignBase.h | 0 .../Source/Carla/Traffic/YieldSignComponent.cpp | 0 .../Carla/Source/Carla/Traffic/YieldSignComponent.h | 0 .../Carla/Source/Carla/Trigger/FrictionTrigger.cpp | 0 .../Carla/Source/Carla/Trigger/FrictionTrigger.h | 0 .../Carla/Source/Carla/Trigger/TriggerFactory.cpp | 0 .../Carla/Source/Carla/Trigger/TriggerFactory.h | 0 .../Carla/Source/Carla/Util/ActorAttacher.cpp | 0 .../Plugins/Carla/Source/Carla/Util/ActorAttacher.h | 0 .../Source/Carla/Util/ActorWithRandomEngine.cpp | 0 .../Carla/Source/Carla/Util/ActorWithRandomEngine.h | 0 .../Plugins/Carla/Source/Carla/Util/BoundingBox.h | 0 .../Source/Carla/Util/BoundingBoxCalculator.cpp | 0 .../Carla/Source/Carla/Util/BoundingBoxCalculator.h | 0 .../Carla/Source/Carla/Util/DebugShapeDrawer.cpp | 0 .../Carla/Source/Carla/Util/DebugShapeDrawer.h | 0 .../Plugins/Carla/Source/Carla/Util/EmptyActor.cpp | 0 .../Plugins/Carla/Source/Carla/Util/EmptyActor.h | 0 .../Carla/Source/Carla/Util/EnvironmentObject.h | 0 .../Plugins/Carla/Source/Carla/Util/IniFile.h | 0 .../Plugins/Carla/Source/Carla/Util/ListView.h | 0 .../Carla/Source/Carla/Util/NavigationMesh.cpp | 0 .../Carla/Source/Carla/Util/NavigationMesh.h | 0 .../Carla/Util/NoWorldOffsetSceneComponent.cpp | 0 .../Source/Carla/Util/NoWorldOffsetSceneComponent.h | 0 .../Plugins/Carla/Source/Carla/Util/NonCopyable.h | 0 .../Carla/Source/Carla/Util/ObjectRegister.cpp | 0 .../Carla/Source/Carla/Util/ObjectRegister.h | 0 .../Carla/Source/Carla/Util/ProceduralCustomMesh.h | 0 .../Carla/Source/Carla/Util/RandomEngine.cpp | 0 .../Plugins/Carla/Source/Carla/Util/RandomEngine.h | 0 .../Plugins/Carla/Source/Carla/Util/RayTracer.cpp | 0 .../Plugins/Carla/Source/Carla/Util/RayTracer.h | 0 .../Carla/Source/Carla/Util/RoadPainterWrapper.cpp | 0 .../Carla/Source/Carla/Util/RoadPainterWrapper.h | 0 .../Plugins/Carla/Source/Carla/Util/ScopedStack.h | 0 .../Carla/Source/Carla/Util/SensorSpawnerActor.cpp | 0 .../Carla/Source/Carla/Util/SensorSpawnerActor.h | 0 .../Source/Carla/Vegetation/BaseVegetationActor.cpp | 0 .../Source/Carla/Vegetation/BaseVegetationActor.h | 0 .../Vegetation/SpringBasedVegetationComponent.cpp | 0 .../Vegetation/SpringBasedVegetationComponent.h | 0 .../Source/Carla/Vegetation/VegetationManager.cpp | 0 .../Source/Carla/Vegetation/VegetationManager.h | 0 .../Source/Carla/Vehicle/AckermannController.cpp | 0 .../Source/Carla/Vehicle/AckermannController.h | 0 .../Carla/Vehicle/AckermannControllerSettings.h | 0 .../Source/Carla/Vehicle/CarlaWheeledVehicle.cpp | 0 .../Source/Carla/Vehicle/CarlaWheeledVehicle.h | 0 .../Source/Carla/Vehicle/CarlaWheeledVehicleNW.cpp | 0 .../Source/Carla/Vehicle/CarlaWheeledVehicleNW.h | 0 .../Source/Carla/Vehicle/CarlaWheeledVehicleState.h | 0 .../Carla/Vehicle/CustomTerrainPhysicsComponent.cpp | 0 .../Carla/Vehicle/CustomTerrainPhysicsComponent.h | 0 .../BaseCarlaMovementComponent.cpp | 0 .../MovementComponents/BaseCarlaMovementComponent.h | 0 .../MovementComponents/CarSimManagerComponent.cpp | 0 .../MovementComponents/CarSimManagerComponent.h | 0 .../MovementComponents/ChronoMovementComponent.cpp | 0 .../MovementComponents/ChronoMovementComponent.h | 0 .../MovementComponents/DefaultMovementComponent.cpp | 0 .../MovementComponents/DefaultMovementComponent.h | 0 .../Source/Carla/Vehicle/VehicleAckermannControl.h | 0 .../Carla/Source/Carla/Vehicle/VehicleControl.h | 0 .../Source/Carla/Vehicle/VehicleInputPriority.h | 0 .../Carla/Source/Carla/Vehicle/VehicleLightState.h | 0 .../Source/Carla/Vehicle/VehiclePhysicsControl.h | 0 .../Carla/Source/Carla/Vehicle/VehicleSpawnPoint.h | 0 .../Source/Carla/Vehicle/VehicleVelocityControl.cpp | 0 .../Source/Carla/Vehicle/VehicleVelocityControl.h | 0 .../Source/Carla/Vehicle/WheelPhysicsControl.h | 0 .../Carla/Vehicle/WheeledVehicleAIController.cpp | 0 .../Carla/Vehicle/WheeledVehicleAIController.h | 0 .../Vehicle/WheeledVehicleMovementComponentNW.cpp | 0 .../Vehicle/WheeledVehicleMovementComponentNW.h | 0 .../Carla/Source/Carla/Walker/WalkerAnim.cpp | 0 .../Plugins/Carla/Source/Carla/Walker/WalkerAnim.h | 0 .../Carla/Source/Carla/Walker/WalkerBase.cpp | 0 .../Plugins/Carla/Source/Carla/Walker/WalkerBase.h | 0 .../Carla/Source/Carla/Walker/WalkerBoneControlIn.h | 0 .../Source/Carla/Walker/WalkerBoneControlOut.h | 0 .../Carla/Source/Carla/Walker/WalkerControl.h | 0 .../Carla/Source/Carla/Walker/WalkerController.cpp | 0 .../Carla/Source/Carla/Walker/WalkerController.h | 0 .../Carla/Source/Carla/Walker/WalkerSpawnPoint.h | 0 .../Plugins/Carla/Source/Carla/Weather/Weather.cpp | 0 .../Plugins/Carla/Source/Carla/Weather/Weather.h | 0 .../Carla/Source/Carla/Weather/WeatherParameters.h | 0 .../Plugins/CarlaExporter/CarlaExporter.uplugin | 0 .../Source/CarlaExporter/CarlaExporter.Build.cs | 0 .../Source/CarlaExporter/Private/CarlaExporter.cpp | 0 .../CarlaExporter/Private/CarlaExporterCommands.cpp | 0 .../Source/CarlaExporter/Public/CarlaExporter.h | 0 .../CarlaExporter/Public/CarlaExporterCommands.h | 0 .../Plugins/CarlaTools/CarlaTools.uplugin | 0 .../MainLargeMap/MapGeneratorBaseLargeMap.umap | Bin .../BaseMap/Tiles/MapGeneratorBaseMap.umap | Bin .../BaseMap/TilesEmpty/BaseTileEmpty.umap | Bin .../Materials/MI_GridRegion_Inst.uasset | Bin .../Materials/MI_HeightMapNoiseMat.uasset | Bin .../Materials/MI_ROIHeightMapNoise.uasset | Bin .../Materials/MI_RoiTileHeightMap.uasset | Bin .../Materials/MI_TileHeightMapMat.uasset | Bin .../Materials/MPC_HeightMapCollector.uasset | Bin .../MapGenerator/Materials/M_GridRegion.uasset | Bin .../MapGenerator/Materials/M_HeightMapNoise.uasset | Bin .../Materials/M_HeightMapNoisePreview.uasset | Bin .../MapGenerator/Materials/M_TileHeightMap.uasset | Bin .../Misc/OpenDrive/TemplateOpenDrive.xodr | 0 .../MapGeneratorMiscEditorState.json | 0 .../PersistentFiles/MapGeneratorWidgetState.json | 0 .../MapGeneratorWidgetState_Defaults.json | 0 .../Misc/RegionWidget/WB_BaseRegionWidget.uasset | Bin .../RegionWidget/WB_TerrainMaterialWidget.uasset | Bin .../WB_VegetationGeneralSettings.uasset | Bin .../Misc/SpecificActorPlacement/A_BasicActor.uasset | Bin .../SpecificLocationPlaceholder.uasset | Bin .../SpecificActorPlacement/UW_ActorCreation.uasset | Bin .../Misc/TerrainPresets/canyons_preset.json | 0 .../Misc/TerrainPresets/dunes_preset.json | 0 .../Misc/TerrainPresets/flatlands_preset.json | 0 .../Misc/TerrainPresets/valley_preset.json | 0 .../Weather/BP_Weather_Child_MapGenerator.uasset | Bin .../Rivers/RiverPresets/River01/RiverPreset01.umap | Bin .../Rivers/RiverPresets/River01/T_River01b.uasset | Bin .../RiverPresets/River01/T_RiverPreset01.uasset | Bin .../MapGenerator/Textures/RT_BluryLandscape.uasset | Bin .../MapGenerator/Textures/RT_HeightMap.uasset | Bin .../Textures/RT_HeightMapPreview.uasset | Bin .../MapGenerator/Textures/RT_LandscapeFinal.uasset | Bin .../Textures/RT_ROITileHeightMap.uasset | Bin .../MapGenerator/Textures/RT_RoiHeightMap.uasset | Bin .../Textures/RT_TileHeightMapResult.uasset | Bin .../MapGenerator/Textures/T_CrossMask.uasset | Bin .../MapGenerator/Textures/UI_Icons/Desert_03.uasset | Bin .../MapGenerator/Textures/UI_Icons/Forest_02.uasset | Bin .../MapGenerator/Textures/UI_Icons/add.uasset | Bin .../MapGenerator/Textures/UI_Icons/bread.uasset | Bin .../Textures/UI_Icons/daylight01.uasset | Bin .../Textures/UI_Icons/daylight02.uasset | Bin .../MapGenerator/Textures/UI_Icons/forest.uasset | Bin .../Textures/UI_Icons/garbage-can.uasset | Bin .../MapGenerator/Textures/UI_Icons/help.uasset | Bin .../Textures/UI_Icons/miscellaneous.uasset | Bin .../MapGenerator/Textures/UI_Icons/mountain.uasset | Bin .../MapGenerator/Textures/UI_Icons/night_02.uasset | Bin .../MapGenerator/Textures/UI_Icons/pencil.uasset | Bin .../MapGenerator/Textures/UI_Icons/place__1_.uasset | Bin .../Textures/UI_Icons/rainnyday01.uasset | Bin .../Textures/UI_Icons/right-arrow.uasset | Bin .../MapGenerator/Textures/UI_Icons/shovel.uasset | Bin .../MapGenerator/Textures/UI_Icons/spread.uasset | Bin .../MapGenerator/Textures/UI_Icons/sunset03.uasset | Bin .../Textures/UI_Icons/water-waves.uasset | Bin .../MapGenerator/Textures/UI_Icons/weather.uasset | Bin .../MapGenerator/Textures/UI_Icons/zoomin.uasset | Bin .../MapGenerator/Textures/UI_Icons/zoomout.uasset | Bin .../Content/MapGenerator/UWB_CARLA.uasset | Bin .../OnroadMapGenerator/BP_InstancedMesh.uasset | Bin .../OnroadMapGenerator/BP_OpenDriveToMap.uasset | Bin .../Blueprints/BP_BuildingGenerator.uasset | Bin .../Blueprints/BP_RoofPropsGenerator.uasset | Bin .../Blueprints/BP_Veg_Caller.uasset | Bin .../Blueprints/BP_Veg_Scatter.uasset | Bin .../Blueprints/BuildingStyleHolder.uasset | Bin .../Blueprints/DT_BuildingStyles.uasset | Bin .../OnroadMapGenerator/DT_TreesGeneration.uasset | Bin .../Content/OnroadMapGenerator/LevelCreator.uasset | Bin .../MapPreview/W_MapPreview.uasset | Bin .../UW_HoudiniBuildingImporter.uasset | Bin .../OnroadMapGenerator/UW_OnRoadMainWidget.uasset | Bin .../ProceduralWaterGenerator.uasset | Bin .../Content/Python/add_prop_to_prop_factory.py | 0 .../Python/add_vehicle_to_vehicle_factory.py | 0 .../CarlaTools/Content/Python/generate_tile.py | 0 .../Content/USDImporter/UW_USDImporter.uasset | Bin .../UW_USDPropImporterEditorWidget.uasset | Bin .../UW_USDVehicleImporterEditorWidget.uasset | Bin .../Plugins/CarlaTools/Resources/Icon128.png | Bin .../Plugins/CarlaTools/Source/.gitignore | 0 .../Source/CarlaTools/CarlaTools.Build.cs.in | 0 .../Source/CarlaTools/Private/CarlaTools.cpp | 0 .../Private/Commandlet/GenerateTileCommandlet.cpp | 0 .../CarlaTools/Private/DigitalTwinsBaseWidget.cpp | 0 .../Source/CarlaTools/Private/EditorCamera.cpp | 0 .../CarlaTools/Private/HoudiniImportNodeWrapper.cpp | 0 .../CarlaTools/Private/HoudiniImporterWidget.cpp | 0 .../CarlaTools/Private/MapGeneratorWidget.cpp | 0 .../CarlaTools/Private/MapPreviewUserWidget.cpp | 0 .../Private/Online/CustomFileDownloader.cpp | 0 .../Source/CarlaTools/Private/OpenDriveToMap.cpp | 0 .../Private/ProceduralBuildingUtilities.cpp | 0 .../CarlaTools/Private/ProceduralWaterManager.cpp | 0 .../Source/CarlaTools/Private/RegionOfInterest.cpp | 0 .../Source/CarlaTools/Private/USDImporterWidget.cpp | 0 .../Source/CarlaTools/Public/CarlaTools.h | 0 .../Public/Commandlet/GenerateTileCommandlet.h | 0 .../CarlaTools/Public/DigitalTwinsBaseWidget.h | 0 .../Source/CarlaTools/Public/EditorCamera.h | 0 .../CarlaTools/Public/HoudiniImportNodeWrapper.h | 0 .../CarlaTools/Public/HoudiniImporterWidget.h | 0 .../Source/CarlaTools/Public/MapGeneratorWidget.h | 0 .../Source/CarlaTools/Public/MapPreviewUserWidget.h | 0 .../CarlaTools/Public/Online/CustomFileDownloader.h | 0 .../Source/CarlaTools/Public/OpenDriveToMap.h | 0 .../CarlaTools/Public/ProceduralBuildingUtilities.h | 0 .../CarlaTools/Public/ProceduralWaterManager.h | 0 .../Source/CarlaTools/Public/RegionOfInterest.h | 0 .../Source/CarlaTools/Public/TreeTableRow.h | 0 .../Source/CarlaTools/Public/USDImporterWidget.h | 0 .../Source/CarlaUE4.Target.cs | 0 .../Source/CarlaUE4/CarlaUE4.Build.cs | 0 .../Source/CarlaUE4/CarlaUE4.cpp | 0 .../Source/CarlaUE4/CarlaUE4.h | 0 .../Source/CarlaUE4Editor.Target.cs | 0 499 files changed, 0 insertions(+), 0 deletions(-) rename Unreal/{CarlaUE4 => CarlaUnreal}/.gitignore (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/.vsconfig (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/CarlaUE4.png (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/CarlaUE4.uproject (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Config/.gitignore (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Config/DefaultEngine.ini (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Config/DefaultGame.ini (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Config/DefaultGameUserSettings.ini (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Config/DefaultInput.ini (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Config/DefaultScalability.ini (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Carla.uplugin (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Content/Icons/OpenDriveActorIcon.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Content/PostProcessingMaterials/.gitignore (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Content/PostProcessingMaterials/AnnotationColor.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Content/PostProcessingMaterials/DepthEffectMaterial.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Content/PostProcessingMaterials/DepthEffectMaterial_GLSL.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Content/PostProcessingMaterials/GTMaterial.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Content/PostProcessingMaterials/LensDistortion.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Content/PostProcessingMaterials/MPC/MPC_Tesselation.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Content/PostProcessingMaterials/NormalsEffectMaterial.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Content/PostProcessingMaterials/PhysicLensDistortion.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_Deformation2k.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_Deformation4k.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_ParticlesHeightmap.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_ParticlesHeightmap_1024.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_ParticlesHeightmap_256.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Content/PostProcessingMaterials/VelocityMaterial.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Resources/Icon128.png (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/.gitignore (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/AI/AIControllerFactory.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/AI/AIControllerFactory.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/AI/WalkerAIController.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/ActorAttribute.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/ActorBlueprintFunctionLibrary.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/ActorBlueprintFunctionLibrary.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/ActorData.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/ActorData.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/ActorDefinition.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/ActorDescription.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/ActorDispatcher.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/ActorDispatcher.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/ActorInfo.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/ActorROS2Handler.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/ActorROS2Handler.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/ActorRegistry.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/ActorRegistry.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/ActorSpawnResult.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/ActorSpawnResult.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/CarlaActor.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/CarlaActor.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/CarlaActorFactory.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/CarlaActorFactoryBlueprint.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/CarlaBlueprintRegistry.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/CarlaBlueprintRegistry.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/PedestrianParameters.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/PropParameters.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/StaticMeshFactory.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/StaticMeshFactory.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/UtilActorFactory.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/UtilActorFactory.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Actor/VehicleParameters.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/BlueprintLibary/MapGenFunctionLibrary.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/BlueprintLibary/MapGenFunctionLibrary.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Carla.Build.cs.in (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Carla.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Carla.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/CityMapGenerator.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/CityMapGenerator.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Commandlet/LoadAssetMaterialsCommandlet.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Commandlet/LoadAssetMaterialsCommandlet.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Commandlet/MoveAssetsCommandlet.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Commandlet/MoveAssetsCommandlet.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Commandlet/PrepareAssetsForCookingCommandlet.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Commandlet/PrepareAssetsForCookingCommandlet.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Commandlet/SSTags.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Game/CarlaEngine.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Game/CarlaEngine.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Game/CarlaEpisode.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Game/CarlaEpisode.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Game/CarlaGameInstance.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Game/CarlaGameInstance.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Game/CarlaHUD.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Game/CarlaHUD.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Game/CarlaStaticDelegates.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Game/CarlaStaticDelegates.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Game/CarlaStatics.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Game/CarlaStatics.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Game/FrameData.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Game/FrameData.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Game/TaggedComponent.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Game/TaggedComponent.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Game/Tagger.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Game/Tagger.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Game/TaggerDelegate.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Game/TaggerDelegate.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Lights/CarlaLight.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Lights/CarlaLight.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Lights/CarlaLightSubsystem.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Lights/CarlaLightSubsystem.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/CityAreaDescription.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/CityMapDefinitions.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/CityMapMeshHolder.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/CityMapMeshHolder.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/CityMapMeshTag.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/CityMapMeshTag.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/DoublyConnectedEdgeList.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/DoublyConnectedEdgeList.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/GraphGenerator.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/GraphGenerator.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/GraphParser.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/GraphParser.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/GraphTypes.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/GraphTypes.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/LargeMapManager.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/LargeMapManager.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/Position.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/ProceduralBuilding.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/ProceduralBuilding.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/RoadMap.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/RoadMap.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/RoadSegmentDescription.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/SoilTypeManager.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/SoilTypeManager.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/StaticMeshCollection.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/StaticMeshCollection.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/USDImporterActor.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/USDImporterActor.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/UncenteredPivotPointMesh.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/MapGen/UncenteredPivotPointMesh.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Math/DVector.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/OpenDrive/OpenDrive.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/OpenDrive/OpenDrive.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveActor.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveActor.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveGenerator.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveGenerator.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveMap.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveMap.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorder.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorder.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimBiker.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimBiker.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimVehicle.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimVehicle.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimVehicleWheels.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimVehicleWheels.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimWalker.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimWalker.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderBoundingBox.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderBoundingBox.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderCollision.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderCollision.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderDoorVehicle.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderDoorVehicle.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventAdd.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventAdd.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventDel.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventDel.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventParent.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventParent.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderFrameCounter.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderFrameCounter.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderFrames.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderFrames.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderHelpers.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderHelpers.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderInfo.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderKinematics.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderKinematics.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderLightScene.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderLightScene.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderLightVehicle.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderLightVehicle.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPhysicsControl.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPhysicsControl.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPlatformTime.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPlatformTime.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPosition.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPosition.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderQuery.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderQuery.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderState.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderState.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderTraficLightTime.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderTraficLightTime.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderVisualTime.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderVisualTime.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderWalkerBones.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderWalkerBones.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaReplayer.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaReplayer.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaReplayerHelper.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Recorder/CarlaReplayerHelper.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/AsyncDataStream.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/AsyncDataStreamImpl.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/CollisionSensor.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/CollisionSensor.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/DVSCamera.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/DVSCamera.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/DataStream.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/DepthCamera.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/DepthCamera.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/GnssSensor.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/GnssSensor.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/ImageUtil.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/ImageUtil.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/InertialMeasurementUnit.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/InertialMeasurementUnit.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/InstanceSegmentationCamera.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/InstanceSegmentationCamera.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/LaneInvasionSensor.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/LaneInvasionSensor.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/LidarDescription.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/NormalsCamera.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/NormalsCamera.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/ObstacleDetectionSensor.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/ObstacleDetectionSensor.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/OpticalFlowCamera.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/OpticalFlowCamera.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/PixelReader.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/PixelReader.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/Radar.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/Radar.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/RayCastLidar.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/RayCastLidar.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/RayCastSemanticLidar.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/RayCastSemanticLidar.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/RssSensor.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/RssSensor.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/SceneCaptureCamera.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/SceneCaptureCamera.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/SemanticSegmentationCamera.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/SemanticSegmentationCamera.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/Sensor.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/Sensor.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/SensorFactory.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/SensorFactory.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/SensorManager.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/SensorManager.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/ShaderBasedSensor.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/ShaderBasedSensor.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponent2D_CARLA.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponent2D_CARLA.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponentCube_CARLA.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponentCube_CARLA.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponent_CARLA.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponent_CARLA.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/WorldObserver.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Sensor/WorldObserver.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Server/CarlaServer.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Server/CarlaServer.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Server/CarlaServerResponse.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Server/CarlaServerResponse.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Settings/CarlaSettings.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Settings/CarlaSettings.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Settings/CarlaSettingsDelegate.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Settings/CarlaSettingsDelegate.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Settings/EpisodeSettings.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Settings/QualityLevelUE.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Traffic/RoutePlanner.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Traffic/RoutePlanner.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Traffic/SignComponent.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Traffic/SignComponent.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Traffic/SpeedLimitComponent.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Traffic/SpeedLimitComponent.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Traffic/StopSignComponent.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Traffic/StopSignComponent.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Traffic/TrafficLightBase.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Traffic/TrafficLightBase.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Traffic/TrafficLightComponent.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Traffic/TrafficLightComponent.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Traffic/TrafficLightController.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Traffic/TrafficLightController.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Traffic/TrafficLightGroup.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Traffic/TrafficLightGroup.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Traffic/TrafficLightInterface.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Traffic/TrafficLightManager.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Traffic/TrafficLightManager.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Traffic/TrafficLightState.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Traffic/TrafficSignBase.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Traffic/TrafficSignBase.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Traffic/YieldSignComponent.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Traffic/YieldSignComponent.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Trigger/FrictionTrigger.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Trigger/FrictionTrigger.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Trigger/TriggerFactory.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Trigger/TriggerFactory.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/ActorAttacher.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/ActorAttacher.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/ActorWithRandomEngine.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/ActorWithRandomEngine.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/BoundingBox.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/BoundingBoxCalculator.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/BoundingBoxCalculator.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/DebugShapeDrawer.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/DebugShapeDrawer.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/EmptyActor.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/EmptyActor.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/EnvironmentObject.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/IniFile.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/ListView.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/NavigationMesh.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/NavigationMesh.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/NoWorldOffsetSceneComponent.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/NoWorldOffsetSceneComponent.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/NonCopyable.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/ObjectRegister.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/ObjectRegister.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/ProceduralCustomMesh.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/RandomEngine.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/RandomEngine.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/RayTracer.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/RayTracer.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/RoadPainterWrapper.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/RoadPainterWrapper.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/ScopedStack.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/SensorSpawnerActor.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Util/SensorSpawnerActor.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vegetation/BaseVegetationActor.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vegetation/BaseVegetationActor.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vegetation/SpringBasedVegetationComponent.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vegetation/SpringBasedVegetationComponent.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vegetation/VegetationManager.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vegetation/VegetationManager.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/AckermannController.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/AckermannController.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/AckermannControllerSettings.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicleNW.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicleNW.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicleState.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/CustomTerrainPhysicsComponent.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/CustomTerrainPhysicsComponent.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/BaseCarlaMovementComponent.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/BaseCarlaMovementComponent.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/CarSimManagerComponent.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/CarSimManagerComponent.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/ChronoMovementComponent.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/ChronoMovementComponent.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/DefaultMovementComponent.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/DefaultMovementComponent.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/VehicleAckermannControl.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/VehicleControl.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/VehicleInputPriority.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/VehicleLightState.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/VehiclePhysicsControl.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/VehicleSpawnPoint.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/VehicleVelocityControl.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/VehicleVelocityControl.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/WheelPhysicsControl.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleAIController.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleAIController.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleMovementComponentNW.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleMovementComponentNW.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Walker/WalkerAnim.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Walker/WalkerAnim.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Walker/WalkerBase.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Walker/WalkerBase.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Walker/WalkerBoneControlIn.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Walker/WalkerBoneControlOut.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Walker/WalkerControl.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Walker/WalkerController.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Walker/WalkerController.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Walker/WalkerSpawnPoint.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Weather/Weather.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Weather/Weather.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/Carla/Source/Carla/Weather/WeatherParameters.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaExporter/CarlaExporter.uplugin (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaExporter/Source/CarlaExporter/CarlaExporter.Build.cs (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaExporter/Source/CarlaExporter/Private/CarlaExporter.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaExporter/Source/CarlaExporter/Private/CarlaExporterCommands.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaExporter/Source/CarlaExporter/Public/CarlaExporter.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaExporter/Source/CarlaExporter/Public/CarlaExporterCommands.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/CarlaTools.uplugin (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/BaseMap/MainLargeMap/MapGeneratorBaseLargeMap.umap (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/BaseMap/Tiles/MapGeneratorBaseMap.umap (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/BaseMap/TilesEmpty/BaseTileEmpty.umap (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_GridRegion_Inst.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_HeightMapNoiseMat.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_ROIHeightMapNoise.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_RoiTileHeightMap.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_TileHeightMapMat.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Materials/MPC_HeightMapCollector.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Materials/M_GridRegion.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Materials/M_HeightMapNoise.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Materials/M_HeightMapNoisePreview.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Materials/M_TileHeightMap.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Misc/OpenDrive/TemplateOpenDrive.xodr (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Misc/PersistentFiles/MapGeneratorMiscEditorState.json (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Misc/PersistentFiles/MapGeneratorWidgetState.json (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Misc/PersistentFiles/MapGeneratorWidgetState_Defaults.json (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Misc/RegionWidget/WB_BaseRegionWidget.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Misc/RegionWidget/WB_TerrainMaterialWidget.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Misc/RegionWidget/WB_VegetationGeneralSettings.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Misc/SpecificActorPlacement/A_BasicActor.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Misc/SpecificActorPlacement/SpecificLocationPlaceholder.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Misc/SpecificActorPlacement/UW_ActorCreation.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Misc/TerrainPresets/canyons_preset.json (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Misc/TerrainPresets/dunes_preset.json (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Misc/TerrainPresets/flatlands_preset.json (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Misc/TerrainPresets/valley_preset.json (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Misc/Weather/BP_Weather_Child_MapGenerator.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Rivers/RiverPresets/River01/RiverPreset01.umap (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Rivers/RiverPresets/River01/T_River01b.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Rivers/RiverPresets/River01/T_RiverPreset01.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_BluryLandscape.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_HeightMap.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_HeightMapPreview.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_LandscapeFinal.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_ROITileHeightMap.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_RoiHeightMap.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_TileHeightMapResult.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/T_CrossMask.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/Desert_03.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/Forest_02.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/add.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/bread.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/daylight01.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/daylight02.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/forest.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/garbage-can.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/help.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/miscellaneous.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/mountain.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/night_02.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/pencil.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/place__1_.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/rainnyday01.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/right-arrow.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/shovel.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/spread.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/sunset03.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/water-waves.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/weather.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/zoomin.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/zoomout.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/MapGenerator/UWB_CARLA.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/OnroadMapGenerator/BP_InstancedMesh.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/OnroadMapGenerator/BP_OpenDriveToMap.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_BuildingGenerator.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_RoofPropsGenerator.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_Veg_Caller.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_Veg_Scatter.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BuildingStyleHolder.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/DT_BuildingStyles.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/OnroadMapGenerator/DT_TreesGeneration.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/OnroadMapGenerator/LevelCreator.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/OnroadMapGenerator/MapPreview/W_MapPreview.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/OnroadMapGenerator/UW_HoudiniBuildingImporter.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/OnroadMapGenerator/UW_OnRoadMainWidget.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/ProceduralWaterManager/ProceduralWaterGenerator.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/Python/add_prop_to_prop_factory.py (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/Python/add_vehicle_to_vehicle_factory.py (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/Python/generate_tile.py (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/USDImporter/UW_USDImporter.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/USDImporter/UW_USDPropImporterEditorWidget.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Content/USDImporter/UW_USDVehicleImporterEditorWidget.uasset (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Resources/Icon128.png (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/.gitignore (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs.in (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Private/CarlaTools.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Private/Commandlet/GenerateTileCommandlet.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Private/DigitalTwinsBaseWidget.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Private/EditorCamera.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Private/HoudiniImportNodeWrapper.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Private/HoudiniImporterWidget.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Private/MapGeneratorWidget.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Private/MapPreviewUserWidget.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Private/Online/CustomFileDownloader.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Private/OpenDriveToMap.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Private/ProceduralBuildingUtilities.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Private/ProceduralWaterManager.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Private/RegionOfInterest.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Private/USDImporterWidget.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Public/CarlaTools.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Public/Commandlet/GenerateTileCommandlet.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Public/DigitalTwinsBaseWidget.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Public/EditorCamera.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Public/HoudiniImportNodeWrapper.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Public/HoudiniImporterWidget.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Public/MapGeneratorWidget.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Public/MapPreviewUserWidget.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Public/Online/CustomFileDownloader.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Public/OpenDriveToMap.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Public/ProceduralBuildingUtilities.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Public/ProceduralWaterManager.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Public/RegionOfInterest.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Public/TreeTableRow.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Plugins/CarlaTools/Source/CarlaTools/Public/USDImporterWidget.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Source/CarlaUE4.Target.cs (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Source/CarlaUE4/CarlaUE4.Build.cs (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Source/CarlaUE4/CarlaUE4.cpp (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Source/CarlaUE4/CarlaUE4.h (100%) rename Unreal/{CarlaUE4 => CarlaUnreal}/Source/CarlaUE4Editor.Target.cs (100%) diff --git a/Unreal/CarlaUE4/.gitignore b/Unreal/CarlaUnreal/.gitignore similarity index 100% rename from Unreal/CarlaUE4/.gitignore rename to Unreal/CarlaUnreal/.gitignore diff --git a/Unreal/CarlaUE4/.vsconfig b/Unreal/CarlaUnreal/.vsconfig similarity index 100% rename from Unreal/CarlaUE4/.vsconfig rename to Unreal/CarlaUnreal/.vsconfig diff --git a/Unreal/CarlaUE4/CarlaUE4.png b/Unreal/CarlaUnreal/CarlaUE4.png similarity index 100% rename from Unreal/CarlaUE4/CarlaUE4.png rename to Unreal/CarlaUnreal/CarlaUE4.png diff --git a/Unreal/CarlaUE4/CarlaUE4.uproject b/Unreal/CarlaUnreal/CarlaUE4.uproject similarity index 100% rename from Unreal/CarlaUE4/CarlaUE4.uproject rename to Unreal/CarlaUnreal/CarlaUE4.uproject diff --git a/Unreal/CarlaUE4/Config/.gitignore b/Unreal/CarlaUnreal/Config/.gitignore similarity index 100% rename from Unreal/CarlaUE4/Config/.gitignore rename to Unreal/CarlaUnreal/Config/.gitignore diff --git a/Unreal/CarlaUE4/Config/DefaultEngine.ini b/Unreal/CarlaUnreal/Config/DefaultEngine.ini similarity index 100% rename from Unreal/CarlaUE4/Config/DefaultEngine.ini rename to Unreal/CarlaUnreal/Config/DefaultEngine.ini diff --git a/Unreal/CarlaUE4/Config/DefaultGame.ini b/Unreal/CarlaUnreal/Config/DefaultGame.ini similarity index 100% rename from Unreal/CarlaUE4/Config/DefaultGame.ini rename to Unreal/CarlaUnreal/Config/DefaultGame.ini diff --git a/Unreal/CarlaUE4/Config/DefaultGameUserSettings.ini b/Unreal/CarlaUnreal/Config/DefaultGameUserSettings.ini similarity index 100% rename from Unreal/CarlaUE4/Config/DefaultGameUserSettings.ini rename to Unreal/CarlaUnreal/Config/DefaultGameUserSettings.ini diff --git a/Unreal/CarlaUE4/Config/DefaultInput.ini b/Unreal/CarlaUnreal/Config/DefaultInput.ini similarity index 100% rename from Unreal/CarlaUE4/Config/DefaultInput.ini rename to Unreal/CarlaUnreal/Config/DefaultInput.ini diff --git a/Unreal/CarlaUE4/Config/DefaultScalability.ini b/Unreal/CarlaUnreal/Config/DefaultScalability.ini similarity index 100% rename from Unreal/CarlaUE4/Config/DefaultScalability.ini rename to Unreal/CarlaUnreal/Config/DefaultScalability.ini diff --git a/Unreal/CarlaUE4/Plugins/Carla/Carla.uplugin b/Unreal/CarlaUnreal/Plugins/Carla/Carla.uplugin similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Carla.uplugin rename to Unreal/CarlaUnreal/Plugins/Carla/Carla.uplugin diff --git a/Unreal/CarlaUE4/Plugins/Carla/Content/Icons/OpenDriveActorIcon.uasset b/Unreal/CarlaUnreal/Plugins/Carla/Content/Icons/OpenDriveActorIcon.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Content/Icons/OpenDriveActorIcon.uasset rename to Unreal/CarlaUnreal/Plugins/Carla/Content/Icons/OpenDriveActorIcon.uasset diff --git a/Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/.gitignore b/Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/.gitignore similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/.gitignore rename to Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/.gitignore diff --git a/Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/AnnotationColor.uasset b/Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/AnnotationColor.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/AnnotationColor.uasset rename to Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/AnnotationColor.uasset diff --git a/Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/DepthEffectMaterial.uasset b/Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/DepthEffectMaterial.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/DepthEffectMaterial.uasset rename to Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/DepthEffectMaterial.uasset diff --git a/Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/DepthEffectMaterial_GLSL.uasset b/Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/DepthEffectMaterial_GLSL.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/DepthEffectMaterial_GLSL.uasset rename to Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/DepthEffectMaterial_GLSL.uasset diff --git a/Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/GTMaterial.uasset b/Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/GTMaterial.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/GTMaterial.uasset rename to Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/GTMaterial.uasset diff --git a/Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/LensDistortion.uasset b/Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/LensDistortion.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/LensDistortion.uasset rename to Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/LensDistortion.uasset diff --git a/Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/MPC/MPC_Tesselation.uasset b/Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/MPC/MPC_Tesselation.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/MPC/MPC_Tesselation.uasset rename to Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/MPC/MPC_Tesselation.uasset diff --git a/Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/NormalsEffectMaterial.uasset b/Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/NormalsEffectMaterial.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/NormalsEffectMaterial.uasset rename to Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/NormalsEffectMaterial.uasset diff --git a/Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/PhysicLensDistortion.uasset b/Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/PhysicLensDistortion.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/PhysicLensDistortion.uasset rename to Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/PhysicLensDistortion.uasset diff --git a/Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_Deformation2k.uasset b/Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_Deformation2k.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_Deformation2k.uasset rename to Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_Deformation2k.uasset diff --git a/Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_Deformation4k.uasset b/Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_Deformation4k.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_Deformation4k.uasset rename to Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_Deformation4k.uasset diff --git a/Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_ParticlesHeightmap.uasset b/Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_ParticlesHeightmap.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_ParticlesHeightmap.uasset rename to Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_ParticlesHeightmap.uasset diff --git a/Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_ParticlesHeightmap_1024.uasset b/Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_ParticlesHeightmap_1024.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_ParticlesHeightmap_1024.uasset rename to Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_ParticlesHeightmap_1024.uasset diff --git a/Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_ParticlesHeightmap_256.uasset b/Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_ParticlesHeightmap_256.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_ParticlesHeightmap_256.uasset rename to Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/TMTextures/T_ParticlesHeightmap_256.uasset diff --git a/Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/VelocityMaterial.uasset b/Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/VelocityMaterial.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Content/PostProcessingMaterials/VelocityMaterial.uasset rename to Unreal/CarlaUnreal/Plugins/Carla/Content/PostProcessingMaterials/VelocityMaterial.uasset diff --git a/Unreal/CarlaUE4/Plugins/Carla/Resources/Icon128.png b/Unreal/CarlaUnreal/Plugins/Carla/Resources/Icon128.png similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Resources/Icon128.png rename to Unreal/CarlaUnreal/Plugins/Carla/Resources/Icon128.png diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/.gitignore b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/.gitignore similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/.gitignore rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/.gitignore diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/AI/AIControllerFactory.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/AI/AIControllerFactory.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/AI/AIControllerFactory.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/AI/AIControllerFactory.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/AI/AIControllerFactory.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/AI/AIControllerFactory.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/AI/AIControllerFactory.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/AI/AIControllerFactory.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/AI/WalkerAIController.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/AI/WalkerAIController.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/AI/WalkerAIController.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/AI/WalkerAIController.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorAttribute.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorAttribute.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorAttribute.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorAttribute.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorBlueprintFunctionLibrary.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorBlueprintFunctionLibrary.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorBlueprintFunctionLibrary.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorBlueprintFunctionLibrary.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorBlueprintFunctionLibrary.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorBlueprintFunctionLibrary.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorBlueprintFunctionLibrary.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorBlueprintFunctionLibrary.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorData.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorData.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorData.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorData.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorData.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorData.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorData.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorData.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorDefinition.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorDefinition.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorDefinition.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorDefinition.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorDescription.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorDescription.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorDescription.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorDescription.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorDispatcher.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorDispatcher.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorDispatcher.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorDispatcher.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorDispatcher.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorDispatcher.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorDispatcher.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorDispatcher.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorInfo.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorInfo.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorInfo.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorInfo.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorROS2Handler.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorROS2Handler.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorROS2Handler.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorROS2Handler.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorROS2Handler.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorROS2Handler.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorROS2Handler.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorROS2Handler.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorRegistry.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorRegistry.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorRegistry.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorRegistry.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorRegistry.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorRegistry.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorRegistry.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorRegistry.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorSpawnResult.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorSpawnResult.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorSpawnResult.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorSpawnResult.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorSpawnResult.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorSpawnResult.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorSpawnResult.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorSpawnResult.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/CarlaActor.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/CarlaActor.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/CarlaActor.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/CarlaActor.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/CarlaActor.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/CarlaActor.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/CarlaActor.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/CarlaActor.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/CarlaActorFactory.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/CarlaActorFactory.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/CarlaActorFactory.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/CarlaActorFactory.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/CarlaActorFactoryBlueprint.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/CarlaActorFactoryBlueprint.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/CarlaActorFactoryBlueprint.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/CarlaActorFactoryBlueprint.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/CarlaBlueprintRegistry.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/CarlaBlueprintRegistry.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/CarlaBlueprintRegistry.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/CarlaBlueprintRegistry.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/CarlaBlueprintRegistry.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/CarlaBlueprintRegistry.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/CarlaBlueprintRegistry.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/CarlaBlueprintRegistry.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/PedestrianParameters.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/PedestrianParameters.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/PedestrianParameters.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/PedestrianParameters.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/PropParameters.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/PropParameters.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/PropParameters.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/PropParameters.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/StaticMeshFactory.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/StaticMeshFactory.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/StaticMeshFactory.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/StaticMeshFactory.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/StaticMeshFactory.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/StaticMeshFactory.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/StaticMeshFactory.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/StaticMeshFactory.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/UtilActorFactory.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/UtilActorFactory.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/UtilActorFactory.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/UtilActorFactory.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/UtilActorFactory.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/UtilActorFactory.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/UtilActorFactory.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/UtilActorFactory.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/VehicleParameters.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/VehicleParameters.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/VehicleParameters.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/VehicleParameters.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/BlueprintLibary/MapGenFunctionLibrary.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/BlueprintLibary/MapGenFunctionLibrary.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/BlueprintLibary/MapGenFunctionLibrary.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/BlueprintLibary/MapGenFunctionLibrary.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/BlueprintLibary/MapGenFunctionLibrary.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/BlueprintLibary/MapGenFunctionLibrary.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/BlueprintLibary/MapGenFunctionLibrary.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/BlueprintLibary/MapGenFunctionLibrary.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.Build.cs.in b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Carla.Build.cs.in similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.Build.cs.in rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Carla.Build.cs.in diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Carla.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Carla.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Carla.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Carla.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/CityMapGenerator.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/CityMapGenerator.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/CityMapGenerator.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/CityMapGenerator.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/CityMapGenerator.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/CityMapGenerator.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/CityMapGenerator.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/CityMapGenerator.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/LoadAssetMaterialsCommandlet.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Commandlet/LoadAssetMaterialsCommandlet.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/LoadAssetMaterialsCommandlet.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Commandlet/LoadAssetMaterialsCommandlet.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/LoadAssetMaterialsCommandlet.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Commandlet/LoadAssetMaterialsCommandlet.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/LoadAssetMaterialsCommandlet.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Commandlet/LoadAssetMaterialsCommandlet.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/MoveAssetsCommandlet.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Commandlet/MoveAssetsCommandlet.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/MoveAssetsCommandlet.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Commandlet/MoveAssetsCommandlet.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/MoveAssetsCommandlet.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Commandlet/MoveAssetsCommandlet.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/MoveAssetsCommandlet.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Commandlet/MoveAssetsCommandlet.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/PrepareAssetsForCookingCommandlet.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Commandlet/PrepareAssetsForCookingCommandlet.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/PrepareAssetsForCookingCommandlet.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Commandlet/PrepareAssetsForCookingCommandlet.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/PrepareAssetsForCookingCommandlet.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Commandlet/PrepareAssetsForCookingCommandlet.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/PrepareAssetsForCookingCommandlet.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Commandlet/PrepareAssetsForCookingCommandlet.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/SSTags.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Commandlet/SSTags.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/SSTags.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Commandlet/SSTags.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaEngine.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaEngine.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaEngine.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaEngine.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaEngine.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaEngine.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaEngine.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaEngine.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaEpisode.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaEpisode.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaEpisode.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaEpisode.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaEpisode.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaEpisode.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaEpisode.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaEpisode.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameInstance.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaGameInstance.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameInstance.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaGameInstance.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameInstance.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaGameInstance.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameInstance.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaGameInstance.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaHUD.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaHUD.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaHUD.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaHUD.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaHUD.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaHUD.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaHUD.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaHUD.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaStaticDelegates.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaStaticDelegates.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaStaticDelegates.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaStaticDelegates.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaStaticDelegates.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaStaticDelegates.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaStaticDelegates.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaStaticDelegates.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaStatics.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaStatics.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaStatics.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaStatics.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaStatics.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaStatics.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaStatics.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/CarlaStatics.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/FrameData.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/FrameData.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/FrameData.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/FrameData.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/FrameData.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/FrameData.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/FrameData.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/FrameData.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/TaggedComponent.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/TaggedComponent.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/TaggedComponent.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/TaggedComponent.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/TaggedComponent.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/TaggedComponent.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/TaggedComponent.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/TaggedComponent.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/Tagger.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/Tagger.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/Tagger.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/Tagger.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/Tagger.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/Tagger.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/Tagger.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/Tagger.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/TaggerDelegate.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/TaggerDelegate.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/TaggerDelegate.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/TaggerDelegate.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/TaggerDelegate.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/TaggerDelegate.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/TaggerDelegate.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/TaggerDelegate.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Lights/CarlaLight.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Lights/CarlaLight.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Lights/CarlaLight.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Lights/CarlaLight.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Lights/CarlaLight.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Lights/CarlaLight.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Lights/CarlaLight.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Lights/CarlaLight.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Lights/CarlaLightSubsystem.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Lights/CarlaLightSubsystem.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Lights/CarlaLightSubsystem.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Lights/CarlaLightSubsystem.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Lights/CarlaLightSubsystem.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Lights/CarlaLightSubsystem.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Lights/CarlaLightSubsystem.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Lights/CarlaLightSubsystem.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/CityAreaDescription.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/CityAreaDescription.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/CityAreaDescription.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/CityAreaDescription.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/CityMapDefinitions.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/CityMapDefinitions.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/CityMapDefinitions.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/CityMapDefinitions.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/CityMapMeshHolder.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/CityMapMeshHolder.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/CityMapMeshHolder.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/CityMapMeshHolder.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/CityMapMeshHolder.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/CityMapMeshHolder.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/CityMapMeshHolder.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/CityMapMeshHolder.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/CityMapMeshTag.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/CityMapMeshTag.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/CityMapMeshTag.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/CityMapMeshTag.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/CityMapMeshTag.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/CityMapMeshTag.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/CityMapMeshTag.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/CityMapMeshTag.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/DoublyConnectedEdgeList.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/DoublyConnectedEdgeList.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/DoublyConnectedEdgeList.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/DoublyConnectedEdgeList.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/DoublyConnectedEdgeList.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/DoublyConnectedEdgeList.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/DoublyConnectedEdgeList.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/DoublyConnectedEdgeList.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/GraphGenerator.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/GraphGenerator.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/GraphGenerator.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/GraphGenerator.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/GraphGenerator.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/GraphGenerator.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/GraphGenerator.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/GraphGenerator.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/GraphParser.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/GraphParser.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/GraphParser.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/GraphParser.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/GraphParser.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/GraphParser.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/GraphParser.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/GraphParser.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/GraphTypes.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/GraphTypes.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/GraphTypes.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/GraphTypes.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/GraphTypes.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/GraphTypes.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/GraphTypes.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/GraphTypes.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/LargeMapManager.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/LargeMapManager.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/LargeMapManager.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/LargeMapManager.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/LargeMapManager.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/LargeMapManager.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/LargeMapManager.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/LargeMapManager.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/Position.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/Position.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/Position.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/Position.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/ProceduralBuilding.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/ProceduralBuilding.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/ProceduralBuilding.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/ProceduralBuilding.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/ProceduralBuilding.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/ProceduralBuilding.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/ProceduralBuilding.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/ProceduralBuilding.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/RoadMap.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/RoadMap.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/RoadMap.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/RoadMap.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/RoadMap.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/RoadMap.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/RoadMap.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/RoadMap.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/RoadSegmentDescription.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/RoadSegmentDescription.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/RoadSegmentDescription.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/RoadSegmentDescription.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/SoilTypeManager.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/SoilTypeManager.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/SoilTypeManager.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/SoilTypeManager.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/SoilTypeManager.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/SoilTypeManager.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/SoilTypeManager.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/SoilTypeManager.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/StaticMeshCollection.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/StaticMeshCollection.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/StaticMeshCollection.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/StaticMeshCollection.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/StaticMeshCollection.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/StaticMeshCollection.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/StaticMeshCollection.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/StaticMeshCollection.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/USDImporterActor.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/USDImporterActor.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/USDImporterActor.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/USDImporterActor.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/USDImporterActor.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/USDImporterActor.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/USDImporterActor.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/USDImporterActor.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/UncenteredPivotPointMesh.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/UncenteredPivotPointMesh.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/UncenteredPivotPointMesh.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/UncenteredPivotPointMesh.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/UncenteredPivotPointMesh.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/UncenteredPivotPointMesh.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/UncenteredPivotPointMesh.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/UncenteredPivotPointMesh.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Math/DVector.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Math/DVector.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Math/DVector.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Math/DVector.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDrive/OpenDrive.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/OpenDrive/OpenDrive.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDrive/OpenDrive.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/OpenDrive/OpenDrive.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDrive/OpenDrive.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/OpenDrive/OpenDrive.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDrive/OpenDrive.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/OpenDrive/OpenDrive.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveActor.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveActor.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveActor.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveActor.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveActor.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveActor.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveActor.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveActor.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveGenerator.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveGenerator.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveGenerator.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveGenerator.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveGenerator.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveGenerator.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveGenerator.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveGenerator.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveMap.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveMap.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveMap.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveMap.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveMap.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveMap.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveMap.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveMap.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorder.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorder.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorder.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorder.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorder.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorder.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorder.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorder.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimBiker.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimBiker.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimBiker.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimBiker.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimBiker.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimBiker.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimBiker.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimBiker.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimVehicle.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimVehicle.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimVehicle.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimVehicle.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimVehicle.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimVehicle.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimVehicle.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimVehicle.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimVehicleWheels.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimVehicleWheels.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimVehicleWheels.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimVehicleWheels.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimVehicleWheels.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimVehicleWheels.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimVehicleWheels.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimVehicleWheels.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimWalker.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimWalker.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimWalker.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimWalker.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimWalker.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimWalker.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimWalker.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderAnimWalker.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderBoundingBox.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderBoundingBox.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderBoundingBox.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderBoundingBox.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderBoundingBox.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderBoundingBox.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderBoundingBox.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderBoundingBox.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderCollision.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderCollision.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderCollision.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderCollision.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderCollision.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderCollision.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderCollision.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderCollision.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderDoorVehicle.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderDoorVehicle.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderDoorVehicle.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderDoorVehicle.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderDoorVehicle.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderDoorVehicle.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderDoorVehicle.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderDoorVehicle.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventAdd.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventAdd.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventAdd.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventAdd.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventAdd.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventAdd.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventAdd.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventAdd.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventDel.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventDel.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventDel.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventDel.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventDel.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventDel.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventDel.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventDel.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventParent.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventParent.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventParent.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventParent.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventParent.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventParent.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventParent.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventParent.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderFrameCounter.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderFrameCounter.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderFrameCounter.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderFrameCounter.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderFrameCounter.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderFrameCounter.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderFrameCounter.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderFrameCounter.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderFrames.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderFrames.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderFrames.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderFrames.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderFrames.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderFrames.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderFrames.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderFrames.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderHelpers.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderHelpers.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderHelpers.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderHelpers.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderHelpers.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderHelpers.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderHelpers.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderHelpers.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderInfo.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderInfo.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderInfo.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderInfo.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderKinematics.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderKinematics.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderKinematics.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderKinematics.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderKinematics.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderKinematics.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderKinematics.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderKinematics.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderLightScene.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderLightScene.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderLightScene.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderLightScene.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderLightScene.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderLightScene.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderLightScene.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderLightScene.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderLightVehicle.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderLightVehicle.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderLightVehicle.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderLightVehicle.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderLightVehicle.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderLightVehicle.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderLightVehicle.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderLightVehicle.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPhysicsControl.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPhysicsControl.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPhysicsControl.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPhysicsControl.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPhysicsControl.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPhysicsControl.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPhysicsControl.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPhysicsControl.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPlatformTime.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPlatformTime.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPlatformTime.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPlatformTime.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPlatformTime.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPlatformTime.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPlatformTime.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPlatformTime.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPosition.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPosition.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPosition.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPosition.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPosition.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPosition.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPosition.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderPosition.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderQuery.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderQuery.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderQuery.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderQuery.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderQuery.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderQuery.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderQuery.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderQuery.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderState.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderState.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderState.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderState.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderState.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderState.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderState.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderState.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderTraficLightTime.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderTraficLightTime.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderTraficLightTime.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderTraficLightTime.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderTraficLightTime.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderTraficLightTime.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderTraficLightTime.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderTraficLightTime.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderVisualTime.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderVisualTime.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderVisualTime.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderVisualTime.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderVisualTime.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderVisualTime.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderVisualTime.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderVisualTime.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderWalkerBones.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderWalkerBones.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderWalkerBones.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderWalkerBones.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderWalkerBones.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderWalkerBones.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderWalkerBones.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderWalkerBones.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaReplayer.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaReplayer.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaReplayer.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaReplayer.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaReplayer.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaReplayer.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaReplayer.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaReplayer.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaReplayerHelper.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaReplayerHelper.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaReplayerHelper.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaReplayerHelper.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaReplayerHelper.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaReplayerHelper.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaReplayerHelper.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Recorder/CarlaReplayerHelper.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/AsyncDataStream.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/AsyncDataStream.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/AsyncDataStream.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/AsyncDataStream.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/AsyncDataStreamImpl.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/AsyncDataStreamImpl.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/AsyncDataStreamImpl.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/AsyncDataStreamImpl.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/CollisionSensor.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/CollisionSensor.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/CollisionSensor.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/CollisionSensor.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/CollisionSensor.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/CollisionSensor.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/CollisionSensor.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/CollisionSensor.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/DVSCamera.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/DVSCamera.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/DVSCamera.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/DVSCamera.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/DVSCamera.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/DVSCamera.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/DVSCamera.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/DVSCamera.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/DataStream.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/DataStream.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/DataStream.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/DataStream.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/DepthCamera.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/DepthCamera.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/DepthCamera.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/DepthCamera.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/DepthCamera.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/DepthCamera.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/DepthCamera.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/DepthCamera.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/GnssSensor.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/GnssSensor.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/GnssSensor.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/GnssSensor.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/GnssSensor.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/GnssSensor.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/GnssSensor.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/GnssSensor.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/ImageUtil.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/ImageUtil.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/ImageUtil.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/ImageUtil.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/ImageUtil.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/ImageUtil.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/ImageUtil.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/ImageUtil.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/InertialMeasurementUnit.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/InertialMeasurementUnit.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/InertialMeasurementUnit.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/InertialMeasurementUnit.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/InertialMeasurementUnit.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/InertialMeasurementUnit.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/InertialMeasurementUnit.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/InertialMeasurementUnit.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/InstanceSegmentationCamera.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/InstanceSegmentationCamera.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/InstanceSegmentationCamera.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/InstanceSegmentationCamera.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/InstanceSegmentationCamera.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/InstanceSegmentationCamera.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/InstanceSegmentationCamera.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/InstanceSegmentationCamera.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/LaneInvasionSensor.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/LaneInvasionSensor.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/LaneInvasionSensor.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/LaneInvasionSensor.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/LaneInvasionSensor.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/LaneInvasionSensor.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/LaneInvasionSensor.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/LaneInvasionSensor.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/LidarDescription.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/LidarDescription.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/LidarDescription.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/LidarDescription.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/NormalsCamera.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/NormalsCamera.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/NormalsCamera.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/NormalsCamera.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/NormalsCamera.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/NormalsCamera.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/NormalsCamera.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/NormalsCamera.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/ObstacleDetectionSensor.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/ObstacleDetectionSensor.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/ObstacleDetectionSensor.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/ObstacleDetectionSensor.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/ObstacleDetectionSensor.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/ObstacleDetectionSensor.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/ObstacleDetectionSensor.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/ObstacleDetectionSensor.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/OpticalFlowCamera.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/OpticalFlowCamera.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/OpticalFlowCamera.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/OpticalFlowCamera.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/OpticalFlowCamera.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/OpticalFlowCamera.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/OpticalFlowCamera.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/OpticalFlowCamera.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/PixelReader.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/PixelReader.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/PixelReader.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/PixelReader.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/PixelReader.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/PixelReader.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/PixelReader.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/PixelReader.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/Radar.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/Radar.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/Radar.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/Radar.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/Radar.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/Radar.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/Radar.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/Radar.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/RayCastLidar.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/RayCastLidar.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/RayCastLidar.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/RayCastLidar.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/RayCastLidar.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/RayCastLidar.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/RayCastLidar.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/RayCastLidar.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/RayCastSemanticLidar.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/RayCastSemanticLidar.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/RayCastSemanticLidar.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/RayCastSemanticLidar.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/RayCastSemanticLidar.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/RayCastSemanticLidar.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/RayCastSemanticLidar.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/RayCastSemanticLidar.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/RssSensor.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/RssSensor.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/RssSensor.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/RssSensor.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/RssSensor.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/RssSensor.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/RssSensor.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/RssSensor.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureCamera.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/SceneCaptureCamera.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureCamera.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/SceneCaptureCamera.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureCamera.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/SceneCaptureCamera.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureCamera.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/SceneCaptureCamera.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SemanticSegmentationCamera.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/SemanticSegmentationCamera.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SemanticSegmentationCamera.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/SemanticSegmentationCamera.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SemanticSegmentationCamera.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/SemanticSegmentationCamera.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SemanticSegmentationCamera.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/SemanticSegmentationCamera.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/Sensor.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/Sensor.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/Sensor.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/Sensor.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/Sensor.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/Sensor.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/Sensor.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/Sensor.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SensorFactory.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/SensorFactory.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SensorFactory.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/SensorFactory.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SensorFactory.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/SensorFactory.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SensorFactory.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/SensorFactory.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SensorManager.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/SensorManager.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SensorManager.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/SensorManager.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SensorManager.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/SensorManager.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SensorManager.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/SensorManager.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/ShaderBasedSensor.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/ShaderBasedSensor.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/ShaderBasedSensor.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/ShaderBasedSensor.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/ShaderBasedSensor.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/ShaderBasedSensor.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/ShaderBasedSensor.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/ShaderBasedSensor.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponent2D_CARLA.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponent2D_CARLA.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponent2D_CARLA.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponent2D_CARLA.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponent2D_CARLA.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponent2D_CARLA.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponent2D_CARLA.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponent2D_CARLA.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponentCube_CARLA.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponentCube_CARLA.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponentCube_CARLA.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponentCube_CARLA.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponentCube_CARLA.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponentCube_CARLA.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponentCube_CARLA.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponentCube_CARLA.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponent_CARLA.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponent_CARLA.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponent_CARLA.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponent_CARLA.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponent_CARLA.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponent_CARLA.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponent_CARLA.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/UE4_Overridden/SceneCaptureComponent_CARLA.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/WorldObserver.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/WorldObserver.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/WorldObserver.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/WorldObserver.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/WorldObserver.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/WorldObserver.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/WorldObserver.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/WorldObserver.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/CarlaServer.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Server/CarlaServer.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/CarlaServer.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Server/CarlaServer.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/CarlaServer.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Server/CarlaServer.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/CarlaServer.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Server/CarlaServer.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/CarlaServerResponse.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Server/CarlaServerResponse.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/CarlaServerResponse.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Server/CarlaServerResponse.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/CarlaServerResponse.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Server/CarlaServerResponse.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/CarlaServerResponse.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Server/CarlaServerResponse.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Settings/CarlaSettings.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Settings/CarlaSettings.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Settings/CarlaSettings.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Settings/CarlaSettings.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Settings/CarlaSettings.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Settings/CarlaSettings.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Settings/CarlaSettings.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Settings/CarlaSettings.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Settings/CarlaSettingsDelegate.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Settings/CarlaSettingsDelegate.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Settings/CarlaSettingsDelegate.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Settings/CarlaSettingsDelegate.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Settings/CarlaSettingsDelegate.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Settings/CarlaSettingsDelegate.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Settings/CarlaSettingsDelegate.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Settings/CarlaSettingsDelegate.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Settings/EpisodeSettings.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Settings/EpisodeSettings.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Settings/EpisodeSettings.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Settings/EpisodeSettings.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Settings/QualityLevelUE.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Settings/QualityLevelUE.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Settings/QualityLevelUE.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Settings/QualityLevelUE.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/RoutePlanner.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/RoutePlanner.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/RoutePlanner.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/RoutePlanner.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/RoutePlanner.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/RoutePlanner.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/RoutePlanner.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/RoutePlanner.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/SignComponent.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/SignComponent.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/SignComponent.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/SignComponent.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/SignComponent.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/SignComponent.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/SignComponent.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/SignComponent.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/SpeedLimitComponent.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/SpeedLimitComponent.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/SpeedLimitComponent.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/SpeedLimitComponent.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/SpeedLimitComponent.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/SpeedLimitComponent.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/SpeedLimitComponent.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/SpeedLimitComponent.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/StopSignComponent.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/StopSignComponent.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/StopSignComponent.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/StopSignComponent.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/StopSignComponent.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/StopSignComponent.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/StopSignComponent.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/StopSignComponent.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightBase.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficLightBase.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightBase.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficLightBase.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightBase.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficLightBase.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightBase.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficLightBase.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightComponent.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficLightComponent.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightComponent.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficLightComponent.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightComponent.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficLightComponent.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightComponent.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficLightComponent.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightController.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficLightController.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightController.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficLightController.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightController.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficLightController.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightController.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficLightController.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightGroup.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficLightGroup.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightGroup.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficLightGroup.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightGroup.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficLightGroup.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightGroup.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficLightGroup.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightInterface.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficLightInterface.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightInterface.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficLightInterface.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightManager.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficLightManager.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightManager.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficLightManager.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightManager.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficLightManager.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightManager.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficLightManager.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightState.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficLightState.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightState.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficLightState.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficSignBase.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficSignBase.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficSignBase.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficSignBase.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficSignBase.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficSignBase.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficSignBase.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/TrafficSignBase.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/YieldSignComponent.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/YieldSignComponent.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/YieldSignComponent.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/YieldSignComponent.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/YieldSignComponent.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/YieldSignComponent.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/YieldSignComponent.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Traffic/YieldSignComponent.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Trigger/FrictionTrigger.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Trigger/FrictionTrigger.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Trigger/FrictionTrigger.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Trigger/FrictionTrigger.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Trigger/FrictionTrigger.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Trigger/FrictionTrigger.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Trigger/FrictionTrigger.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Trigger/FrictionTrigger.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Trigger/TriggerFactory.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Trigger/TriggerFactory.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Trigger/TriggerFactory.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Trigger/TriggerFactory.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Trigger/TriggerFactory.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Trigger/TriggerFactory.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Trigger/TriggerFactory.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Trigger/TriggerFactory.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ActorAttacher.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/ActorAttacher.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ActorAttacher.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/ActorAttacher.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ActorAttacher.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/ActorAttacher.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ActorAttacher.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/ActorAttacher.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ActorWithRandomEngine.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/ActorWithRandomEngine.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ActorWithRandomEngine.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/ActorWithRandomEngine.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ActorWithRandomEngine.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/ActorWithRandomEngine.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ActorWithRandomEngine.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/ActorWithRandomEngine.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/BoundingBox.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/BoundingBox.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/BoundingBox.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/BoundingBox.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/BoundingBoxCalculator.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/BoundingBoxCalculator.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/BoundingBoxCalculator.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/BoundingBoxCalculator.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/BoundingBoxCalculator.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/BoundingBoxCalculator.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/BoundingBoxCalculator.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/BoundingBoxCalculator.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/DebugShapeDrawer.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/DebugShapeDrawer.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/DebugShapeDrawer.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/DebugShapeDrawer.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/DebugShapeDrawer.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/DebugShapeDrawer.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/DebugShapeDrawer.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/DebugShapeDrawer.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/EmptyActor.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/EmptyActor.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/EmptyActor.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/EmptyActor.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/EmptyActor.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/EmptyActor.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/EmptyActor.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/EmptyActor.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/EnvironmentObject.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/EnvironmentObject.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/EnvironmentObject.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/EnvironmentObject.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/IniFile.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/IniFile.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/IniFile.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/IniFile.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ListView.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/ListView.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ListView.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/ListView.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/NavigationMesh.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/NavigationMesh.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/NavigationMesh.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/NavigationMesh.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/NavigationMesh.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/NavigationMesh.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/NavigationMesh.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/NavigationMesh.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/NoWorldOffsetSceneComponent.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/NoWorldOffsetSceneComponent.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/NoWorldOffsetSceneComponent.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/NoWorldOffsetSceneComponent.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/NoWorldOffsetSceneComponent.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/NoWorldOffsetSceneComponent.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/NoWorldOffsetSceneComponent.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/NoWorldOffsetSceneComponent.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/NonCopyable.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/NonCopyable.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/NonCopyable.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/NonCopyable.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ObjectRegister.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/ObjectRegister.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ObjectRegister.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/ObjectRegister.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ObjectRegister.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/ObjectRegister.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ObjectRegister.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/ObjectRegister.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ProceduralCustomMesh.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/ProceduralCustomMesh.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ProceduralCustomMesh.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/ProceduralCustomMesh.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/RandomEngine.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/RandomEngine.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/RandomEngine.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/RandomEngine.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/RandomEngine.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/RandomEngine.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/RandomEngine.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/RandomEngine.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/RayTracer.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/RayTracer.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/RayTracer.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/RayTracer.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/RayTracer.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/RayTracer.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/RayTracer.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/RayTracer.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/RoadPainterWrapper.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/RoadPainterWrapper.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/RoadPainterWrapper.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/RoadPainterWrapper.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/RoadPainterWrapper.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/RoadPainterWrapper.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/RoadPainterWrapper.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/RoadPainterWrapper.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ScopedStack.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/ScopedStack.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ScopedStack.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/ScopedStack.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/SensorSpawnerActor.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/SensorSpawnerActor.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/SensorSpawnerActor.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/SensorSpawnerActor.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/SensorSpawnerActor.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/SensorSpawnerActor.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/SensorSpawnerActor.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Util/SensorSpawnerActor.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vegetation/BaseVegetationActor.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vegetation/BaseVegetationActor.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vegetation/BaseVegetationActor.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vegetation/BaseVegetationActor.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vegetation/BaseVegetationActor.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vegetation/BaseVegetationActor.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vegetation/BaseVegetationActor.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vegetation/BaseVegetationActor.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vegetation/SpringBasedVegetationComponent.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vegetation/SpringBasedVegetationComponent.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vegetation/SpringBasedVegetationComponent.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vegetation/SpringBasedVegetationComponent.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vegetation/SpringBasedVegetationComponent.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vegetation/SpringBasedVegetationComponent.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vegetation/SpringBasedVegetationComponent.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vegetation/SpringBasedVegetationComponent.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vegetation/VegetationManager.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vegetation/VegetationManager.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vegetation/VegetationManager.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vegetation/VegetationManager.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vegetation/VegetationManager.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vegetation/VegetationManager.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vegetation/VegetationManager.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vegetation/VegetationManager.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/AckermannController.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/AckermannController.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/AckermannController.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/AckermannController.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/AckermannController.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/AckermannController.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/AckermannController.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/AckermannController.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/AckermannControllerSettings.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/AckermannControllerSettings.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/AckermannControllerSettings.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/AckermannControllerSettings.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicleNW.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicleNW.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicleNW.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicleNW.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicleNW.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicleNW.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicleNW.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicleNW.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicleState.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicleState.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicleState.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicleState.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CustomTerrainPhysicsComponent.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/CustomTerrainPhysicsComponent.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CustomTerrainPhysicsComponent.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/CustomTerrainPhysicsComponent.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CustomTerrainPhysicsComponent.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/CustomTerrainPhysicsComponent.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CustomTerrainPhysicsComponent.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/CustomTerrainPhysicsComponent.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/BaseCarlaMovementComponent.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/BaseCarlaMovementComponent.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/BaseCarlaMovementComponent.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/BaseCarlaMovementComponent.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/BaseCarlaMovementComponent.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/BaseCarlaMovementComponent.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/BaseCarlaMovementComponent.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/BaseCarlaMovementComponent.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/CarSimManagerComponent.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/CarSimManagerComponent.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/CarSimManagerComponent.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/CarSimManagerComponent.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/CarSimManagerComponent.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/CarSimManagerComponent.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/CarSimManagerComponent.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/CarSimManagerComponent.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/ChronoMovementComponent.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/ChronoMovementComponent.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/ChronoMovementComponent.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/ChronoMovementComponent.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/ChronoMovementComponent.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/ChronoMovementComponent.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/ChronoMovementComponent.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/ChronoMovementComponent.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/DefaultMovementComponent.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/DefaultMovementComponent.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/DefaultMovementComponent.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/DefaultMovementComponent.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/DefaultMovementComponent.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/DefaultMovementComponent.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/DefaultMovementComponent.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/DefaultMovementComponent.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehicleAckermannControl.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/VehicleAckermannControl.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehicleAckermannControl.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/VehicleAckermannControl.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehicleControl.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/VehicleControl.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehicleControl.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/VehicleControl.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehicleInputPriority.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/VehicleInputPriority.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehicleInputPriority.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/VehicleInputPriority.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehicleLightState.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/VehicleLightState.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehicleLightState.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/VehicleLightState.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehiclePhysicsControl.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/VehiclePhysicsControl.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehiclePhysicsControl.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/VehiclePhysicsControl.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehicleSpawnPoint.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/VehicleSpawnPoint.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehicleSpawnPoint.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/VehicleSpawnPoint.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehicleVelocityControl.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/VehicleVelocityControl.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehicleVelocityControl.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/VehicleVelocityControl.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehicleVelocityControl.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/VehicleVelocityControl.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehicleVelocityControl.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/VehicleVelocityControl.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/WheelPhysicsControl.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/WheelPhysicsControl.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/WheelPhysicsControl.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/WheelPhysicsControl.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleAIController.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleAIController.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleAIController.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleAIController.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleAIController.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleAIController.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleAIController.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleAIController.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleMovementComponentNW.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleMovementComponentNW.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleMovementComponentNW.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleMovementComponentNW.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleMovementComponentNW.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleMovementComponentNW.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleMovementComponentNW.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleMovementComponentNW.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Walker/WalkerAnim.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Walker/WalkerAnim.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Walker/WalkerAnim.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Walker/WalkerAnim.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Walker/WalkerAnim.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Walker/WalkerAnim.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Walker/WalkerAnim.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Walker/WalkerAnim.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Walker/WalkerBase.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Walker/WalkerBase.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Walker/WalkerBase.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Walker/WalkerBase.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Walker/WalkerBase.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Walker/WalkerBase.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Walker/WalkerBase.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Walker/WalkerBase.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Walker/WalkerBoneControlIn.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Walker/WalkerBoneControlIn.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Walker/WalkerBoneControlIn.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Walker/WalkerBoneControlIn.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Walker/WalkerBoneControlOut.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Walker/WalkerBoneControlOut.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Walker/WalkerBoneControlOut.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Walker/WalkerBoneControlOut.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Walker/WalkerControl.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Walker/WalkerControl.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Walker/WalkerControl.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Walker/WalkerControl.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Walker/WalkerController.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Walker/WalkerController.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Walker/WalkerController.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Walker/WalkerController.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Walker/WalkerController.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Walker/WalkerController.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Walker/WalkerController.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Walker/WalkerController.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Walker/WalkerSpawnPoint.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Walker/WalkerSpawnPoint.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Walker/WalkerSpawnPoint.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Walker/WalkerSpawnPoint.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Weather/Weather.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Weather/Weather.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Weather/Weather.cpp rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Weather/Weather.cpp diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Weather/Weather.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Weather/Weather.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Weather/Weather.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Weather/Weather.h diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Weather/WeatherParameters.h b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Weather/WeatherParameters.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Weather/WeatherParameters.h rename to Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Weather/WeatherParameters.h diff --git a/Unreal/CarlaUE4/Plugins/CarlaExporter/CarlaExporter.uplugin b/Unreal/CarlaUnreal/Plugins/CarlaExporter/CarlaExporter.uplugin similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaExporter/CarlaExporter.uplugin rename to Unreal/CarlaUnreal/Plugins/CarlaExporter/CarlaExporter.uplugin diff --git a/Unreal/CarlaUE4/Plugins/CarlaExporter/Source/CarlaExporter/CarlaExporter.Build.cs b/Unreal/CarlaUnreal/Plugins/CarlaExporter/Source/CarlaExporter/CarlaExporter.Build.cs similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaExporter/Source/CarlaExporter/CarlaExporter.Build.cs rename to Unreal/CarlaUnreal/Plugins/CarlaExporter/Source/CarlaExporter/CarlaExporter.Build.cs diff --git a/Unreal/CarlaUE4/Plugins/CarlaExporter/Source/CarlaExporter/Private/CarlaExporter.cpp b/Unreal/CarlaUnreal/Plugins/CarlaExporter/Source/CarlaExporter/Private/CarlaExporter.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaExporter/Source/CarlaExporter/Private/CarlaExporter.cpp rename to Unreal/CarlaUnreal/Plugins/CarlaExporter/Source/CarlaExporter/Private/CarlaExporter.cpp diff --git a/Unreal/CarlaUE4/Plugins/CarlaExporter/Source/CarlaExporter/Private/CarlaExporterCommands.cpp b/Unreal/CarlaUnreal/Plugins/CarlaExporter/Source/CarlaExporter/Private/CarlaExporterCommands.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaExporter/Source/CarlaExporter/Private/CarlaExporterCommands.cpp rename to Unreal/CarlaUnreal/Plugins/CarlaExporter/Source/CarlaExporter/Private/CarlaExporterCommands.cpp diff --git a/Unreal/CarlaUE4/Plugins/CarlaExporter/Source/CarlaExporter/Public/CarlaExporter.h b/Unreal/CarlaUnreal/Plugins/CarlaExporter/Source/CarlaExporter/Public/CarlaExporter.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaExporter/Source/CarlaExporter/Public/CarlaExporter.h rename to Unreal/CarlaUnreal/Plugins/CarlaExporter/Source/CarlaExporter/Public/CarlaExporter.h diff --git a/Unreal/CarlaUE4/Plugins/CarlaExporter/Source/CarlaExporter/Public/CarlaExporterCommands.h b/Unreal/CarlaUnreal/Plugins/CarlaExporter/Source/CarlaExporter/Public/CarlaExporterCommands.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaExporter/Source/CarlaExporter/Public/CarlaExporterCommands.h rename to Unreal/CarlaUnreal/Plugins/CarlaExporter/Source/CarlaExporter/Public/CarlaExporterCommands.h diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/CarlaTools.uplugin b/Unreal/CarlaUnreal/Plugins/CarlaTools/CarlaTools.uplugin similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/CarlaTools.uplugin rename to Unreal/CarlaUnreal/Plugins/CarlaTools/CarlaTools.uplugin diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/BaseMap/MainLargeMap/MapGeneratorBaseLargeMap.umap b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/BaseMap/MainLargeMap/MapGeneratorBaseLargeMap.umap similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/BaseMap/MainLargeMap/MapGeneratorBaseLargeMap.umap rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/BaseMap/MainLargeMap/MapGeneratorBaseLargeMap.umap diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/BaseMap/Tiles/MapGeneratorBaseMap.umap b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/BaseMap/Tiles/MapGeneratorBaseMap.umap similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/BaseMap/Tiles/MapGeneratorBaseMap.umap rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/BaseMap/Tiles/MapGeneratorBaseMap.umap diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/BaseMap/TilesEmpty/BaseTileEmpty.umap b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/BaseMap/TilesEmpty/BaseTileEmpty.umap similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/BaseMap/TilesEmpty/BaseTileEmpty.umap rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/BaseMap/TilesEmpty/BaseTileEmpty.umap diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_GridRegion_Inst.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_GridRegion_Inst.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_GridRegion_Inst.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_GridRegion_Inst.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_HeightMapNoiseMat.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_HeightMapNoiseMat.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_HeightMapNoiseMat.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_HeightMapNoiseMat.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_ROIHeightMapNoise.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_ROIHeightMapNoise.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_ROIHeightMapNoise.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_ROIHeightMapNoise.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_RoiTileHeightMap.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_RoiTileHeightMap.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_RoiTileHeightMap.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_RoiTileHeightMap.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_TileHeightMapMat.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_TileHeightMapMat.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_TileHeightMapMat.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Materials/MI_TileHeightMapMat.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Materials/MPC_HeightMapCollector.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Materials/MPC_HeightMapCollector.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Materials/MPC_HeightMapCollector.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Materials/MPC_HeightMapCollector.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Materials/M_GridRegion.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Materials/M_GridRegion.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Materials/M_GridRegion.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Materials/M_GridRegion.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Materials/M_HeightMapNoise.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Materials/M_HeightMapNoise.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Materials/M_HeightMapNoise.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Materials/M_HeightMapNoise.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Materials/M_HeightMapNoisePreview.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Materials/M_HeightMapNoisePreview.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Materials/M_HeightMapNoisePreview.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Materials/M_HeightMapNoisePreview.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Materials/M_TileHeightMap.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Materials/M_TileHeightMap.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Materials/M_TileHeightMap.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Materials/M_TileHeightMap.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/OpenDrive/TemplateOpenDrive.xodr b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/OpenDrive/TemplateOpenDrive.xodr similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/OpenDrive/TemplateOpenDrive.xodr rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/OpenDrive/TemplateOpenDrive.xodr diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/PersistentFiles/MapGeneratorMiscEditorState.json b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/PersistentFiles/MapGeneratorMiscEditorState.json similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/PersistentFiles/MapGeneratorMiscEditorState.json rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/PersistentFiles/MapGeneratorMiscEditorState.json diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/PersistentFiles/MapGeneratorWidgetState.json b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/PersistentFiles/MapGeneratorWidgetState.json similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/PersistentFiles/MapGeneratorWidgetState.json rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/PersistentFiles/MapGeneratorWidgetState.json diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/PersistentFiles/MapGeneratorWidgetState_Defaults.json b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/PersistentFiles/MapGeneratorWidgetState_Defaults.json similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/PersistentFiles/MapGeneratorWidgetState_Defaults.json rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/PersistentFiles/MapGeneratorWidgetState_Defaults.json diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/RegionWidget/WB_BaseRegionWidget.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/RegionWidget/WB_BaseRegionWidget.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/RegionWidget/WB_BaseRegionWidget.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/RegionWidget/WB_BaseRegionWidget.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/RegionWidget/WB_TerrainMaterialWidget.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/RegionWidget/WB_TerrainMaterialWidget.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/RegionWidget/WB_TerrainMaterialWidget.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/RegionWidget/WB_TerrainMaterialWidget.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/RegionWidget/WB_VegetationGeneralSettings.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/RegionWidget/WB_VegetationGeneralSettings.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/RegionWidget/WB_VegetationGeneralSettings.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/RegionWidget/WB_VegetationGeneralSettings.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/SpecificActorPlacement/A_BasicActor.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/SpecificActorPlacement/A_BasicActor.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/SpecificActorPlacement/A_BasicActor.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/SpecificActorPlacement/A_BasicActor.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/SpecificActorPlacement/SpecificLocationPlaceholder.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/SpecificActorPlacement/SpecificLocationPlaceholder.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/SpecificActorPlacement/SpecificLocationPlaceholder.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/SpecificActorPlacement/SpecificLocationPlaceholder.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/SpecificActorPlacement/UW_ActorCreation.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/SpecificActorPlacement/UW_ActorCreation.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/SpecificActorPlacement/UW_ActorCreation.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/SpecificActorPlacement/UW_ActorCreation.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/TerrainPresets/canyons_preset.json b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/TerrainPresets/canyons_preset.json similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/TerrainPresets/canyons_preset.json rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/TerrainPresets/canyons_preset.json diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/TerrainPresets/dunes_preset.json b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/TerrainPresets/dunes_preset.json similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/TerrainPresets/dunes_preset.json rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/TerrainPresets/dunes_preset.json diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/TerrainPresets/flatlands_preset.json b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/TerrainPresets/flatlands_preset.json similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/TerrainPresets/flatlands_preset.json rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/TerrainPresets/flatlands_preset.json diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/TerrainPresets/valley_preset.json b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/TerrainPresets/valley_preset.json similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/TerrainPresets/valley_preset.json rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/TerrainPresets/valley_preset.json diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/Weather/BP_Weather_Child_MapGenerator.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/Weather/BP_Weather_Child_MapGenerator.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Misc/Weather/BP_Weather_Child_MapGenerator.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Misc/Weather/BP_Weather_Child_MapGenerator.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Rivers/RiverPresets/River01/RiverPreset01.umap b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Rivers/RiverPresets/River01/RiverPreset01.umap similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Rivers/RiverPresets/River01/RiverPreset01.umap rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Rivers/RiverPresets/River01/RiverPreset01.umap diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Rivers/RiverPresets/River01/T_River01b.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Rivers/RiverPresets/River01/T_River01b.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Rivers/RiverPresets/River01/T_River01b.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Rivers/RiverPresets/River01/T_River01b.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Rivers/RiverPresets/River01/T_RiverPreset01.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Rivers/RiverPresets/River01/T_RiverPreset01.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Rivers/RiverPresets/River01/T_RiverPreset01.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Rivers/RiverPresets/River01/T_RiverPreset01.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_BluryLandscape.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_BluryLandscape.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_BluryLandscape.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_BluryLandscape.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_HeightMap.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_HeightMap.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_HeightMap.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_HeightMap.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_HeightMapPreview.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_HeightMapPreview.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_HeightMapPreview.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_HeightMapPreview.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_LandscapeFinal.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_LandscapeFinal.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_LandscapeFinal.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_LandscapeFinal.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_ROITileHeightMap.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_ROITileHeightMap.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_ROITileHeightMap.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_ROITileHeightMap.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_RoiHeightMap.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_RoiHeightMap.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_RoiHeightMap.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_RoiHeightMap.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_TileHeightMapResult.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_TileHeightMapResult.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_TileHeightMapResult.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/RT_TileHeightMapResult.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/T_CrossMask.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/T_CrossMask.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/T_CrossMask.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/T_CrossMask.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/Desert_03.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/Desert_03.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/Desert_03.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/Desert_03.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/Forest_02.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/Forest_02.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/Forest_02.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/Forest_02.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/add.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/add.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/add.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/add.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/bread.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/bread.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/bread.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/bread.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/daylight01.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/daylight01.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/daylight01.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/daylight01.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/daylight02.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/daylight02.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/daylight02.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/daylight02.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/forest.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/forest.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/forest.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/forest.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/garbage-can.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/garbage-can.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/garbage-can.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/garbage-can.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/help.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/help.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/help.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/help.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/miscellaneous.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/miscellaneous.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/miscellaneous.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/miscellaneous.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/mountain.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/mountain.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/mountain.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/mountain.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/night_02.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/night_02.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/night_02.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/night_02.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/pencil.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/pencil.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/pencil.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/pencil.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/place__1_.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/place__1_.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/place__1_.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/place__1_.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/rainnyday01.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/rainnyday01.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/rainnyday01.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/rainnyday01.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/right-arrow.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/right-arrow.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/right-arrow.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/right-arrow.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/shovel.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/shovel.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/shovel.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/shovel.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/spread.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/spread.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/spread.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/spread.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/sunset03.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/sunset03.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/sunset03.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/sunset03.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/water-waves.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/water-waves.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/water-waves.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/water-waves.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/weather.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/weather.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/weather.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/weather.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/zoomin.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/zoomin.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/zoomin.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/zoomin.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/zoomout.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/zoomout.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/zoomout.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/Textures/UI_Icons/zoomout.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/UWB_CARLA.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/UWB_CARLA.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/MapGenerator/UWB_CARLA.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/MapGenerator/UWB_CARLA.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/BP_InstancedMesh.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/BP_InstancedMesh.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/BP_InstancedMesh.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/BP_InstancedMesh.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/BP_OpenDriveToMap.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/BP_OpenDriveToMap.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/BP_OpenDriveToMap.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/BP_OpenDriveToMap.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_BuildingGenerator.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_BuildingGenerator.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_BuildingGenerator.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_BuildingGenerator.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_RoofPropsGenerator.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_RoofPropsGenerator.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_RoofPropsGenerator.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_RoofPropsGenerator.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_Veg_Caller.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_Veg_Caller.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_Veg_Caller.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_Veg_Caller.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_Veg_Scatter.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_Veg_Scatter.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_Veg_Scatter.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_Veg_Scatter.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BuildingStyleHolder.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BuildingStyleHolder.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BuildingStyleHolder.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BuildingStyleHolder.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/DT_BuildingStyles.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/DT_BuildingStyles.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/DT_BuildingStyles.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/DT_BuildingStyles.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/DT_TreesGeneration.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/DT_TreesGeneration.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/DT_TreesGeneration.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/DT_TreesGeneration.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/LevelCreator.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/LevelCreator.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/LevelCreator.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/LevelCreator.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/MapPreview/W_MapPreview.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/MapPreview/W_MapPreview.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/MapPreview/W_MapPreview.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/MapPreview/W_MapPreview.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/UW_HoudiniBuildingImporter.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/UW_HoudiniBuildingImporter.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/UW_HoudiniBuildingImporter.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/UW_HoudiniBuildingImporter.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/UW_OnRoadMainWidget.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/UW_OnRoadMainWidget.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/UW_OnRoadMainWidget.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/OnroadMapGenerator/UW_OnRoadMainWidget.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/ProceduralWaterManager/ProceduralWaterGenerator.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/ProceduralWaterManager/ProceduralWaterGenerator.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/ProceduralWaterManager/ProceduralWaterGenerator.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/ProceduralWaterManager/ProceduralWaterGenerator.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/Python/add_prop_to_prop_factory.py b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/Python/add_prop_to_prop_factory.py similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/Python/add_prop_to_prop_factory.py rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/Python/add_prop_to_prop_factory.py diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/Python/add_vehicle_to_vehicle_factory.py b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/Python/add_vehicle_to_vehicle_factory.py similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/Python/add_vehicle_to_vehicle_factory.py rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/Python/add_vehicle_to_vehicle_factory.py diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/Python/generate_tile.py b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/Python/generate_tile.py similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/Python/generate_tile.py rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/Python/generate_tile.py diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/USDImporter/UW_USDImporter.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/USDImporter/UW_USDImporter.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/USDImporter/UW_USDImporter.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/USDImporter/UW_USDImporter.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/USDImporter/UW_USDPropImporterEditorWidget.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/USDImporter/UW_USDPropImporterEditorWidget.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/USDImporter/UW_USDPropImporterEditorWidget.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/USDImporter/UW_USDPropImporterEditorWidget.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/USDImporter/UW_USDVehicleImporterEditorWidget.uasset b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/USDImporter/UW_USDVehicleImporterEditorWidget.uasset similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Content/USDImporter/UW_USDVehicleImporterEditorWidget.uasset rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Content/USDImporter/UW_USDVehicleImporterEditorWidget.uasset diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Resources/Icon128.png b/Unreal/CarlaUnreal/Plugins/CarlaTools/Resources/Icon128.png similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Resources/Icon128.png rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Resources/Icon128.png diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/.gitignore b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/.gitignore similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/.gitignore rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/.gitignore diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs.in b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs.in similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs.in rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs.in diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/CarlaTools.cpp b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/CarlaTools.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/CarlaTools.cpp rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/CarlaTools.cpp diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/Commandlet/GenerateTileCommandlet.cpp b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/Commandlet/GenerateTileCommandlet.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/Commandlet/GenerateTileCommandlet.cpp rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/Commandlet/GenerateTileCommandlet.cpp diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/DigitalTwinsBaseWidget.cpp b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/DigitalTwinsBaseWidget.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/DigitalTwinsBaseWidget.cpp rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/DigitalTwinsBaseWidget.cpp diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/EditorCamera.cpp b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/EditorCamera.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/EditorCamera.cpp rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/EditorCamera.cpp diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/HoudiniImportNodeWrapper.cpp b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/HoudiniImportNodeWrapper.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/HoudiniImportNodeWrapper.cpp rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/HoudiniImportNodeWrapper.cpp diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/HoudiniImporterWidget.cpp b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/HoudiniImporterWidget.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/HoudiniImporterWidget.cpp rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/HoudiniImporterWidget.cpp diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/MapGeneratorWidget.cpp b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/MapGeneratorWidget.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/MapGeneratorWidget.cpp rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/MapGeneratorWidget.cpp diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/MapPreviewUserWidget.cpp b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/MapPreviewUserWidget.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/MapPreviewUserWidget.cpp rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/MapPreviewUserWidget.cpp diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/Online/CustomFileDownloader.cpp b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/Online/CustomFileDownloader.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/Online/CustomFileDownloader.cpp rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/Online/CustomFileDownloader.cpp diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/OpenDriveToMap.cpp b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/OpenDriveToMap.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/OpenDriveToMap.cpp rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/OpenDriveToMap.cpp diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/ProceduralBuildingUtilities.cpp b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/ProceduralBuildingUtilities.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/ProceduralBuildingUtilities.cpp rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/ProceduralBuildingUtilities.cpp diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/ProceduralWaterManager.cpp b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/ProceduralWaterManager.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/ProceduralWaterManager.cpp rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/ProceduralWaterManager.cpp diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/RegionOfInterest.cpp b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/RegionOfInterest.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/RegionOfInterest.cpp rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/RegionOfInterest.cpp diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/USDImporterWidget.cpp b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/USDImporterWidget.cpp similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/USDImporterWidget.cpp rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/USDImporterWidget.cpp diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/CarlaTools.h b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/CarlaTools.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/CarlaTools.h rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/CarlaTools.h diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/Commandlet/GenerateTileCommandlet.h b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/Commandlet/GenerateTileCommandlet.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/Commandlet/GenerateTileCommandlet.h rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/Commandlet/GenerateTileCommandlet.h diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/DigitalTwinsBaseWidget.h b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/DigitalTwinsBaseWidget.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/DigitalTwinsBaseWidget.h rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/DigitalTwinsBaseWidget.h diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/EditorCamera.h b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/EditorCamera.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/EditorCamera.h rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/EditorCamera.h diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/HoudiniImportNodeWrapper.h b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/HoudiniImportNodeWrapper.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/HoudiniImportNodeWrapper.h rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/HoudiniImportNodeWrapper.h diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/HoudiniImporterWidget.h b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/HoudiniImporterWidget.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/HoudiniImporterWidget.h rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/HoudiniImporterWidget.h diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/MapGeneratorWidget.h b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/MapGeneratorWidget.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/MapGeneratorWidget.h rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/MapGeneratorWidget.h diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/MapPreviewUserWidget.h b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/MapPreviewUserWidget.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/MapPreviewUserWidget.h rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/MapPreviewUserWidget.h diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/Online/CustomFileDownloader.h b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/Online/CustomFileDownloader.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/Online/CustomFileDownloader.h rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/Online/CustomFileDownloader.h diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/OpenDriveToMap.h b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/OpenDriveToMap.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/OpenDriveToMap.h rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/OpenDriveToMap.h diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/ProceduralBuildingUtilities.h b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/ProceduralBuildingUtilities.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/ProceduralBuildingUtilities.h rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/ProceduralBuildingUtilities.h diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/ProceduralWaterManager.h b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/ProceduralWaterManager.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/ProceduralWaterManager.h rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/ProceduralWaterManager.h diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/RegionOfInterest.h b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/RegionOfInterest.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/RegionOfInterest.h rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/RegionOfInterest.h diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/TreeTableRow.h b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/TreeTableRow.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/TreeTableRow.h rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/TreeTableRow.h diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/USDImporterWidget.h b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/USDImporterWidget.h similarity index 100% rename from Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/USDImporterWidget.h rename to Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Public/USDImporterWidget.h diff --git a/Unreal/CarlaUE4/Source/CarlaUE4.Target.cs b/Unreal/CarlaUnreal/Source/CarlaUE4.Target.cs similarity index 100% rename from Unreal/CarlaUE4/Source/CarlaUE4.Target.cs rename to Unreal/CarlaUnreal/Source/CarlaUE4.Target.cs diff --git a/Unreal/CarlaUE4/Source/CarlaUE4/CarlaUE4.Build.cs b/Unreal/CarlaUnreal/Source/CarlaUE4/CarlaUE4.Build.cs similarity index 100% rename from Unreal/CarlaUE4/Source/CarlaUE4/CarlaUE4.Build.cs rename to Unreal/CarlaUnreal/Source/CarlaUE4/CarlaUE4.Build.cs diff --git a/Unreal/CarlaUE4/Source/CarlaUE4/CarlaUE4.cpp b/Unreal/CarlaUnreal/Source/CarlaUE4/CarlaUE4.cpp similarity index 100% rename from Unreal/CarlaUE4/Source/CarlaUE4/CarlaUE4.cpp rename to Unreal/CarlaUnreal/Source/CarlaUE4/CarlaUE4.cpp diff --git a/Unreal/CarlaUE4/Source/CarlaUE4/CarlaUE4.h b/Unreal/CarlaUnreal/Source/CarlaUE4/CarlaUE4.h similarity index 100% rename from Unreal/CarlaUE4/Source/CarlaUE4/CarlaUE4.h rename to Unreal/CarlaUnreal/Source/CarlaUE4/CarlaUE4.h diff --git a/Unreal/CarlaUE4/Source/CarlaUE4Editor.Target.cs b/Unreal/CarlaUnreal/Source/CarlaUE4Editor.Target.cs similarity index 100% rename from Unreal/CarlaUE4/Source/CarlaUE4Editor.Target.cs rename to Unreal/CarlaUnreal/Source/CarlaUE4Editor.Target.cs From d0dce22ba149e5780b5c3cb923534a75fd6ec424 Mon Sep 17 00:00:00 2001 From: MarcelPiNacy Date: Mon, 4 Mar 2024 13:33:51 +0100 Subject: [PATCH 2/9] Replace references to CarlaUE4. --- .gitignore | 6 +-- CHANGELOG.md | 2 +- CMakeLists.txt | 10 ++-- Configure.py | 4 +- Docs/adv_benchmarking.md | 4 +- Docs/adv_multigpu.md | 8 +-- Docs/adv_opendrive.md | 2 +- Docs/adv_recorder.md | 2 +- Docs/adv_rendering_options.md | 12 ++--- Docs/adv_sumo.md | 2 +- Docs/adv_traffic_manager.md | 8 +-- Docs/build_docker.md | 8 +-- Docs/build_faq.md | 22 ++++---- Docs/build_linux.md | 4 +- Docs/build_system.md | 2 +- Docs/build_update.md | 12 ++--- Docs/build_windows.md | 6 +-- Docs/cont_coding_standard.md | 2 +- Docs/content_authoring_large_maps.md | 2 +- Docs/foundations.md | 6 +-- Docs/large_map_import.md | 2 +- Docs/plugins_carlaviz.md | 2 +- Docs/python_api.md | 4 +- Docs/ref_cpp.md | 4 +- Docs/ref_sensors.md | 4 +- Docs/release_readme.md | 2 +- Docs/start_quickstart.md | 8 +-- Docs/tuto_D_create_semantic_tags.md | 2 +- Docs/tuto_D_create_sensor.md | 4 +- Docs/tuto_G_retrieve_data.md | 6 +-- Docs/tuto_M_add_map_alternative.md | 10 ++-- Docs/tuto_M_add_map_source.md | 2 +- Docs/tuto_M_generate_pedestrian_navigation.md | 2 +- Docs/tuto_first_steps.md | 2 +- Doxyfile | 4 +- Jenkinsfile | 8 +-- .../source/carla/client/detail/Simulator.cpp | 2 +- PythonAPI/docs/client.yml | 4 +- Unreal/CMakeLists.txt | 4 +- Unreal/CarlaUnreal/CarlaUE4.uproject | 2 +- Unreal/CarlaUnreal/Source/CarlaUE4.Target.cs | 2 +- .../Source/CarlaUE4/CarlaUE4.Build.cs | 6 +-- .../CarlaUnreal/Source/CarlaUE4/CarlaUE4.cpp | 4 +- .../Source/CarlaUE4Editor.Target.cs | 2 +- Update.bat | 2 +- Update.py | 2 +- Update.sh | 4 +- Util/BuildTools/BuildCarlaUE4.bat | 26 ++++----- Util/BuildTools/BuildCarlaUE4.sh | 16 +++--- Util/BuildTools/BuildLibCarla.bat | 2 +- Util/BuildTools/BuildOSM2ODR.bat | 4 +- Util/BuildTools/BuildUE4Plugins.bat | 4 +- Util/BuildTools/Import.py | 12 ++--- Util/BuildTools/Linux.mk.help | 6 +-- Util/BuildTools/Package.bat | 54 +++++++++---------- Util/BuildTools/Package.sh | 32 +++++------ Util/BuildTools/Prettify.sh | 2 +- Util/BuildTools/Setup.bat | 6 +-- Util/BuildTools/Vars.mk | 6 +-- Util/BuildTools/Windows.mk.help | 2 +- Util/CARLA.sublime-project | 6 +-- Util/CreateDebian.sh | 18 +++---- Util/Docker/Release.Dockerfile | 4 +- Util/ImportAssets.sh | 2 +- 64 files changed, 213 insertions(+), 213 deletions(-) diff --git a/.gitignore b/.gitignore index 9349c072c..b376352f3 100644 --- a/.gitignore +++ b/.gitignore @@ -15,9 +15,9 @@ Dependencies/ Install/ Plugins/ -!Unreal/CarlaUE4/Plugins -Unreal/CarlaUE4/Plugins/Streetmap -Unreal/CarlaUE4/Plugins/HoudiniEngine +!Unreal/CarlaUnreal/Plugins +Unreal/CarlaUnreal/Plugins/Streetmap +Unreal/CarlaUnreal/Plugins/HoudiniEngine /ExportedMaps /Import/* diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a9a28109..f45b1e6c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -349,7 +349,7 @@ ## CARLA 0.9.7 - * Upgraded parameters of Unreal/CarlaUE4/Config/DefaultInput.ini to prevent mouse freeze + * Upgraded parameters of Unreal/CarlaUnreal/Config/DefaultInput.ini to prevent mouse freeze * Add build variant with AD RSS library integration with RSS sensor and result visualisation * Support for OpenGL and Vulkan in docker + headless mode * Added new sensor: Inertial measurement unit (IMU) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0cb0c5b83..36c9e7f12 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ set ( set ( CARLA_UNREAL_PLUGINS_PATH - ${CARLA_WORKSPACE_PATH}/Unreal/CarlaUE4/Plugins + ${CARLA_WORKSPACE_PATH}/Unreal/CarlaUnreal/Plugins ) include (CheckCCompilerFlag) @@ -116,11 +116,11 @@ if (BUILD_CARLA_UE) endif () carla_two_step_configure_file ( - ${CARLA_WORKSPACE_PATH}/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.Build.cs - ${CARLA_WORKSPACE_PATH}/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.Build.cs.in + ${CARLA_WORKSPACE_PATH}/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Carla.Build.cs + ${CARLA_WORKSPACE_PATH}/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Carla.Build.cs.in ) carla_two_step_configure_file ( - ${CARLA_WORKSPACE_PATH}/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs - ${CARLA_WORKSPACE_PATH}/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs.in + ${CARLA_WORKSPACE_PATH}/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs + ${CARLA_WORKSPACE_PATH}/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs.in ) diff --git a/Configure.py b/Configure.py index 8599537f5..b317ce61d 100644 --- a/Configure.py +++ b/Configure.py @@ -19,7 +19,7 @@ EXAMPLES_PATH = WORKSPACE_PATH / 'Examples' UTIL_PATH = WORKSPACE_PATH / 'Util' DOCKER_UTILS_PATH = UTIL_PATH / 'DockerUtils' PATCHES_PATH = UTIL_PATH / 'Patches' -CARLA_UE_PATH = WORKSPACE_PATH / 'Unreal' / 'CarlaUE4' +CARLA_UE_PATH = WORKSPACE_PATH / 'Unreal' / 'CarlaUnreal' CARLA_UE_PLUGIN_ROOT_PATH = CARLA_UE_PATH / 'Plugins' CARLA_UE_PLUGIN_PATH = CARLA_UE_PLUGIN_ROOT_PATH / 'Carla' CARLA_UE_PLUGIN_DEPENDENCIES_PATH = CARLA_UE_PLUGIN_ROOT_PATH / 'CarlaDependencies' @@ -1390,7 +1390,7 @@ def BuildCarlaUEMain(): 'Development', '-WaitMutex', '-FromMsBuild', - CARLA_UE_PATH / 'CarlaUE4.uproject', + CARLA_UE_PATH / 'CarlaUnreal.uproject', ], log_name = 'carla-ue-editor-build') else: pass diff --git a/Docs/adv_benchmarking.md b/Docs/adv_benchmarking.md index 8027c829a..60fe0f400 100644 --- a/Docs/adv_benchmarking.md +++ b/Docs/adv_benchmarking.md @@ -140,9 +140,9 @@ python -m pip install GPUtil 1. Start CARLA: # Linux: - ./CarlaUE4.sh + ./CarlaUnreal.sh # Windows: - CarlaUE4.exe + CarlaUnreal.exe # Source: make launch diff --git a/Docs/adv_multigpu.md b/Docs/adv_multigpu.md index 52b312ee9..23a5f6f48 100644 --- a/Docs/adv_multigpu.md +++ b/Docs/adv_multigpu.md @@ -16,11 +16,11 @@ The parameters we can use are: For example -**./CarlaUE4.sh --nullrhi** +**./CarlaUnreal.sh --nullrhi** The primary server will use by default the port 2002 to listen for secondary servers. If you need to listen on another port, then you can change it with the flag -**./CarlaUE4.sh --nullrhi -carla-primary-port=3002** +**./CarlaUnreal.sh --nullrhi -carla-primary-port=3002** ## Secondary servers @@ -32,13 +32,13 @@ Then we need to start as many servers as we want, but the ideal is to have as ma For example, if the primary server is executing in the same computer than the secondary servers and with the default port, we can use this: -**./CarlaUE4.sh -carla-rpc-port=3000 -carla-primary-host=127.0.0.1 -ini:[/Script/Engine.RendererSettings]:r.GraphicsAdapter=0** +**./CarlaUnreal.sh -carla-rpc-port=3000 -carla-primary-host=127.0.0.1 -ini:[/Script/Engine.RendererSettings]:r.GraphicsAdapter=0** Here, the secondary server will use port 3000 as the RPC server to avoid conflicts with other ports (but it will never be used), and will connect to the primary server located at IP 127.0.0.1 (localhost) in the default port (2002), and also this server will use the GPU device 0. If we want to start another secondary server in the same machine using another GPU, we could use this command: -**./CarlaUE4.sh -carla-rpc-port=4000 -carla-primary-host=127.0.0.1 -carla-primary-port=2002 -ini:[/Script/Engine.RendererSettings]:r.GraphicsAdapter=1** +**./CarlaUnreal.sh -carla-rpc-port=4000 -carla-primary-host=127.0.0.1 -carla-primary-port=2002 -ini:[/Script/Engine.RendererSettings]:r.GraphicsAdapter=1** This secondary server will use port 4000 as the RPC server to avoid conflicts with other ports and will connect to the primary server located at IP 127.0.0.1 in the port 2002, and also this server will use the GPU device 1. diff --git a/Docs/adv_opendrive.md b/Docs/adv_opendrive.md index eda1d1ef6..2debe0cb4 100644 --- a/Docs/adv_opendrive.md +++ b/Docs/adv_opendrive.md @@ -51,7 +51,7 @@ python3 config.py -x opendrive/TownBig.xodr __[client.generate_opendrive_world()](python_api.md#carla.Client.generate_opendrive_world)__ uses __content of the OpenDRIVE file parsed as string__. On the contrary, __`config.py`__ script needs __the path to the `.xodr` file__. !!! Note - If you experience the error `opendrive could not be correctly parsed`, ensure that there are write permissions on the `CarlaUE4/Content/Carla/Maps/OpenDrive/` directory. This is required by the server to parse the `xodr` file correctly. + If you experience the error `opendrive could not be correctly parsed`, ensure that there are write permissions on the `CarlaUnreal/Content/Carla/Maps/OpenDrive/` directory. This is required by the server to parse the `xodr` file correctly. --- ## Mesh generation diff --git a/Docs/adv_recorder.md b/Docs/adv_recorder.md index 8dbce237a..990c65ebc 100644 --- a/Docs/adv_recorder.md +++ b/Docs/adv_recorder.md @@ -29,7 +29,7 @@ The recorder file includes information regarding many different elements. * __Pedestrians__ — position and orientation, and linear and angular velocity. * __Lights__ — Light states from buildings, streets, and vehicles. -To start recording there is only need for a file name. Using `\`, `/` or `:` characters in the file name will define it as an absolute path. If no path is detailed, the file will be saved in `CarlaUE4/Saved`. +To start recording there is only need for a file name. Using `\`, `/` or `:` characters in the file name will define it as an absolute path. If no path is detailed, the file will be saved in `CarlaUnreal/Saved`. ```py client.start_recorder("/home/carla/recording01.log") diff --git a/Docs/adv_rendering_options.md b/Docs/adv_rendering_options.md index f547712d6..0c86c854c 100644 --- a/Docs/adv_rendering_options.md +++ b/Docs/adv_rendering_options.md @@ -31,13 +31,13 @@ The simulation runs significantly faster in __Low__ mode. This is helpful in sit The images below compare both modes. The flag used is the same for Windows and Linux. There is no equivalent option when working with the build, but the UE editor has its own quality settings. Go to `Settings/Engine Scalability Settings` for a greater customization of the desired quality. #### Epic mode -`./CarlaUE4.sh -quality-level=Epic` +`./CarlaUnreal.sh -quality-level=Epic` ![Epic mode screenshot](img/rendering_quality_epic.jpg) *Epic mode screenshot* #### Low mode -`./CarlaUE4.sh -quality-level=Low` +`./CarlaUnreal.sh -quality-level=Low` ![Low mode screenshot](img/rendering_quality_low.jpg) *Low mode screenshot* @@ -45,7 +45,7 @@ The images below compare both modes. The flag used is the same for Windows and L
!!! Important - The issue that made Epic mode show an abnormal whiteness has been fixed. If the problem persists, delete `GameUserSettings.ini`. It is saving previous settings, and will be generated again in the next run. __Ubuntu path:__ ` ~/.config/Epic/CarlaUE4/Saved/Config/LinuxNoEditor/` __Windows path:__ `\WindowsNoEditor\CarlaUE4\Saved\Config\WindowsNoEditor\` + The issue that made Epic mode show an abnormal whiteness has been fixed. If the problem persists, delete `GameUserSettings.ini`. It is saving previous settings, and will be generated again in the next run. __Ubuntu path:__ ` ~/.config/Epic/CarlaUnreal/Saved/Config/LinuxNoEditor/` __Windows path:__ `\WindowsNoEditor\CarlaUnreal\Saved\Config\WindowsNoEditor\` --- ## No-rendering mode @@ -97,7 +97,7 @@ It is important to understand the distinction between __no-rendering mode__ and To start CARLA in off-screen mode, run the following command: ```sh -./CarlaUE4.sh -RenderOffScreen +./CarlaUnreal.sh -RenderOffScreen ``` ### Setting off-screen mode (Versions prior to 0.9.12) @@ -108,7 +108,7 @@ __Using OpenGL__, you can run in off-screen mode in Linux by running the followi ```sh # Linux -DISPLAY= ./CarlaUE4.sh -opengl +DISPLAY= ./CarlaUnreal.sh -opengl ``` __Vulkan__ requires extra steps because it needs to communicate to the display X server using the X11 network protocol to work properly. The following steps will guide you on how to set up an Ubuntu 18.04 machine without a display so that CARLA can run with Vulkan. @@ -152,7 +152,7 @@ sudo X :0 & __7. Run CARLA:__ ```sh -DISPLAY=:0.GPU ./CarlaUE4.sh -vulkan +DISPLAY=:0.GPU ./CarlaUnreal.sh -vulkan ``` CARLA provides a Dockerfile that performs all the above steps [here](https://github.com/carla-simulator/carla/blob/0.9.12/Util/Docker/Release.Dockerfile). diff --git a/Docs/adv_sumo.md b/Docs/adv_sumo.md index e045191da..d78f433f2 100644 --- a/Docs/adv_sumo.md +++ b/Docs/adv_sumo.md @@ -25,7 +25,7 @@ SUMO is ready to run the co-simulations. There are some examples in `Co-Simulati Run a CARLA simulation with __Town04__. ```sh cd ~/carla -./CarlaUE4.sh +./CarlaUnreal.sh cd PythonAPI/util python3 config.py --map Town04 ``` diff --git a/Docs/adv_traffic_manager.md b/Docs/adv_traffic_manager.md index a5b93df50..1a3c8382e 100644 --- a/Docs/adv_traffic_manager.md +++ b/Docs/adv_traffic_manager.md @@ -458,7 +458,7 @@ The CARLA server keeps a register of all TM instances by storing the port and th In a multi-client simulation, multiple TMs are created on the same port. The first TM will be a TM-Server and the rest will be TM-Clients connecting to it. The TM-Server will dictate the behavior of all the TM instances: ```py -terminal 1: ./CarlaUE4.sh -carla-rpc-port=4000 +terminal 1: ./CarlaUnreal.sh -carla-rpc-port=4000 terminal 2: python3 generate_traffic.py --port 4000 --tm-port 4050 # TM-Server terminal 3: python3 generate_traffic.py --port 4000 --tm-port 4050 # TM-Client ``` @@ -468,7 +468,7 @@ terminal 3: python3 generate_traffic.py --port 4000 --tm-port 4050 # TM-Client In a multi-TM simulation, multiple TM instances are created on distinct ports. Each TM instance will control its own behavior: ```py -terminal 1: ./CarlaUE4.sh -carla-rpc-port=4000 +terminal 1: ./CarlaUnreal.sh -carla-rpc-port=4000 terminal 2: python3 generate_traffic.py --port 4000 --tm-port 4050 # TM-Server A terminal 3: python3 generate_traffic.py --port 4000 --tm-port 4550 # TM-Server B ``` @@ -478,8 +478,8 @@ terminal 3: python3 generate_traffic.py --port 4000 --tm-port 4550 # TM-Server B Multi-simulation is when more than one CARLA server is running at the same time. The TM needs to connect to the relevant CARLA server port. As long as the computational power allows for it, the TM can run multiple simulations at a time without any problems: ```py -terminal 1: ./CarlaUE4.sh -carla-rpc-port=4000 # simulation A -terminal 2: ./CarlaUE4.sh -carla-rpc-port=5000 # simulation B +terminal 1: ./CarlaUnreal.sh -carla-rpc-port=4000 # simulation A +terminal 2: ./CarlaUnreal.sh -carla-rpc-port=5000 # simulation B terminal 3: python3 generate_traffic.py --port 4000 --tm-port 4050 # TM-Server A connected to simulation A terminal 4: python3 generate_traffic.py --port 5000 --tm-port 5050 # TM-Server B connected to simulation B ``` diff --git a/Docs/build_docker.md b/Docs/build_docker.md index a276f724a..087becc10 100644 --- a/Docs/build_docker.md +++ b/Docs/build_docker.md @@ -51,13 +51,13 @@ __CARLA 0.9.12__ To run CARLA with a display: ``` -sudo docker run --privileged --gpus all --net=host -e DISPLAY=$DISPLAY carlasim/carla:0.9.12 /bin/bash ./CarlaUE4.sh +sudo docker run --privileged --gpus all --net=host -e DISPLAY=$DISPLAY carlasim/carla:0.9.12 /bin/bash ./CarlaUnreal.sh ``` To run CARLA in off-screen mode: ``` -sudo docker run --privileged --gpus all --net=host -v /tmp/.X11-unix:/tmp/.X11-unix:rw carlasim/carla:0.9.12 /bin/bash ./CarlaUE4.sh -RenderOffScreen +sudo docker run --privileged --gpus all --net=host -v /tmp/.X11-unix:/tmp/.X11-unix:rw carlasim/carla:0.9.12 /bin/bash ./CarlaUnreal.sh -RenderOffScreen ``` __CARLA 0.9.7 to 0.9.11__ @@ -65,7 +65,7 @@ __CARLA 0.9.7 to 0.9.11__ To run CARLA using Vulkan: ```sh -sudo docker run --privileged --gpus all --net=host -e DISPLAY=$DISPLAY -e SDL_VIDEODRIVER=x11 -v /tmp/.X11-unix:/tmp/.X11-unix:rw carlasim/carla:0.9.11 /bin/bash ./CarlaUE4.sh -vulkan <-additonal-carla-flags> +sudo docker run --privileged --gpus all --net=host -e DISPLAY=$DISPLAY -e SDL_VIDEODRIVER=x11 -v /tmp/.X11-unix:/tmp/.X11-unix:rw carlasim/carla:0.9.11 /bin/bash ./CarlaUnreal.sh -vulkan <-additonal-carla-flags> ``` !!! Note @@ -74,7 +74,7 @@ sudo docker run --privileged --gpus all --net=host -e DISPLAY=$DISPLAY -e SDL_VI To run CARLA using OpenGL: ```sh -docker run -e DISPLAY=$DISPLAY --net=host --gpus all --runtime=nvidia carlasim/carla: /bin/bash CarlaUE4.sh -opengl <-additonal-carla-flags> +docker run -e DISPLAY=$DISPLAY --net=host --gpus all --runtime=nvidia carlasim/carla: /bin/bash CarlaUnreal.sh -opengl <-additonal-carla-flags> ``` __3. (Optional) Configure Docker flags.__ diff --git a/Docs/build_faq.md b/Docs/build_faq.md index 27ce114dc..042b27f45 100644 --- a/Docs/build_faq.md +++ b/Docs/build_faq.md @@ -20,7 +20,7 @@ CARLA forum ## Linux build -* ["CarlaUE4.sh" script does not appear when downloading from GitHub.](#carlaue4sh-script-does-not-appear-when-downloading-from-github) +* ["CarlaUnreal.sh" script does not appear when downloading from GitHub.](#carlaue4sh-script-does-not-appear-when-downloading-from-github) * ["make launch" is not working on Linux.](#make-launch-is-not-working-on-linux) * [Cloning the Unreal Engine repository shows an error.](#cloning-the-unreal-engine-repository-shows-an-error) * [AttributeError: module 'carla' has no attribute 'Client' when running a script.](#attributeerror-module-carla-has-no-attribute-client-when-running-a-script) @@ -30,8 +30,8 @@ CARLA forum ## Windows build -* ["CarlaUE4.exe" does not appear when downloading from GitHub.](#carlaue4exe-does-not-appear-when-downloading-from-github) -* [CarlaUE4 could not be compiled. Try rebuilding it from source manually.](#carlaue4-could-not-be-compiled-try-rebuilding-it-from-source-manually) +* ["CarlaUnreal.exe" does not appear when downloading from GitHub.](#carlaue4exe-does-not-appear-when-downloading-from-github) +* [CarlaUnreal could not be compiled. Try rebuilding it from source manually.](#carlaue4-could-not-be-compiled-try-rebuilding-it-from-source-manually) * [CMake error shows even though CMake is properly installed.](#cmake-error-shows-even-though-cmake-is-properly-installed) * [Error C2440, C2672: compiler version.](#error-c2440-c2672-compiler-version) * ["make launch" is not working on Windows.](#make-launch-is-not-working-on-windows) @@ -82,11 +82,11 @@ CARLA forum ## Linux build -###### "CarlaUE4.sh" script does not appear when downloading from GitHub. +###### "CarlaUnreal.sh" script does not appear when downloading from GitHub. -> There is no `CarlaUE4.sh` script in the source version of CARLA. Follow the [build instructions](build_linux.md) to build CARLA from source. +> There is no `CarlaUnreal.sh` script in the source version of CARLA. Follow the [build instructions](build_linux.md) to build CARLA from source. > -> To run CARLA using `CarlaUE4.sh`, follow the [quick start installation](start_quickstart.md). +> To run CARLA using `CarlaUnreal.sh`, follow the [quick start installation](start_quickstart.md). @@ -196,17 +196,17 @@ CARLA forum ## Windows build -###### "CarlaUE4.exe" does not appear when downloading from GitHub. +###### "CarlaUnreal.exe" does not appear when downloading from GitHub. -> There is no `CarlaUE4.exe` executable in the source version of CARLA. Follow the [build instructions](build_windows.md) to build CARLA from source. To directly get the `CarlaUE4.exe`, follow the [quick start instructions](start_quickstart.md). +> There is no `CarlaUnreal.exe` executable in the source version of CARLA. Follow the [build instructions](build_windows.md) to build CARLA from source. To directly get the `CarlaUnreal.exe`, follow the [quick start instructions](start_quickstart.md). -###### CarlaUE4 could not be compiled. Try rebuilding it from source manually. +###### CarlaUnreal could not be compiled. Try rebuilding it from source manually. > Something went wrong when trying to build CARLA. Rebuild using Visual Studio to discover what happened. > -> __1.__ Go to `carla/Unreal/CarlaUE4` and right-click the `CarlaUE4.uproject`. +> __1.__ Go to `carla/Unreal/CarlaUnreal` and right-click the `CarlaUnreal.uproject`. > __2.__ Click on __Generate Visual Studio project files__. > __3.__ Open the file generated with Visual Studio 2019. > __4.__ Compile the project with Visual Studio. The shortcut is F7. The build will fail, but the issues found will be shown below. @@ -394,7 +394,7 @@ CARLA forum > In Linux, run `make package` in the project folder. The package will include the project, and the Python API modules. > -> Alternatively, it is possible to compile a binary version of CARLA within Unreal Editor. Open the CarlaUE4 project, go to the menu `File/Package Project`, and select a platform. This may take a while. +> Alternatively, it is possible to compile a binary version of CARLA within Unreal Editor. Open the CarlaUnreal project, go to the menu `File/Package Project`, and select a platform. This may take a while. diff --git a/Docs/build_linux.md b/Docs/build_linux.md index 611f0cd2d..6eb91fe2d 100644 --- a/Docs/build_linux.md +++ b/Docs/build_linux.md @@ -191,11 +191,11 @@ The assets will be downloaded and extracted to the appropriate location. To download the assets for a __specific version__ of CARLA: 1. From the root CARLA directory, navigate to `/Util/ContentVersions.txt`. This document contains the links to the assets for all CARLA releases. -2. Extract the assets in `Unreal\CarlaUE4\Content\Carla`. If the path doesn't exist, create it. +2. Extract the assets in `Unreal\CarlaUnreal\Content\Carla`. If the path doesn't exist, create it. 3. Extract the file with a command similar to the following: ```sh - tar -xvzf .tar.gz.tar -C /path/to/carla/Unreal/CarlaUE4/Content/Carla + tar -xvzf .tar.gz.tar -C /path/to/carla/Unreal/CarlaUnreal/Content/Carla ``` ### Set Unreal Engine environment variable diff --git a/Docs/build_system.md b/Docs/build_system.md index af4e68a77..c12135bdf 100644 --- a/Docs/build_system.md +++ b/Docs/build_system.md @@ -58,7 +58,7 @@ Two configurations: --- -## CarlaUE4 and Carla plugin +## CarlaUnreal and Carla plugin Both compiled at the same step with Unreal Engine build tool. They require the `UE4_ROOT` environment variable set. diff --git a/Docs/build_update.md b/Docs/build_update.md index eb5432934..6bbe1a492 100644 --- a/Docs/build_update.md +++ b/Docs/build_update.md @@ -41,16 +41,16 @@ git pull origin master git checkout master make clean git pull origin master -# Erase the content in `Unreal\CarlaUE4\Content\Carla`. +# Erase the content in `Unreal\CarlaUnreal\Content\Carla`. # Go to `\Util\ContentVersions.txt`. # Download the latest content. -# Extract the new content in `Unreal\CarlaUE4\Content\Carla`. +# Extract the new content in `Unreal\CarlaUnreal\Content\Carla`. # Get development assets. # Delete the `/Carla` folder containing previous assets. # Go to the main carla folder. -git clone https://bitbucket.org/carla-simulator/carla-content Unreal/CarlaUE4/Content/Carla +git clone https://bitbucket.org/carla-simulator/carla-content Unreal/CarlaUnreal/Content/Carla ``` @@ -122,10 +122,10 @@ __Linux.__ __Windows.__ -__1.__ Erase the previous content in `Unreal\CarlaUE4\Content\Carla`. +__1.__ Erase the previous content in `Unreal\CarlaUnreal\Content\Carla`. __2.__ Go to `\Util\ContentVersions.txt`. __3.__ Download the content for `latest`. -__4.__ Extract the new content in `Unreal\CarlaUE4\Content\Carla`. +__4.__ Extract the new content in `Unreal\CarlaUnreal\Content\Carla`. !!! Note In order to work with that the CARLA team is devleoping, go to __get development assets__ below. @@ -148,7 +148,7 @@ In order to handle this repository it is advisted to install [git-lfs][gitlfslin To clone the repository, __go to the main CARLA directory__ and run the following command. ```sh -git clone https://bitbucket.org/carla-simulator/carla-content Unreal/CarlaUE4/Content/Carla +git clone https://bitbucket.org/carla-simulator/carla-content Unreal/CarlaUnreal/Content/Carla ``` !!! Warning diff --git a/Docs/build_windows.md b/Docs/build_windows.md index 627e1982c..94038b6fe 100644 --- a/Docs/build_windows.md +++ b/Docs/build_windows.md @@ -153,16 +153,16 @@ Download the __latest__ assets to work with the current version of CARLA by runn Update.bat ``` -The assets will be downloaded and extracted to the appropriate location if have 7zip installed. If you do not have this software installed, you will need to manually extract the file contents to `Unreal\CarlaUE4\Content\Carla`. +The assets will be downloaded and extracted to the appropriate location if have 7zip installed. If you do not have this software installed, you will need to manually extract the file contents to `Unreal\CarlaUnreal\Content\Carla`. To download the assets for a __specific version__ of CARLA: 1. From the root CARLA directory, navigate to `\Util\ContentVersions.txt`. This document contains the links to the assets for all CARLA releases. -2. Extract the assets in `Unreal\CarlaUE4\Content\Carla`. If the path doesn't exist, create it. +2. Extract the assets in `Unreal\CarlaUnreal\Content\Carla`. If the path doesn't exist, create it. 3. Extract the file with a command similar to the following: ```sh - tar -xvzf .tar.gz.tar -C C:\path\to\carla\Unreal\CarlaUE4\Content\Carla + tar -xvzf .tar.gz.tar -C C:\path\to\carla\Unreal\CarlaUnreal\Content\Carla ``` ### Set Unreal Engine environment variable diff --git a/Docs/cont_coding_standard.md b/Docs/cont_coding_standard.md index 5c6e04d1f..bcaada63f 100644 --- a/Docs/cont_coding_standard.md +++ b/Docs/cont_coding_standard.md @@ -31,7 +31,7 @@ * Compilation should not give any error or warning (`clang++-8 -Wall -Wextra -std=C++14 -Wno-missing-braces`). * The use of `throw` is forbidden, use `carla::throw_exception` instead. - * Unreal C++ code (CarlaUE4 and Carla plugin) follow the + * Unreal C++ code (CarlaUnreal and Carla plugin) follow the [Unreal Engine's Coding Standard][ue4link] with the exception of using spaces instead of tabs. * LibCarla uses a variation of [Google's style guide][googlelink]. diff --git a/Docs/content_authoring_large_maps.md b/Docs/content_authoring_large_maps.md index d54d1cf6b..b5950daf7 100644 --- a/Docs/content_authoring_large_maps.md +++ b/Docs/content_authoring_large_maps.md @@ -194,7 +194,7 @@ make import ARGS="--package=" make import ARGS="--no-carla-materials" ``` -All files will be imported and prepared to be used in the Unreal Editor. The map package will be created in `Unreal/CarlaUE4/Content`. A base map tile, ``, will be created as a streaming level for all the tiles. The base tile will contain the sky, weather, and Large Map actors and will be ready for use in a simulation. +All files will be imported and prepared to be used in the Unreal Editor. The map package will be created in `Unreal/CarlaUnreal/Content`. A base map tile, ``, will be created as a streaming level for all the tiles. The base tile will contain the sky, weather, and Large Map actors and will be ready for use in a simulation. !!! Note It is currently not recommended to use the customization tools provided for standard maps in the Unreal Editor, e.g., road painter, procedural buildings, etc. diff --git a/Docs/foundations.md b/Docs/foundations.md index becc5ba69..72011a466 100644 --- a/Docs/foundations.md +++ b/Docs/foundations.md @@ -159,7 +159,7 @@ The recorder file includes information regarding many different elements. ### Recording -To start recording there is only need for a file name. Using `\`, `/` or `:` characters in the file name will define it as an absolute path. If no path is detailed, the file will be saved in `CarlaUE4/Saved`. +To start recording there is only need for a file name. Using `\`, `/` or `:` characters in the file name will define it as an absolute path. If no path is detailed, the file will be saved in `CarlaUnreal/Saved`. ```py client.start_recorder("/home/carla/recording01.log") @@ -210,13 +210,13 @@ The recorder saves all of the data in a custom binary file format specified in [ CARLA offers a number of options regarding rendering quality and efficiency. At the most basic level, CARLA offers two quality options to enable operation on both high and low spec hardware with the best results: ### Epic mode -`./CarlaUE4.sh -quality-level=Epic` +`./CarlaUnreal.sh -quality-level=Epic` ![Epic mode screenshot](img/rendering_quality_epic.jpg) *Epic mode screenshot* ### Low mode -`./CarlaUE4.sh -quality-level=Low` +`./CarlaUnreal.sh -quality-level=Low` ![Low mode screenshot](img/rendering_quality_low.jpg) *Low mode screenshot* diff --git a/Docs/large_map_import.md b/Docs/large_map_import.md index 22687e43b..40cd73739 100644 --- a/Docs/large_map_import.md +++ b/Docs/large_map_import.md @@ -119,7 +119,7 @@ make import ARGS="--package=" make import ARGS="--no-carla-materials" ``` -All files will be imported and prepared to be used in the Unreal Editor. The map package will be created in `Unreal/CarlaUE4/Content`. A base map tile, ``, will be created as a streaming level for all the tiles. The base tile will contain the sky, weather, and large map actors and will be ready for use in a simulation. +All files will be imported and prepared to be used in the Unreal Editor. The map package will be created in `Unreal/CarlaUnreal/Content`. A base map tile, ``, will be created as a streaming level for all the tiles. The base tile will contain the sky, weather, and large map actors and will be ready for use in a simulation. !!! Note It is currently not recommended to use the customization tools provided for standard maps in the Unreal Editor, e.g., road painter, procedural buildings, etc. diff --git a/Docs/plugins_carlaviz.md b/Docs/plugins_carlaviz.md index 36dcb06a7..836bcf36b 100644 --- a/Docs/plugins_carlaviz.md +++ b/Docs/plugins_carlaviz.md @@ -63,7 +63,7 @@ CARLA up to 0.9.9 (included) is set to be single-stream. For later versions, mul __1. Run CARLA.__ -* __a) In a CARLA package__ — Go to the CARLA folder and start the simulation with `CarlaUE4.exe` (Windows) or `./CarlaUE4.sh` (Linux). +* __a) In a CARLA package__ — Go to the CARLA folder and start the simulation with `CarlaUnreal.exe` (Windows) or `./CarlaUnreal.sh` (Linux). * __b) In a build from source__ — Go to the CARLA folder, run the UE editor with `make launch` and press `Play`. diff --git a/Docs/python_api.md b/Docs/python_api.md index 31d387b71..72f6725fc 100644 --- a/Docs/python_api.md +++ b/Docs/python_api.md @@ -533,10 +533,10 @@ The information saved by the recorder will be parsed and shown in your terminal - **start_recorder**(**self**, **filename**, **additional_data**=False) Enables the recording feature, which will start saving every information possible needed by the server to replay the simulation. - **Parameters:** - - `filename` (_str_) - Name of the file to write the recorded data. A simple name will save the recording in 'CarlaUE4/Saved/recording.log'. Otherwise, if some folder appears in the name, it will be considered an absolute path. + - `filename` (_str_) - Name of the file to write the recorded data. A simple name will save the recording in 'CarlaUnreal/Saved/recording.log'. Otherwise, if some folder appears in the name, it will be considered an absolute path. - `additional_data` (_bool_) - Enables or disable recording non-essential data for reproducing the simulation (bounding box location, physics control parameters, etc). - **stop_recorder**(**self**) -Stops the recording in progress. If you specified a path in `filename`, the recording will be there. If not, look inside `CarlaUE4/Saved/`. +Stops the recording in progress. If you specified a path in `filename`, the recording will be there. If not, look inside `CarlaUnreal/Saved/`. - **stop_replayer**(**self**, **keep_actors**) Stop current replayer. - **Parameters:** diff --git a/Docs/ref_cpp.md b/Docs/ref_cpp.md index 075b97a7d..a8778cefa 100644 --- a/Docs/ref_cpp.md +++ b/Docs/ref_cpp.md @@ -2,8 +2,8 @@ We use Doxygen to generate the documentation of our C++ code: [Libcarla/Source](http://carla.org/Doxygen/html/dir_b9166249188ce33115fd7d5eed1849f2.html)
-[Unreal/CarlaUE4/Source](http://carla.org/Doxygen/html/dir_733e9da672a36443d0957f83d26e7dbf.html)
-[Unreal/CarlaUE4/Carla/Plugins](http://carla.org/Doxygen/html/dir_8fc34afb5f07a67966c78bf5319f94ae.html) +[Unreal/CarlaUnreal/Source](http://carla.org/Doxygen/html/dir_733e9da672a36443d0957f83d26e7dbf.html)
+[Unreal/CarlaUnreal/Carla/Plugins](http://carla.org/Doxygen/html/dir_8fc34afb5f07a67966c78bf5319f94ae.html) The generated documentation is available at this link **** diff --git a/Docs/ref_sensors.md b/Docs/ref_sensors.md index 5e28d05c5..4ae656478 100644 --- a/Docs/ref_sensors.md +++ b/Docs/ref_sensors.md @@ -699,7 +699,7 @@ __2.__ Run the simulation using `python3 config.py --fps=10`. * __Output:__ [carla.Image](python_api.md#carla.Image) per step (unless `sensor_tick` says otherwise). This camera classifies every object in sight by displaying it in a different color according to its tags (e.g., pedestrians in a different color than vehicles). -When the simulation starts, every element in scene is created with a tag. So it happens when an actor is spawned. The objects are classified by their relative file path in the project. For example, meshes stored in `Unreal/CarlaUE4/Content/Static/Pedestrians` are tagged as `Pedestrian`. +When the simulation starts, every element in scene is created with a tag. So it happens when an actor is spawned. The objects are classified by their relative file path in the project. For example, meshes stored in `Unreal/CarlaUnreal/Content/Static/Pedestrians` are tagged as `Pedestrian`. ![ImageSemanticSegmentation](img/ref_sensors_semantic.jpg) @@ -750,7 +750,7 @@ The following tags are currently available: * __Output:__ [carla.Image](python_api.md#carla.Image) per step (unless `sensor_tick` says otherwise). This camera classifies every object in the field of view both by class and also by instance ID. -When the simulation starts, every element in scene is created with a tag. So it happens when an actor is spawned. The objects are classified by their relative file path in the project. For example, meshes stored in `Unreal/CarlaUE4/Content/Static/Pedestrians` are tagged as `Pedestrian`. +When the simulation starts, every element in scene is created with a tag. So it happens when an actor is spawned. The objects are classified by their relative file path in the project. For example, meshes stored in `Unreal/CarlaUnreal/Content/Static/Pedestrians` are tagged as `Pedestrian`. ![ImageInstanceSegmentation](img/instance_segmentation.png) diff --git a/Docs/release_readme.md b/Docs/release_readme.md index 5b715f1fa..b7f781a37 100644 --- a/Docs/release_readme.md +++ b/Docs/release_readme.md @@ -11,7 +11,7 @@ How to run CARLA Launch a terminal in this folder and execute the simulator by running ```sh - ./CarlaUE4.sh + ./CarlaUnreal.sh ``` this will launch a window with a view over the city. This is the "spectator" diff --git a/Docs/start_quickstart.md b/Docs/start_quickstart.md index 0b0c59e68..1896c6bba 100644 --- a/Docs/start_quickstart.md +++ b/Docs/start_quickstart.md @@ -192,7 +192,7 @@ The method to start a CARLA server depends on the installation method you used a ```sh cd /opt/carla-simulator/bin/ - ./CarlaUE4.sh + ./CarlaUnreal.sh ``` - Linux package installation: @@ -200,7 +200,7 @@ The method to start a CARLA server depends on the installation method you used a ```sh cd path/to/carla/root - ./CarlaUE4.sh + ./CarlaUnreal.sh ``` - Windows package installation: @@ -208,7 +208,7 @@ The method to start a CARLA server depends on the installation method you used a ```sh cd path/to/carla/root - CarlaUE4.exe + CarlaUnreal.exe ``` A window containing a view over the city will pop up. This is the _spectator view_. To fly around the city use the mouse and `WASD` keys, holding down the right mouse button to control the direction. @@ -234,7 +234,7 @@ This is the server simulator which is now running and waiting for a client to co There are some configuration options available when launching CARLA and they can be used as follows: ```sh - ./CarlaUE4.sh -carla-rpc-port=3000 + ./CarlaUnreal.sh -carla-rpc-port=3000 ``` * `-carla-rpc-port=N` Listen for client connections at port `N`. Streaming port is set to `N+1` by default. diff --git a/Docs/tuto_D_create_semantic_tags.md b/Docs/tuto_D_create_semantic_tags.md index e1543459b..6a57b2eb2 100644 --- a/Docs/tuto_D_create_semantic_tags.md +++ b/Docs/tuto_D_create_semantic_tags.md @@ -34,7 +34,7 @@ __Open the Unreal Engine Editor__ and go to `Carla/Static`. Create a new folder ### 3. Create two-way correspondence between UE and the code tag -__3.1. Open `Tagger.cpp`__ in `Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game`. Go to __`GetLabelByFolderName`__ Add the your tag by the end of the list. The string being compared is the name of the UE folder used in [__2.__](#2-create-the-ue-folder-for-assets), so use the exact same name here. +__3.1. Open `Tagger.cpp`__ in `Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game`. Go to __`GetLabelByFolderName`__ Add the your tag by the end of the list. The string being compared is the name of the UE folder used in [__2.__](#2-create-the-ue-folder-for-assets), so use the exact same name here. ![tagger_cpp](img/tuto_D_create_semantic_tags/03_tagger_cpp.jpg) diff --git a/Docs/tuto_D_create_sensor.md b/Docs/tuto_D_create_sensor.md index f258ccfb9..4ff77dd9f 100644 --- a/Docs/tuto_D_create_sensor.md +++ b/Docs/tuto_D_create_sensor.md @@ -104,8 +104,8 @@ Let's start. This class has to be located inside Carla plugin, we'll create two files for our new C++ class - * `Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SafeDistanceSensor.h` - * `Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SafeDistanceSensor.cpp` + * `Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/SafeDistanceSensor.h` + * `Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Sensor/SafeDistanceSensor.cpp` At the very minimum, the sensor is required to inherit `ASensor`, and provide a static method `GetSensorDefinition`; but we'll be overriding also the `Set`, diff --git a/Docs/tuto_G_retrieve_data.md b/Docs/tuto_G_retrieve_data.md index 4a3c3427e..bb38021a4 100644 --- a/Docs/tuto_G_retrieve_data.md +++ b/Docs/tuto_G_retrieve_data.md @@ -476,7 +476,7 @@ depth_cam.listen(lambda image: image.save_to_disk('tutorial/new_depth_output/%.6 ### Semantic segmentation camera -The [semantic segmentation camera](ref_sensors.md#semantic-segmentation-camera) renders elements in scene with a different color depending on how these have been tagged. The tags are created by the simulator depending on the path of the asset used for spawning. For example, meshes tagged as `Pedestrians` are spawned with content stored in `Unreal/CarlaUE4/Content/Static/Pedestrians`. +The [semantic segmentation camera](ref_sensors.md#semantic-segmentation-camera) renders elements in scene with a different color depending on how these have been tagged. The tags are created by the simulator depending on the path of the asset used for spawning. For example, meshes tagged as `Pedestrians` are spawned with content stored in `Unreal/CarlaUnreal/Content/Static/Pedestrians`. The output is an image, as any camera, but each pixel contains the tag encoded in the red channel. This original image must be converted using __ColorConverter.CityScapesPalette__. New tags can be created, read more in the [documentation](ref_sensors.md#semantic-segmentation-camera). @@ -682,7 +682,7 @@ python3 no_rendering_mode.py --no-rendering ### Start recording -The [__recorder__](adv_recorder.md) can be started at anytime. The script does it at the very beginning, in order to capture everything, including the spawning of the first actors. If no path is detailed, the log will be saved into `CarlaUE4/Saved`. +The [__recorder__](adv_recorder.md) can be started at anytime. The script does it at the very beginning, in order to capture everything, including the spawning of the first actors. If no path is detailed, the log will be saved into `CarlaUnreal/Saved`. ```py # -------------- @@ -737,7 +737,7 @@ So far, a simulation has been recorded. Now, it is time to examine the recording It is time to run a new simulation. ```sh -./CarlaUE4.sh +./CarlaUnreal.sh ``` To reenact the simulation, [choose a fragment](#choose-a-fragment) and run the script containing the code for the playback. diff --git a/Docs/tuto_M_add_map_alternative.md b/Docs/tuto_M_add_map_alternative.md index 64faa7fd9..839720d18 100644 --- a/Docs/tuto_M_add_map_alternative.md +++ b/Docs/tuto_M_add_map_alternative.md @@ -15,12 +15,12 @@ The RoadRunner software from MathWorks provides plugins for Unreal Engine to hel __1.__ The plugins are available for download from the [MathWorks website](https://www.mathworks.com/help/roadrunner/ug/Downloading-Plugins.html). MathWorks also has a [full tutorial](https://www.mathworks.com/help/roadrunner/ug/Exporting-to-CARLA.html), similar to this one, on how to import maps to CARLA using the plugins. -__2.__ Extract the contents of the downloaded folder and move the folders `RoadRunnerImporter`, `RoadRunnerCarlaIntegration` and `RoadRunnerMaterials` to `/Unreal/CarlaUE4/Plugins/`. +__2.__ Extract the contents of the downloaded folder and move the folders `RoadRunnerImporter`, `RoadRunnerCarlaIntegration` and `RoadRunnerMaterials` to `/Unreal/CarlaUnreal/Plugins/`. __3.__ Rebuild the plugin following the instructions below: * __On Windows.__ - * Right-click the `.uproject` file in `/Unreal/CarlaUE4` and select `Generate Visual Studio project files`. + * Right-click the `.uproject` file in `/Unreal/CarlaUnreal` and select `Generate Visual Studio project files`. * In the root folder of CARLA, run the command: ```sh @@ -30,7 +30,7 @@ make launch * __On Linux.__ * Run the following command: ```sh -UE4_ROOT/GenerateProjectFiles.sh -project="carla/Unreal/CarlaUE4/CarlaUE4.uproject" -game -engine +UE4_ROOT/GenerateProjectFiles.sh -project="carla/Unreal/CarlaUnreal/CarlaUnreal.uproject" -game -engine ``` __4.__ In the Unreal Engine window, make sure the checkbox is selected for both plugins `Edit > Plugins`. @@ -67,7 +67,7 @@ This method of importing maps can be used with generic `.fbx` and `.xodr` files. To import a map manually to Unreal Engine: -__1.__ In your system's file explorer, copy the `.xodr` file to `/Unreal/CarlaUE4/Content/Carla/Maps/OpenDrive`. +__1.__ In your system's file explorer, copy the `.xodr` file to `/Unreal/CarlaUnreal/Content/Carla/Maps/OpenDrive`. __2.__ Open the Unreal Engine editor by running `make launch` in the carla root directory. In the _Content Browser_ of the editor, navigate to `Content/Carla/Maps/BaseMap` and duplicate the `BaseMap`. This will provide a blank map with the default sky and lighting objects. @@ -145,7 +145,7 @@ __14.__ In the _Modes_ panel, search for the __Open Drive Actor__ and drag it in >>![ue_opendrive_actor](../img/ue_opendrive_actor.jpg) -__15.__ In the _Details_ panel, check `Add Spawners` and then click on the box beside `Generate Routes`. This will find the `.xodr` file with the same map name in the `/Unreal/CarlaUE4/Content/Carla/Maps/OpenDrive` directory and use it to generate a series of _RoutePlanner_ and _VehicleSpawnPoint_ actors. +__15.__ In the _Details_ panel, check `Add Spawners` and then click on the box beside `Generate Routes`. This will find the `.xodr` file with the same map name in the `/Unreal/CarlaUnreal/Content/Carla/Maps/OpenDrive` directory and use it to generate a series of _RoutePlanner_ and _VehicleSpawnPoint_ actors. >>![ue_generate_routes](../img/ue_generate_routes.png) diff --git a/Docs/tuto_M_add_map_source.md b/Docs/tuto_M_add_map_source.md index 768b553d0..b0422859a 100644 --- a/Docs/tuto_M_add_map_source.md +++ b/Docs/tuto_M_add_map_source.md @@ -47,7 +47,7 @@ make import ARGS="--package=" make import ARGS="--no-carla-materials" ``` -A folder will be created in `Unreal/CarlaUE4/Content` with the name of your map package. It will contain config files, overdrive information, static asset information and navigation information. +A folder will be created in `Unreal/CarlaUnreal/Content` with the name of your map package. It will contain config files, overdrive information, static asset information and navigation information. --- diff --git a/Docs/tuto_M_generate_pedestrian_navigation.md b/Docs/tuto_M_generate_pedestrian_navigation.md index 44c965733..e8d4db534 100644 --- a/Docs/tuto_M_generate_pedestrian_navigation.md +++ b/Docs/tuto_M_generate_pedestrian_navigation.md @@ -59,7 +59,7 @@ __2.__ Double check your mesh names. Mesh names should start with any of the app ![ue_meshes](../img/ue_meshes.jpg) -__3.__ Press `ctrl + A` to select everything and export the map by selecting `File` -> `Carla Exporter`. A `.obj` file will be created in `Unreal/CarlaUE4/Saved`. +__3.__ Press `ctrl + A` to select everything and export the map by selecting `File` -> `Carla Exporter`. A `.obj` file will be created in `Unreal/CarlaUnreal/Saved`. __4.__ Move the `.obj` and the `.xodr` to `Util/DockerUtils/dist`. diff --git a/Docs/tuto_first_steps.md b/Docs/tuto_first_steps.md index 0493dc6c4..dd98ba3c3 100644 --- a/Docs/tuto_first_steps.md +++ b/Docs/tuto_first_steps.md @@ -23,7 +23,7 @@ CARLA can be launched using the command line using the executable in Windows or ```sh cd /carla/root -./CarlaUE4.sh +./CarlaUnreal.sh ``` To manipulate CARLA through the Python API, we need to connect the Python client to the server through an open port. The client controls the simulator through the [__client and world objects__](foundations.md#world-and-client) Open a Python notebook or create a new script, then add the following code to the start of the script or the main function: diff --git a/Doxyfile b/Doxyfile index 171552cee..233de15bb 100644 --- a/Doxyfile +++ b/Doxyfile @@ -11,7 +11,7 @@ CASE_SENSE_NAMES = YES SORT_BRIEF_DOCS = YES WARN_IF_UNDOCUMENTED = NO WARN_LOGFILE = Doxygen/warnings.log -INPUT = Unreal/CarlaUE4/Source Unreal/CarlaUE4/Plugins/Carla/Source LibCarla/source +INPUT = Unreal/CarlaUnreal/Source Unreal/CarlaUnreal/Plugins/Carla/Source LibCarla/source FILE_PATTERNS = *.cpp *.h *.hpp *.cc EXCLUDE = LibCarla/source/carla/Version.h RECURSIVE = YES @@ -27,7 +27,7 @@ FORMULA_FONTSIZE = 12 GENERATE_LATEX = NO MACRO_EXPANSION = YES EXPAND_ONLY_PREDEF = YES -INCLUDE_PATH = Unreal/CarlaUE4/Source Unreal/CarlaUE4/Plugins/Carla/Source LibCarla/source +INCLUDE_PATH = Unreal/CarlaUnreal/Source Unreal/CarlaUnreal/Plugins/Carla/Source LibCarla/source INCLUDE_FILE_PATTERNS = *.h *.hpp HIDE_UNDOC_RELATIONS = NO HAVE_DOT = YES diff --git a/Jenkinsfile b/Jenkinsfile index 04849a567..cf8b11457 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,7 +43,7 @@ pipeline { steps { - sh 'git update-index --skip-worktree Unreal/CarlaUE4/CarlaUE4.uproject' + sh 'git update-index --skip-worktree Unreal/CarlaUnreal/CarlaUnreal.uproject' sh 'make setup ARGS="--python-version=3.7,2 --target-wheel-platform=manylinux_2_27_x86_64 --chrono"' } } @@ -134,7 +134,7 @@ pipeline unstash name: 'ubuntu_examples' sh 'tar -xvzf Dist/CARLA*.tar.gz -C Dist/' // sh 'tar -xvzf Dist/AdditionalMaps*.tar.gz -C Dist/' - sh 'DISPLAY= ./Dist/CarlaUE4.sh -nullrhi -RenderOffScreen --carla-rpc-port=3654 --carla-streaming-port=0 -nosound > CarlaUE4.log &' + sh 'DISPLAY= ./Dist/CarlaUnreal.sh -nullrhi -RenderOffScreen --carla-rpc-port=3654 --carla-streaming-port=0 -nosound > CarlaUnreal.log &' sh 'make smoke_tests ARGS="--xml --python-version=3.7 --target-wheel-platform=manylinux_2_27_x86_64"' sh 'make run-examples ARGS="localhost 3654"' } @@ -142,7 +142,7 @@ pipeline { always { - archiveArtifacts 'CarlaUE4.log' + archiveArtifacts 'CarlaUnreal.log' junit 'Build/test-results/smoke-tests-*.xml' deleteDir() node('master') @@ -240,7 +240,7 @@ pipeline { bat """ call ../setEnv64.bat - git update-index --skip-worktree Unreal/CarlaUE4/CarlaUE4.uproject + git update-index --skip-worktree Unreal/CarlaUnreal/CarlaUnreal.uproject """ bat """ call ../setEnv64.bat diff --git a/LibCarla/source/carla/client/detail/Simulator.cpp b/LibCarla/source/carla/client/detail/Simulator.cpp index 9e0e2947a..958fe05e0 100644 --- a/LibCarla/source/carla/client/detail/Simulator.cpp +++ b/LibCarla/source/carla/client/detail/Simulator.cpp @@ -116,7 +116,7 @@ namespace detail { std::string opendrive, const rpc::OpendriveGenerationParameters & params, bool reset_settings) { // The "OpenDriveMap" is an ".umap" located in: - // "carla/Unreal/CarlaUE4/Content/Carla/Maps/" + // "carla/Unreal/CarlaUnreal/Content/Carla/Maps/" // It will load the last sended OpenDRIVE by client's "LoadOpenDriveEpisode()" constexpr auto custom_opendrive_map = "OpenDriveMap"; _client.CopyOpenDriveToServer(std::move(opendrive), params); diff --git a/PythonAPI/docs/client.yml b/PythonAPI/docs/client.yml index 71c076bee..86e2b3b01 100644 --- a/PythonAPI/docs/client.yml +++ b/PythonAPI/docs/client.yml @@ -223,7 +223,7 @@ - param_name: filename type: str doc: > - Name of the file to write the recorded data. A simple name will save the recording in 'CarlaUE4/Saved/recording.log'. Otherwise, if some folder appears in the name, it will be considered an absolute path. + Name of the file to write the recorded data. A simple name will save the recording in 'CarlaUnreal/Saved/recording.log'. Otherwise, if some folder appears in the name, it will be considered an absolute path. - param_name: additional_data type: bool default: False @@ -235,7 +235,7 @@ - def_name: stop_recorder params: doc: > - Stops the recording in progress. If you specified a path in `filename`, the recording will be there. If not, look inside `CarlaUE4/Saved/`. + Stops the recording in progress. If you specified a path in `filename`, the recording will be there. If not, look inside `CarlaUnreal/Saved/`. # -------------------------------------- - def_name: get_available_maps params: diff --git a/Unreal/CMakeLists.txt b/Unreal/CMakeLists.txt index 324b9014d..85f37034a 100644 --- a/Unreal/CMakeLists.txt +++ b/Unreal/CMakeLists.txt @@ -16,12 +16,12 @@ endif () set ( CARLA_UE_PATH - ${CARLA_WORKSPACE_PATH}/Unreal/CarlaUE4 + ${CARLA_WORKSPACE_PATH}/Unreal/CarlaUnreal ) set ( CARLA_UE_PROJECT_PATH - ${CARLA_UE_PATH}/CarlaUE4.uproject + ${CARLA_UE_PATH}/CarlaUnreal.uproject ) add_custom_target ( diff --git a/Unreal/CarlaUnreal/CarlaUE4.uproject b/Unreal/CarlaUnreal/CarlaUE4.uproject index 33d7e2a95..7a9310916 100644 --- a/Unreal/CarlaUnreal/CarlaUE4.uproject +++ b/Unreal/CarlaUnreal/CarlaUE4.uproject @@ -5,7 +5,7 @@ "Description": "", "Modules": [ { - "Name": "CarlaUE4", + "Name": "CarlaUnreal", "Type": "Runtime", "LoadingPhase": "Default", "AdditionalDependencies": [ diff --git a/Unreal/CarlaUnreal/Source/CarlaUE4.Target.cs b/Unreal/CarlaUnreal/Source/CarlaUE4.Target.cs index e76cae481..7d88f0427 100644 --- a/Unreal/CarlaUnreal/Source/CarlaUE4.Target.cs +++ b/Unreal/CarlaUnreal/Source/CarlaUE4.Target.cs @@ -23,7 +23,7 @@ public class CarlaUE4Target : TargetRules Type = TargetType.Game; - ExtraModuleNames.Add("CarlaUE4"); + ExtraModuleNames.Add("CarlaUnreal"); LogFlagStatus("Unity build", EnableUnityBuild); diff --git a/Unreal/CarlaUnreal/Source/CarlaUE4/CarlaUE4.Build.cs b/Unreal/CarlaUnreal/Source/CarlaUE4/CarlaUE4.Build.cs index e5418362b..9e06bfa95 100644 --- a/Unreal/CarlaUnreal/Source/CarlaUE4/CarlaUE4.Build.cs +++ b/Unreal/CarlaUnreal/Source/CarlaUE4/CarlaUE4.Build.cs @@ -4,7 +4,7 @@ using EpicGames.Core; using System; using UnrealBuildTool; -public class CarlaUE4 : ModuleRules +public class CarlaUnreal : ModuleRules { [CommandLine("-slate-ui")] bool EnableSlateUI = false; @@ -18,9 +18,9 @@ public class CarlaUE4 : ModuleRules Console.WriteLine(string.Format("{0} is {1}.", name, state)); } - public CarlaUE4(ReadOnlyTargetRules Target) : base(Target) + public CarlaUnreal(ReadOnlyTargetRules Target) : base(Target) { - PrivatePCHHeaderFile = "CarlaUE4.h"; + PrivatePCHHeaderFile = "CarlaUnreal.h"; PublicDependencyModuleNames.AddRange(new string[] { diff --git a/Unreal/CarlaUnreal/Source/CarlaUE4/CarlaUE4.cpp b/Unreal/CarlaUnreal/Source/CarlaUE4/CarlaUE4.cpp index ea3f66f63..a888f26f2 100644 --- a/Unreal/CarlaUnreal/Source/CarlaUE4/CarlaUE4.cpp +++ b/Unreal/CarlaUnreal/Source/CarlaUE4/CarlaUE4.cpp @@ -1,5 +1,5 @@ // Fill out your copyright notice in the Description page of Project Settings. -#include "CarlaUE4.h" +#include "CarlaUnreal.h" -IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, CarlaUE4, "CarlaUE4" ); +IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, CarlaUnreal, "CarlaUnreal" ); diff --git a/Unreal/CarlaUnreal/Source/CarlaUE4Editor.Target.cs b/Unreal/CarlaUnreal/Source/CarlaUE4Editor.Target.cs index 6c722d12a..46dce32c5 100644 --- a/Unreal/CarlaUnreal/Source/CarlaUE4Editor.Target.cs +++ b/Unreal/CarlaUnreal/Source/CarlaUE4Editor.Target.cs @@ -22,7 +22,7 @@ public class CarlaUE4EditorTarget : TargetRules IncludeOrderVersion = EngineIncludeOrderVersion.Latest; Type = TargetType.Editor; - ExtraModuleNames.Add("CarlaUE4"); + ExtraModuleNames.Add("CarlaUnreal"); LogFlagStatus("Unity build", EnableUnityBuild); diff --git a/Update.bat b/Update.bat index 36e8f15a8..ed9987c46 100644 --- a/Update.bat +++ b/Update.bat @@ -5,7 +5,7 @@ rem -- Set up environment ------------------------------------------------------ rem ============================================================================ set SCRIPT_DIR=%~dp0 -set CONTENT_FOLDER=%SCRIPT_DIR%Unreal/CarlaUE4/Content/Carla +set CONTENT_FOLDER=%SCRIPT_DIR%Unreal/CarlaUnreal/Content/Carla set VERSION_FILE=%CONTENT_FOLDER%/.version set CONTENT_VERSIONS=%SCRIPT_DIR%/Util/ContentVersions.txt diff --git a/Update.py b/Update.py index a1309a1b6..5e55f6896 100644 --- a/Update.py +++ b/Update.py @@ -6,7 +6,7 @@ import shutil import json WORKSPACE_PATH = Path(__file__).parent.resolve() -CONTENT_PARENT_PATH = WORKSPACE_PATH / 'Unreal' / 'CarlaUE4' / 'Content' +CONTENT_PARENT_PATH = WORKSPACE_PATH / 'Unreal' / 'CarlaUnreal' / 'Content' INTERMEDIATE_FILE_PATH = CONTENT_PARENT_PATH / f'Carla.tar.gz' CONTENT_PATH = CONTENT_PARENT_PATH / 'Carla' CONTENT_VERSION_FILE_PATH = WORKSPACE_PATH / 'Util' / 'ContentVersions.json' diff --git a/Update.sh b/Update.sh index 72ed63907..63e1ad657 100755 --- a/Update.sh +++ b/Update.sh @@ -44,7 +44,7 @@ done SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" pushd "$SCRIPT_DIR" >/dev/null -CONTENT_FOLDER="${SCRIPT_DIR}/Unreal/CarlaUE4/Content/Carla" +CONTENT_FOLDER="${SCRIPT_DIR}/Unreal/CarlaUnreal/Content/Carla" CONTENT_ID=$(tac $SCRIPT_DIR/Util/ContentVersions.txt | egrep -m 1 . | rev | cut -d' ' -f1 | rev) CONTENT_LINK=http://carla-assets.s3.amazonaws.com/${CONTENT_ID}.tar.gz @@ -82,7 +82,7 @@ if $SKIP_DOWNLOAD ; then echo echo " ${CONTENT_LINK}" echo - echo "and extract it under Unreal/CarlaUE4/Content/Carla." + echo "and extract it under Unreal/CarlaUnreal/Content/Carla." exit 0 fi diff --git a/Util/BuildTools/BuildCarlaUE4.bat b/Util/BuildTools/BuildCarlaUE4.bat index bae39a3a1..be46f5195 100644 --- a/Util/BuildTools/BuildCarlaUE4.bat +++ b/Util/BuildTools/BuildCarlaUE4.bat @@ -96,7 +96,7 @@ if not "%UE4_ROOT:~-1%"=="\" set UE4_ROOT=%UE4_ROOT%\ rem Set the visual studio solution directory rem -set UE4_PROJECT_FOLDER=%ROOT_PATH:/=\%Unreal\CarlaUE4\ +set UE4_PROJECT_FOLDER=%ROOT_PATH:/=\%Unreal\CarlaUnreal\ pushd "%UE4_PROJECT_FOLDER%" rem Clear binaries and intermediates generated by the build system @@ -120,7 +120,7 @@ if %REMOVE_INTERMEDIATE% == true ( rem Remove files for %%G in ( - "%UE4_PROJECT_FOLDER%CarlaUE4.sln" + "%UE4_PROJECT_FOLDER%CarlaUnreal.sln" ) do ( if exist %%G ( echo %FILE_N% Cleaning %%G @@ -155,10 +155,10 @@ if exist %OMNIVERSE_PLUGIN_FOLDER% ( ) if %USE_CARSIM% == true ( - py -3 %ROOT_PATH%Util/BuildTools/enable_carsim_to_uproject.py -f="%ROOT_PATH%Unreal/CarlaUE4/CarlaUE4.uproject" -e + py -3 %ROOT_PATH%Util/BuildTools/enable_carsim_to_uproject.py -f="%ROOT_PATH%Unreal/CarlaUnreal/CarlaUnreal.uproject" -e set CARSIM_STATE="CarSim ON" ) else ( - py -3 %ROOT_PATH%Util/BuildTools/enable_carsim_to_uproject.py -f="%ROOT_PATH%Unreal/CarlaUE4/CarlaUE4.uproject" + py -3 %ROOT_PATH%Util/BuildTools/enable_carsim_to_uproject.py -f="%ROOT_PATH%Unreal/CarlaUnreal/CarlaUnreal.uproject" set CARSIM_STATE="CarSim OFF" ) if %USE_CHRONO% == true ( @@ -177,7 +177,7 @@ if %USE_UNITY% == true ( set UNITY_STATE="Unity OFF" ) set OPTIONAL_MODULES_TEXT=%CARSIM_STATE% %CHRONO_STATE% %ROS2_STATE% %OMNIVERSE_PLUGIN_INSTALLED% %UNITY_STATE% -echo %OPTIONAL_MODULES_TEXT% > "%ROOT_PATH%Unreal/CarlaUE4/Config/OptionalModules.ini" +echo %OPTIONAL_MODULES_TEXT% > "%ROOT_PATH%Unreal/CarlaUnreal/Config/OptionalModules.ini" if %BUILD_UE4_EDITOR% == true ( @@ -189,16 +189,16 @@ if %BUILD_UE4_EDITOR% == true ( Development^ -WaitMutex^ -FromMsBuild^ - "%ROOT_PATH%Unreal/CarlaUE4/CarlaUE4.uproject" + "%ROOT_PATH%Unreal/CarlaUnreal/CarlaUnreal.uproject" if errorlevel 1 goto bad_exit call "%UE4_ROOT%Engine\Build\BatchFiles\Build.bat"^ - CarlaUE4^ + CarlaUnreal^ Win64^ Development^ -WaitMutex^ -FromMsBuild^ - "%ROOT_PATH%Unreal/CarlaUE4/CarlaUE4.uproject" + "%ROOT_PATH%Unreal/CarlaUnreal/CarlaUnreal.uproject" if errorlevel 1 goto bad_exit ) @@ -207,7 +207,7 @@ rem if %LAUNCH_UE4_EDITOR% == true ( echo %FILE_N% Launching Unreal Editor... call "%UE4_ROOT%\Engine\Binaries\Win64\UE4Editor.exe"^ - "%UE4_PROJECT_FOLDER%CarlaUE4.uproject" %EDITOR_FLAGS% + "%UE4_PROJECT_FOLDER%CarlaUnreal.uproject" %EDITOR_FLAGS% if %errorlevel% neq 0 goto error_build ) @@ -224,11 +224,11 @@ rem ============================================================================ :error_build echo. - echo %FILE_N% [ERROR] There was a problem building CarlaUE4. - echo %FILE_N% Please go to "Carla\Unreal\CarlaUE4", right click on - echo %FILE_N% "CarlaUE4.uproject" and select: + echo %FILE_N% [ERROR] There was a problem building CarlaUnreal. + echo %FILE_N% Please go to "Carla\Unreal\CarlaUnreal", right click on + echo %FILE_N% "CarlaUnreal.uproject" and select: echo %FILE_N% "Generate Visual Studio project files" - echo %FILE_N% Open de generated "CarlaUE4.sln" and try to manually compile it + echo %FILE_N% Open de generated "CarlaUnreal.sln" and try to manually compile it echo %FILE_N% and check what is causing the error. goto bad_exit diff --git a/Util/BuildTools/BuildCarlaUE4.sh b/Util/BuildTools/BuildCarlaUE4.sh index 3100fc7ed..cafad2016 100755 --- a/Util/BuildTools/BuildCarlaUE4.sh +++ b/Util/BuildTools/BuildCarlaUE4.sh @@ -4,7 +4,7 @@ # -- Parse arguments ----------------------------------------------------------- # ============================================================================== -DOC_STRING="Build and launch CarlaUE4." +DOC_STRING="Build and launch CarlaUnreal." USAGE_STRING="Usage: $0 [-h|--help] [--build] [--rebuild] [--launch] [--clean] [--hard-clean] [--opengl]" @@ -103,7 +103,7 @@ fi pushd "${CARLAUE4_ROOT_FOLDER}" >/dev/null # ============================================================================== -# -- Clean CarlaUE4 ------------------------------------------------------------ +# -- Clean CarlaUnreal ------------------------------------------------------------ # ============================================================================== if ${HARD_CLEAN} ; then @@ -153,17 +153,17 @@ if [[ ! -d ${HOUDINI_PLUGIN_PATH} ]] ; then fi # ============================================================================== -# -- Build CarlaUE4 ------------------------------------------------------------ +# -- Build CarlaUnreal ------------------------------------------------------------ # ============================================================================== if ${BUILD_CARLAUE4} ; then OPTIONAL_MODULES_TEXT="" if ${USE_CARSIM} ; then - python ${PWD}/../../Util/BuildTools/enable_carsim_to_uproject.py -f="CarlaUE4.uproject" -e + python ${PWD}/../../Util/BuildTools/enable_carsim_to_uproject.py -f="CarlaUnreal.uproject" -e OPTIONAL_MODULES_TEXT="CarSim ON"$'\n'"${OPTIONAL_MODULES_TEXT}" else - python ${PWD}/../../Util/BuildTools/enable_carsim_to_uproject.py -f="CarlaUE4.uproject" + python ${PWD}/../../Util/BuildTools/enable_carsim_to_uproject.py -f="CarlaUnreal.uproject" OPTIONAL_MODULES_TEXT="CarSim OFF"$'\n'"${OPTIONAL_MODULES_TEXT}" fi if ${USE_CHRONO} ; then @@ -194,12 +194,12 @@ if ${BUILD_CARLAUE4} ; then # This command fails sometimes but normally we can continue anyway. set +e log "Generate Unreal project files." - ${UE4_ROOT}/GenerateProjectFiles.sh -project="${PWD}/CarlaUE4.uproject" -game -engine -makefiles + ${UE4_ROOT}/GenerateProjectFiles.sh -project="${PWD}/CarlaUnreal.uproject" -game -engine -makefiles set -e fi - log "Build CarlaUE4 project." + log "Build CarlaUnreal project." make CarlaUE4Editor #Providing the user with the ExportedMaps folder @@ -216,7 +216,7 @@ fi if ${LAUNCH_UE4_EDITOR} ; then log "Launching UE4Editor..." - ${GDB} ${UE4_ROOT}/Engine/Binaries/Linux/UE4Editor "${PWD}/CarlaUE4.uproject" ${RHI} ${EDITOR_FLAGS} + ${GDB} ${UE4_ROOT}/Engine/Binaries/Linux/UE4Editor "${PWD}/CarlaUnreal.uproject" ${RHI} ${EDITOR_FLAGS} else diff --git a/Util/BuildTools/BuildLibCarla.bat b/Util/BuildTools/BuildLibCarla.bat index 710a5534a..64b840850 100644 --- a/Util/BuildTools/BuildLibCarla.bat +++ b/Util/BuildTools/BuildLibCarla.bat @@ -75,7 +75,7 @@ set LIBCARLA_VSPROJECT_PATH=%INSTALLATION_DIR:/=\%libcarla-visualstudio\ if %GENERATOR% == "" set GENERATOR="Visual Studio 16 2019" -set LIBCARLA_SERVER_INSTALL_PATH=%ROOT_PATH:/=\%Unreal\CarlaUE4\Plugins\Carla\CarlaDependencies\ +set LIBCARLA_SERVER_INSTALL_PATH=%ROOT_PATH:/=\%Unreal\CarlaUnreal\Plugins\Carla\CarlaDependencies\ set LIBCARLA_CLIENT_INSTALL_PATH=%ROOT_PATH:/=\%PythonAPI\carla\dependencies\ if %REMOVE_INTERMEDIATE% == true ( diff --git a/Util/BuildTools/BuildOSM2ODR.bat b/Util/BuildTools/BuildOSM2ODR.bat index 7d2a7df60..821f82f96 100644 --- a/Util/BuildTools/BuildOSM2ODR.bat +++ b/Util/BuildTools/BuildOSM2ODR.bat @@ -73,8 +73,8 @@ rem set OSM2ODR_VSPROJECT_PATH=%INSTALLATION_DIR:/=\%osm2odr-visualstudio\ set OSM2ODR_SOURCE_PATH=%INSTALLATION_DIR:/=\%om2odr-source\ set OSM2ODR_INSTALL_PATH=%ROOT_PATH:/=\%PythonAPI\carla\dependencies\ -set OSM2ODR__SERVER_INSTALL_PATH=%ROOT_PATH:/=\%Unreal\CarlaUE4\Plugins\Carla\CarlaDependencies -set CARLA_DEPENDENCIES_FOLDER=%ROOT_PATH:/=\%Unreal\CarlaUE4\Plugins\Carla\CarlaDependencies\ +set OSM2ODR__SERVER_INSTALL_PATH=%ROOT_PATH:/=\%Unreal\CarlaUnreal\Plugins\Carla\CarlaDependencies +set CARLA_DEPENDENCIES_FOLDER=%ROOT_PATH:/=\%Unreal\CarlaUnreal\Plugins\Carla\CarlaDependencies\ if %GENERATOR% == "" set GENERATOR="Visual Studio 16 2019" diff --git a/Util/BuildTools/BuildUE4Plugins.bat b/Util/BuildTools/BuildUE4Plugins.bat index a3330a0b1..6c0f4a92c 100755 --- a/Util/BuildTools/BuildUE4Plugins.bat +++ b/Util/BuildTools/BuildUE4Plugins.bat @@ -57,8 +57,8 @@ rem ============================================================================ rem Set the visual studio solution directory rem -set CARLA_PLUGINS_PATH=%ROOT_PATH:/=\%Unreal\CarlaUE4\Plugins\ -set CARLA_STREETMAP_PLUGINS_PATH=%ROOT_PATH:/=\%Unreal\CarlaUE4\Plugins\StreetMap\ +set CARLA_PLUGINS_PATH=%ROOT_PATH:/=\%Unreal\CarlaUnreal\Plugins\ +set CARLA_STREETMAP_PLUGINS_PATH=%ROOT_PATH:/=\%Unreal\CarlaUnreal\Plugins\StreetMap\ rem Build STREETMAP diff --git a/Util/BuildTools/Import.py b/Util/BuildTools/Import.py index f9518a0e2..f9b3ba120 100755 --- a/Util/BuildTools/Import.py +++ b/Util/BuildTools/Import.py @@ -199,7 +199,7 @@ def generate_decals_file(folder): def invoke_commandlet(name, arguments): """Generic function for running a commandlet with its arguments.""" ue4_path = os.environ["UE4_ROOT"] - uproject_path = os.path.join(CARLA_ROOT_PATH, "Unreal", "CarlaUE4", "CarlaUE4.uproject") + uproject_path = os.path.join(CARLA_ROOT_PATH, "Unreal", "CarlaUnreal", "CarlaUnreal.uproject") run = "-run=%s" % (name) if os.name == "nt": @@ -313,7 +313,7 @@ def generate_package_file(package_name, props, maps): "use_carla_materials": use_carla_materials }) - package_config_path = os.path.join(CARLA_ROOT_PATH, "Unreal", "CarlaUE4", "Content", package_name, "Config") + package_config_path = os.path.join(CARLA_ROOT_PATH, "Unreal", "CarlaUnreal", "Content", package_name, "Config") if not os.path.exists(package_config_path): try: os.makedirs(package_config_path) @@ -331,7 +331,7 @@ def copy_roadpainter_config_files(package_name): two_directories_up = os.path.dirname(os.path.dirname(os.path.dirname(__file__))) final_path = os.path.join(two_directories_up, "Import", "roadpainter_decals.json") if os.path.exists(final_path): - package_config_path = os.path.join(CARLA_ROOT_PATH, "Unreal", "CarlaUE4", "Content", package_name, "Config") + package_config_path = os.path.join(CARLA_ROOT_PATH, "Unreal", "CarlaUnreal", "Content", package_name, "Config") if not os.path.exists(package_config_path): try: os.makedirs(package_config_path) @@ -402,7 +402,7 @@ def import_assets(package_name, json_dirname, props, maps, do_tiles, tile_size, xodr_folder_destin = os.path.join( CARLA_ROOT_PATH, "Unreal", - "CarlaUE4", + "CarlaUnreal", "Content", package_name, "Maps", @@ -551,7 +551,7 @@ def build_binary_for_navigation(package_name, dirname, maps): # copy the binary file nav_path_source = os.path.join(folder, "%s.bin" % fbx_name_no_ext) - nav_folder_target = os.path.join(CARLA_ROOT_PATH, "Unreal", "CarlaUE4", "Content", package_name, "Maps", target_name, "Nav") + nav_folder_target = os.path.join(CARLA_ROOT_PATH, "Unreal", "CarlaUnreal", "Content", package_name, "Maps", target_name, "Nav") if os.path.exists(nav_path_source): if not os.path.exists(nav_folder_target): os.makedirs(nav_folder_target) @@ -583,7 +583,7 @@ def build_binary_for_tm(package_name, dirname, maps): tm_folder_target = os.path.join( CARLA_ROOT_PATH, "Unreal", - "CarlaUE4", + "CarlaUnreal", "Content", package_name, "Maps", diff --git a/Util/BuildTools/Linux.mk.help b/Util/BuildTools/Linux.mk.help index 960f6ebd7..1dafc4024 100644 --- a/Util/BuildTools/Linux.mk.help +++ b/Util/BuildTools/Linux.mk.help @@ -11,11 +11,11 @@ Use the following commands: launch: - Compile CarlaUE4 project and launch it in Unreal Engine's Editor. + Compile CarlaUnreal project and launch it in Unreal Engine's Editor. launch-only: - Launch CarlaUE4 project in Unreal Engine's Editor, but skip building + Launch CarlaUnreal project in Unreal Engine's Editor, but skip building step (assume the project is already built). import: @@ -73,7 +73,7 @@ for developers: CarlaUE4Editor: - Build CarlaUE4 project, but do not launch the editor. + Build CarlaUnreal project, but do not launch the editor. PythonAPI(.2|.3): diff --git a/Util/BuildTools/Package.bat b/Util/BuildTools/Package.bat index 6be833077..86e59fceb 100644 --- a/Util/BuildTools/Package.bat +++ b/Util/BuildTools/Package.bat @@ -119,11 +119,11 @@ rem ============================================================================ if %DO_PACKAGE%==true ( if %USE_CARSIM% == true ( - py -3 %ROOT_PATH%Util/BuildTools/enable_carsim_to_uproject.py -f="%ROOT_PATH%Unreal/CarlaUE4/CarlaUE4.uproject" -e - echo CarSim ON > "%ROOT_PATH%Unreal/CarlaUE4/Config/CarSimConfig.ini" + py -3 %ROOT_PATH%Util/BuildTools/enable_carsim_to_uproject.py -f="%ROOT_PATH%Unreal/CarlaUnreal/CarlaUnreal.uproject" -e + echo CarSim ON > "%ROOT_PATH%Unreal/CarlaUnreal/Config/CarSimConfig.ini" ) else ( - py -3 %ROOT_PATH%Util/BuildTools/enable_carsim_to_uproject.py -f="%ROOT_PATH%Unreal/CarlaUE4/CarlaUE4.uproject" - echo CarSim OFF > "%ROOT_PATH%Unreal/CarlaUE4/Config/CarSimConfig.ini" + py -3 %ROOT_PATH%Util/BuildTools/enable_carsim_to_uproject.py -f="%ROOT_PATH%Unreal/CarlaUnreal/CarlaUnreal.uproject" + echo CarSim OFF > "%ROOT_PATH%Unreal/CarlaUnreal/Config/CarSimConfig.ini" ) if not exist "!BUILD_FOLDER!" mkdir "!BUILD_FOLDER!" @@ -134,24 +134,24 @@ if %DO_PACKAGE%==true ( Development^ -WaitMutex^ -FromMsBuild^ - "%ROOT_PATH%Unreal/CarlaUE4/CarlaUE4.uproject" + "%ROOT_PATH%Unreal/CarlaUnreal/CarlaUnreal.uproject" if errorlevel 1 goto error_build_editor echo "%UE4_ROOT%\Engine\Build\BatchFiles\Build.bat"^ - CarlaUE4^ + CarlaUnreal^ Win64^ %PACKAGE_CONFIG%^ -WaitMutex^ -FromMsBuild^ - "%ROOT_PATH%Unreal/CarlaUE4/CarlaUE4.uproject" + "%ROOT_PATH%Unreal/CarlaUnreal/CarlaUnreal.uproject" call "%UE4_ROOT%\Engine\Build\BatchFiles\Build.bat"^ - CarlaUE4^ + CarlaUnreal^ Win64^ %PACKAGE_CONFIG%^ -WaitMutex^ -FromMsBuild^ - "%ROOT_PATH%Unreal/CarlaUE4/CarlaUE4.uproject" + "%ROOT_PATH%Unreal/CarlaUnreal/CarlaUnreal.uproject" if errorlevel 1 goto error_build @@ -162,7 +162,7 @@ if %DO_PACKAGE%==true ( -Platform=Win64^ -installed^ -nop4^ - -project="%ROOT_PATH%Unreal/CarlaUE4/CarlaUE4.uproject"^ + -project="%ROOT_PATH%Unreal/CarlaUnreal/CarlaUnreal.uproject"^ -cook^ -stage^ -build^ @@ -178,7 +178,7 @@ if %DO_PACKAGE%==true ( -Platform=Win64^ -installed^ -nop4^ - -project="%ROOT_PATH%Unreal/CarlaUE4/CarlaUE4.uproject"^ + -project="%ROOT_PATH%Unreal/CarlaUnreal/CarlaUnreal.uproject"^ -cook^ -stage^ -build^ @@ -215,8 +215,8 @@ if %DO_COPY_FILES%==true ( echo f | xcopy /y "!XCOPY_FROM!PythonAPI\util\*.py" "!XCOPY_TO!PythonAPI\util\" echo d | xcopy /y /s "!XCOPY_FROM!PythonAPI\util\opendrive" "!XCOPY_TO!PythonAPI\util\opendrive" echo f | xcopy /y "!XCOPY_FROM!PythonAPI\util\requirements.txt" "!XCOPY_TO!PythonAPI\util\" - echo f | xcopy /y "!XCOPY_FROM!Unreal\CarlaUE4\Content\Carla\HDMaps\*.pcd" "!XCOPY_TO!HDMaps\" - echo f | xcopy /y "!XCOPY_FROM!Unreal\CarlaUE4\Content\Carla\HDMaps\Readme.md" "!XCOPY_TO!HDMaps\README" + echo f | xcopy /y "!XCOPY_FROM!Unreal\CarlaUnreal\Content\Carla\HDMaps\*.pcd" "!XCOPY_TO!HDMaps\" + echo f | xcopy /y "!XCOPY_FROM!Unreal\CarlaUnreal\Content\Carla\HDMaps\Readme.md" "!XCOPY_TO!HDMaps\README" if exist "!XCOPY_FROM!Plugins" ( echo d | xcopy /y /s "!XCOPY_FROM!Plugins" "!XCOPY_TO!Plugins" ) @@ -234,7 +234,7 @@ if %DO_PACKAGE%==true if %DO_TARBALL%==true ( if exist "!SRC_PATH!Manifest_NonUFSFiles_Win64.txt" del /Q "!SRC_PATH!Manifest_NonUFSFiles_Win64.txt" if exist "!SRC_PATH!Manifest_DebugFiles_Win64.txt" del /Q "!SRC_PATH!Manifest_DebugFiles_Win64.txt" if exist "!SRC_PATH!Manifest_UFSFiles_Win64.txt" del /Q "!SRC_PATH!Manifest_UFSFiles_Win64.txt" - if exist "!SRC_PATH!CarlaUE4/Saved" rmdir /S /Q "!SRC_PATH!CarlaUE4/Saved" + if exist "!SRC_PATH!CarlaUnreal/Saved" rmdir /S /Q "!SRC_PATH!CarlaUnreal/Saved" if exist "!SRC_PATH!Engine/Saved" rmdir /S /Q "!SRC_PATH!Engine/Saved" set DST_ZIP=%DESTINATION_ZIP:/=\% @@ -262,7 +262,7 @@ rem -- Cook other packages ----------------------------------------------------- rem ============================================================================== rem Set some file locations -set CARLAUE4_ROOT_FOLDER=%ROOT_PATH%Unreal/CarlaUE4 +set CARLAUE4_ROOT_FOLDER=%ROOT_PATH%Unreal/CarlaUnreal set PACKAGE_PATH_FILE=%CARLAUE4_ROOT_FOLDER%/Content/PackagePath.txt set MAP_LIST_FILE=%CARLAUE4_ROOT_FOLDER%/Content/MapPaths.txt @@ -306,7 +306,7 @@ for /f "tokens=* delims=" %%i in ("!PACKAGES!") do ( REM # Prepare cooking of package echo Prepare cooking of package: !PACKAGE_NAME! call "%UE4_ROOT%/Engine/Binaries/Win64/UE4Editor.exe "^ - "%CARLAUE4_ROOT_FOLDER%/CarlaUE4.uproject"^ + "%CARLAUE4_ROOT_FOLDER%/CarlaUnreal.uproject"^ -run=PrepareAssetsForCooking^ -PackageName=!PACKAGE_NAME!^ -OnlyPrepareMaps=false @@ -319,7 +319,7 @@ for /f "tokens=* delims=" %%i in ("!PACKAGES!") do ( REM # Cook maps echo Cooking: %%a call "%UE4_ROOT%/Engine/Binaries/Win64/UE4Editor.exe "^ - "%CARLAUE4_ROOT_FOLDER%/CarlaUE4.uproject"^ + "%CARLAUE4_ROOT_FOLDER%/CarlaUnreal.uproject"^ -run=cook^ -map="%%a"^ -targetplatform="WindowsNoEditor"^ @@ -340,7 +340,7 @@ for /f "tokens=* delims=" %%i in ("!PACKAGES!") do ( pushd "!BUILD_FOLDER!" - set SUBST_PATH=!BUILD_FOLDER!CarlaUE4 + set SUBST_PATH=!BUILD_FOLDER!CarlaUnreal REM Copy the package config file to package set TARGET="!SUBST_PATH!\Content\Carla\Config\" @@ -353,7 +353,7 @@ for /f "tokens=* delims=" %%i in ("!PACKAGES!") do ( set MAPS_TO_COOK=!MAPS_TO_COOK:+=^ ! - set BASE_CONTENT=%INSTALLATION_DIR:/=\%..\Unreal\CarlaUE4\Content + set BASE_CONTENT=%INSTALLATION_DIR:/=\%..\Unreal\CarlaUnreal\Content for /f "tokens=1 delims=+" %%a in ("!MAPS_TO_COOK!") do ( REM Get path and name of map @@ -366,7 +366,7 @@ for /f "tokens=* delims=" %%i in ("!PACKAGES!") do ( REM # copy the OpenDrive file set SRC=!BASE_CONTENT!!MAP_FOLDER!\OpenDrive\!MAP_NAME!.xodr - set TRG=!BUILD_FOLDER!\CarlaUE4\Content\!MAP_FOLDER!\OpenDrive\ + set TRG=!BUILD_FOLDER!\CarlaUnreal\Content\!MAP_FOLDER!\OpenDrive\ if exist "!SRC!" ( mkdir "!TRG!" copy "!SRC!" "!TRG!" @@ -374,7 +374,7 @@ for /f "tokens=* delims=" %%i in ("!PACKAGES!") do ( REM # copy the navigation file set SRC=!BASE_CONTENT!!MAP_FOLDER!\Nav\!MAP_NAME!.bin - set TRG=!BUILD_FOLDER!\CarlaUE4\Content\!MAP_FOLDER!\Nav\ + set TRG=!BUILD_FOLDER!\CarlaUnreal\Content\!MAP_FOLDER!\Nav\ if exist "!SRC!" ( mkdir "!TRG!" copy "!SRC!" "!TRG!" @@ -382,17 +382,17 @@ for /f "tokens=* delims=" %%i in ("!PACKAGES!") do ( REM # copy the traffic manager map file set SRC=!BASE_CONTENT!!MAP_FOLDER!\TM\!MAP_NAME!.bin - set TRG=!BUILD_FOLDER!\CarlaUE4\Content\!MAP_FOLDER!\TM\ + set TRG=!BUILD_FOLDER!\CarlaUnreal\Content\!MAP_FOLDER!\TM\ if exist "!SRC!" ( mkdir "!TRG!" copy "!SRC!" "!TRG!" ) ) - rmdir /S /Q "!BUILD_FOLDER!\CarlaUE4\Metadata" - rmdir /S /Q "!BUILD_FOLDER!\CarlaUE4\Plugins" - REM del "!BUILD_FOLDER!\CarlaUE4\Content\!PACKAGE_NAME!/Maps/!PROPS_MAP_NAME!" - del "!BUILD_FOLDER!\CarlaUE4\AssetRegistry.bin" + rmdir /S /Q "!BUILD_FOLDER!\CarlaUnreal\Metadata" + rmdir /S /Q "!BUILD_FOLDER!\CarlaUnreal\Plugins" + REM del "!BUILD_FOLDER!\CarlaUnreal\Content\!PACKAGE_NAME!/Maps/!PROPS_MAP_NAME!" + del "!BUILD_FOLDER!\CarlaUnreal\AssetRegistry.bin" if %DO_TARBALL%==true ( @@ -463,7 +463,7 @@ rem ============================================================================ :error_build echo. - echo %FILE_N% [ERROR] There was a problem while building the CarlaUE4. + echo %FILE_N% [ERROR] There was a problem while building the CarlaUnreal. echo [ERROR] Please read the screen log for more information. goto bad_exit diff --git a/Util/BuildTools/Package.sh b/Util/BuildTools/Package.sh index 0be72293a..3d177f68d 100755 --- a/Util/BuildTools/Package.sh +++ b/Util/BuildTools/Package.sh @@ -110,10 +110,10 @@ if ${DO_CARLA_RELEASE} ; then pushd "${CARLAUE4_ROOT_FOLDER}" >/dev/null if ${USE_CARSIM} ; then - python ${PWD}/../../Util/BuildTools/enable_carsim_to_uproject.py -f="CarlaUE4.uproject" -e + python ${PWD}/../../Util/BuildTools/enable_carsim_to_uproject.py -f="CarlaUnreal.uproject" -e echo "CarSim ON" > ${PWD}/Config/CarSimConfig.ini else - python ${PWD}/../../Util/BuildTools/enable_carsim_to_uproject.py -f="CarlaUE4.uproject" + python ${PWD}/../../Util/BuildTools/enable_carsim_to_uproject.py -f="CarlaUnreal.uproject" echo "CarSim OFF" > ${PWD}/Config/CarSimConfig.ini fi @@ -123,7 +123,7 @@ if ${DO_CARLA_RELEASE} ; then mkdir -p ${RELEASE_BUILD_FOLDER} ${UE4_ROOT}/Engine/Build/BatchFiles/RunUAT.sh BuildCookRun \ - -project="${PWD}/CarlaUE4.uproject" \ + -project="${PWD}/CarlaUnreal.uproject" \ -nocompileeditor -nop4 -cook -stage -archive -package -iterate \ -clientconfig=${PACKAGE_CONFIG} -ue4exe=UE4Editor \ -prereqs -targetplatform=Linux -build -utf8output \ @@ -181,12 +181,12 @@ if ${DO_CARLA_RELEASE} ; then copy_if_changed "./Plugins/" "${DESTINATION}/Plugins/" fi - if [ -d "./Unreal/CarlaUE4/Plugins/Carla/CarlaDependencies/lib" ] ; then - cp -r "./Unreal/CarlaUE4/Plugins/Carla/CarlaDependencies/lib" "${DESTINATION}/CarlaUE4/Plugins/Carla/CarlaDependencies" + if [ -d "./Unreal/CarlaUnreal/Plugins/Carla/CarlaDependencies/lib" ] ; then + cp -r "./Unreal/CarlaUnreal/Plugins/Carla/CarlaDependencies/lib" "${DESTINATION}/CarlaUnreal/Plugins/Carla/CarlaDependencies" fi - copy_if_changed "./Unreal/CarlaUE4/Content/Carla/HDMaps/*.pcd" "${DESTINATION}/HDMaps/" - copy_if_changed "./Unreal/CarlaUE4/Content/Carla/HDMaps/Readme.md" "${DESTINATION}/HDMaps/README" + copy_if_changed "./Unreal/CarlaUnreal/Content/Carla/HDMaps/*.pcd" "${DESTINATION}/HDMaps/" + copy_if_changed "./Unreal/CarlaUnreal/Content/Carla/HDMaps/Readme.md" "${DESTINATION}/HDMaps/README" popd >/dev/null @@ -207,7 +207,7 @@ if ${DO_CARLA_RELEASE} && ${DO_TARBALL} ; then rm -f ./Manifest_NonUFSFiles_Linux.txt rm -f ./Manifest_UFSFiles_Linux.txt - rm -Rf ./CarlaUE4/Saved + rm -Rf ./CarlaUnreal/Saved rm -Rf ./Engine/Saved tar -czf ${DESTINATION} * @@ -265,7 +265,7 @@ for PACKAGE_NAME in "${PACKAGES[@]}" ; do if [[ ${PACKAGE_NAME} != "Carla" ]] ; pushd "${CARLAUE4_ROOT_FOLDER}" > /dev/null # Prepare cooking of package - ${UE4_ROOT}/Engine/Binaries/Linux/UE4Editor "${CARLAUE4_ROOT_FOLDER}/CarlaUE4.uproject" \ + ${UE4_ROOT}/Engine/Binaries/Linux/UE4Editor "${CARLAUE4_ROOT_FOLDER}/CarlaUnreal.uproject" \ -run=PrepareAssetsForCooking -PackageName=${PACKAGE_NAME} -OnlyPrepareMaps=false PACKAGE_FILE=$(<${PACKAGE_PATH_FILE}) @@ -280,7 +280,7 @@ for PACKAGE_NAME in "${PACKAGES[@]}" ; do if [[ ${PACKAGE_NAME} != "Carla" ]] ; for MAP in "${MAP_LIST[@]}"; do if (($(($TOTAL+${#MAP})) > $MAX_STRINGLENGTH)); then echo "Cooking $MAP_STRING" - ${UE4_ROOT}/Engine/Binaries/Linux/UE4Editor "${CARLAUE4_ROOT_FOLDER}/CarlaUE4.uproject" \ + ${UE4_ROOT}/Engine/Binaries/Linux/UE4Editor "${CARLAUE4_ROOT_FOLDER}/CarlaUnreal.uproject" \ -run=cook -map="${MAP_STRING}" -cooksinglepackage -targetplatform="LinuxNoEditor" \ -OutputDir="${BUILD_FOLDER}" -iterate MAP_STRING="" @@ -290,7 +290,7 @@ for PACKAGE_NAME in "${PACKAGES[@]}" ; do if [[ ${PACKAGE_NAME} != "Carla" ]] ; TOTAL=$(($TOTAL+${#MAP})) done if (($TOTAL > 0)); then - ${UE4_ROOT}/Engine/Binaries/Linux/UE4Editor "${CARLAUE4_ROOT_FOLDER}/CarlaUE4.uproject" \ + ${UE4_ROOT}/Engine/Binaries/Linux/UE4Editor "${CARLAUE4_ROOT_FOLDER}/CarlaUnreal.uproject" \ -run=cook -map="${MAP_STRING}" -cooksinglepackage -targetplatform="LinuxNoEditor" \ -OutputDir="${BUILD_FOLDER}" -iterate fi @@ -305,7 +305,7 @@ for PACKAGE_NAME in "${PACKAGES[@]}" ; do if [[ ${PACKAGE_NAME} != "Carla" ]] ; pushd "${BUILD_FOLDER}" > /dev/null - SUBST_PATH="${BUILD_FOLDER}/CarlaUE4" + SUBST_PATH="${BUILD_FOLDER}/CarlaUnreal" SUBST_FILE="${PACKAGE_FILE/${CARLAUE4_ROOT_FOLDER}/${SUBST_PATH}}" # Copy the package config file to package @@ -345,10 +345,10 @@ for PACKAGE_NAME in "${PACKAGES[@]}" ; do if [[ ${PACKAGE_NAME} != "Carla" ]] ; done done - rm -Rf "./CarlaUE4/Metadata" - rm -Rf "./CarlaUE4/Plugins" - rm -Rf "./CarlaUE4/Content/${PACKAGE_NAME}/Maps/${PROPS_MAP_NAME}" - rm -f "./CarlaUE4/AssetRegistry.bin" + rm -Rf "./CarlaUnreal/Metadata" + rm -Rf "./CarlaUnreal/Plugins" + rm -Rf "./CarlaUnreal/Content/${PACKAGE_NAME}/Maps/${PROPS_MAP_NAME}" + rm -f "./CarlaUnreal/AssetRegistry.bin" if ${DO_TARBALL} ; then diff --git a/Util/BuildTools/Prettify.sh b/Util/BuildTools/Prettify.sh index 17668ca2e..f4f103a6c 100755 --- a/Util/BuildTools/Prettify.sh +++ b/Util/BuildTools/Prettify.sh @@ -124,7 +124,7 @@ elif [[ -f ${PRETTIFY_FILE} ]] ; then if [[ ${PRETTIFY_FILE} == *.py ]] ; then log "autopep8 ${PRETTIFY_FILE}" ${AUTOPEP8_COMMAND} ${PRETTIFY_FILE} - elif [[ ${PRETTIFY_FILE} == *Unreal/CarlaUE4/* ]] ; then + elif [[ ${PRETTIFY_FILE} == *Unreal/CarlaUnreal/* ]] ; then log "uncrustify for UE4 ${PRETTIFY_FILE}" ${UNCRUSTIFY_COMMAND} -c ${UNCRUSTIFY_UE4_CONFIG} ${PRETTIFY_FILE} else diff --git a/Util/BuildTools/Setup.bat b/Util/BuildTools/Setup.bat index 46eac87e5..7f1aae35c 100644 --- a/Util/BuildTools/Setup.bat +++ b/Util/BuildTools/Setup.bat @@ -27,9 +27,9 @@ rem ============================================================================ set BOOST_VERSION=1.80.0 set INSTALLERS_DIR=%ROOT_PATH:/=\%Util\InstallersWin\ set VERSION_FILE=%ROOT_PATH:/=\%Util\ContentVersions.txt -set CONTENT_DIR=%ROOT_PATH:/=\%Unreal\CarlaUE4\Content\Carla\ -set CARLA_DEPENDENCIES_FOLDER=%ROOT_PATH:/=\%Unreal\CarlaUE4\Plugins\Carla\CarlaDependencies\ -set CARLA_BINARIES_FOLDER=%ROOT_PATH:/=\%Unreal\CarlaUE4\Plugins\Carla\Binaries\Win64 +set CONTENT_DIR=%ROOT_PATH:/=\%Unreal\CarlaUnreal\Content\Carla\ +set CARLA_DEPENDENCIES_FOLDER=%ROOT_PATH:/=\%Unreal\CarlaUnreal\Plugins\Carla\CarlaDependencies\ +set CARLA_BINARIES_FOLDER=%ROOT_PATH:/=\%Unreal\CarlaUnreal\Plugins\Carla\Binaries\Win64 set CARLA_PYTHON_DEPENDENCIES=%ROOT_PATH:/=\%PythonAPI\carla\dependencies\ set USE_CHRONO=false set USE_ROS2=false diff --git a/Util/BuildTools/Vars.mk b/Util/BuildTools/Vars.mk index 3cfd55125..d1af1aaa5 100644 --- a/Util/BuildTools/Vars.mk +++ b/Util/BuildTools/Vars.mk @@ -8,8 +8,8 @@ CARLA_DOCKER_UTILS_FOLDER=${CARLA_UTIL_FOLDER}/DockerUtils CARLA_BUILD_TOOLS_FOLDER=${CARLA_UTIL_FOLDER}/BuildTools CARLA_TEST_RESULTS_FOLDER=${CARLA_BUILD_FOLDER}/test-results -CARLAUE4_ROOT_FOLDER=${CURDIR}/Unreal/CarlaUE4 -CARLAUE4_PLUGIN_ROOT_FOLDER=${CURDIR}/Unreal/CarlaUE4/Plugins/Carla +CARLAUE4_ROOT_FOLDER=${CURDIR}/Unreal/CarlaUnreal +CARLAUE4_PLUGIN_ROOT_FOLDER=${CURDIR}/Unreal/CarlaUnreal/Plugins/Carla CARLA_PYTHONAPI_ROOT_FOLDER=${CURDIR}/PythonAPI CARLA_PYTHONAPI_SOURCE_FOLDER=${CARLA_PYTHONAPI_ROOT_FOLDER}/carla @@ -34,5 +34,5 @@ CMAKE_CONFIG_FILE=${CARLA_BUILD_FOLDER}/CMakeLists.txt.in LIBCARLA_TEST_CONTENT_FOLDER=${CARLA_BUILD_FOLDER}/test-content CARLA_EXAMPLES_FOLDER=${CURDIR}/Examples -CARLAUE4_ADDPLUGINS_FOLDER=${CURDIR}/Unreal/CarlaUE4/Plugins +CARLAUE4_ADDPLUGINS_FOLDER=${CURDIR}/Unreal/CarlaUnreal/Plugins CARLAUE4_STREETMAP_FOLDER=${CARLAUE4_ADDPLUGINS_FOLDER}/Streetmap diff --git a/Util/BuildTools/Windows.mk.help b/Util/BuildTools/Windows.mk.help index 6d7a7a310..43d1c08bb 100644 --- a/Util/BuildTools/Windows.mk.help +++ b/Util/BuildTools/Windows.mk.help @@ -11,7 +11,7 @@ Use the following commands: launch: - Compile CarlaUE4 project and launch it in Unreal Engine's Editor. + Compile CarlaUnreal project and launch it in Unreal Engine's Editor. package: diff --git a/Util/CARLA.sublime-project b/Util/CARLA.sublime-project index 7ffd9764c..46d555bca 100644 --- a/Util/CARLA.sublime-project +++ b/Util/CARLA.sublime-project @@ -42,8 +42,8 @@ "PythonAPI/carla/dependencies", "PythonAPI/carla/dist", "Saved", - "Unreal/CarlaUE4/Content/Carla/*", - "Unreal/CarlaUE4/Plugins/Carla/CarlaDependencies", + "Unreal/CarlaUnreal/Content/Carla/*", + "Unreal/CarlaUnreal/Plugins/Carla/CarlaDependencies", "__pycache__", "_site" ], @@ -61,7 +61,7 @@ { "name": "CARLA - make CarlaUE4Editor", "working_dir": "${project_path}/..", - "file_regex": "(Unreal\\/CarlaUE4\\/[^:]*):([0-9]+):?([0-9]+)?:? (.*)$", + "file_regex": "(Unreal\\/CarlaUnreal\\/[^:]*):([0-9]+):?([0-9]+)?:? (.*)$", "syntax": "Packages/Makefile/Make Output.sublime-syntax", "linux": { diff --git a/Util/CreateDebian.sh b/Util/CreateDebian.sh index 04664aeb1..d116f0056 100755 --- a/Util/CreateDebian.sh +++ b/Util/CreateDebian.sh @@ -61,17 +61,17 @@ fi ./ImportAssets.sh # Removing unnecessary files -rm CarlaUE4/Binaries/Linux/CarlaUE4-Linux-Shipping.debug -rm CarlaUE4/Binaries/Linux/CarlaUE4-Linux-Shipping.sym +rm CarlaUnreal/Binaries/Linux/CarlaUnreal-Linux-Shipping.debug +rm CarlaUnreal/Binaries/Linux/CarlaUnreal-Linux-Shipping.sym # ================================================================================================== # -- Debian package -------------------------------------------------------------------------------- # ================================================================================================== -# Updating CarlaUE4.sh script -rm CarlaUE4.sh -cat >> CarlaUE4.sh <> CarlaUnreal.sh < "\$SITEDIR/carla.pth" -chmod +x /opt/carla-simulator/bin/CarlaUE4.sh +chmod +x /opt/carla-simulator/bin/CarlaUnreal.sh set -e diff --git a/Util/Docker/Release.Dockerfile b/Util/Docker/Release.Dockerfile index 39d4b6d47..0c03394a3 100644 --- a/Util/Docker/Release.Dockerfile +++ b/Util/Docker/Release.Dockerfile @@ -17,5 +17,5 @@ USER carla WORKDIR /home/carla # you can also run CARLA in offscreen mode with -RenderOffScreen -# CMD /bin/bash CarlaUE4.sh -RenderOffScreen -CMD /bin/bash CarlaUE4.sh +# CMD /bin/bash CarlaUnreal.sh -RenderOffScreen +CMD /bin/bash CarlaUnreal.sh diff --git a/Util/ImportAssets.sh b/Util/ImportAssets.sh index ae25398d7..93629e252 100755 --- a/Util/ImportAssets.sh +++ b/Util/ImportAssets.sh @@ -4,7 +4,7 @@ # -- Parse arguments ----------------------------------------------------------- # ============================================================================== -DOC_STRING="Unpack and copy over CarlaUE4's Exported Assets" +DOC_STRING="Unpack and copy over CarlaUnreal's Exported Assets" USAGE_STRING="Usage: $0 [-h|--help] [-d|--dir] " From a09ce913765f25c511fabfdb647367ac4a1a1275 Mon Sep 17 00:00:00 2001 From: Marcel Pi Date: Wed, 6 Mar 2024 16:28:09 +0100 Subject: [PATCH 3/9] Minor changes. Disable MakeFiles. --- CMake/CarlaDependencies.cmake | 10 ++++++++++ CMake/CarlaOptions.cmake | 15 +++++++++++++++ Configure.py | 2 +- Docs/build_faq.md | 2 +- Docs/build_system.md | 4 ++-- Jenkinsfile | 4 ++-- Makefile | 15 +++++++++------ Unreal/CMakeLists.txt | 30 +++++++++++++----------------- Util/BuildTools/BuildCarlaUE4.bat | 2 +- Util/BuildTools/BuildCarlaUE4.sh | 4 ++-- Util/BuildTools/Linux.mk | 24 ++++++++++++------------ Util/BuildTools/Linux.mk.help | 4 ++-- Util/BuildTools/Package.bat | 4 ++-- Util/BuildTools/Windows.mk | 16 ++++++++-------- Util/CARLA.sublime-project | 4 ++-- Util/Docker/Carla.Dockerfile | 2 +- 16 files changed, 83 insertions(+), 59 deletions(-) diff --git a/CMake/CarlaDependencies.cmake b/CMake/CarlaDependencies.cmake index ea729cb48..d806a138f 100644 --- a/CMake/CarlaDependencies.cmake +++ b/CMake/CarlaDependencies.cmake @@ -57,6 +57,7 @@ macro (carla_dependency_add NAME URL TAG) GIT_REPOSITORY ${URL} GIT_TAG ${TAG} OVERRIDE_FIND_PACKAGE + ${ARGN} ) list (APPEND CARLA_DEPENDENCIES ${NAME}) endmacro () @@ -169,6 +170,15 @@ if (BUILD_OSM_WORLD_RENDERER) ) endif () +if (BUILD_CARLA_UE) + carla_dependency_add ( + StreetMap + https://github.com/carla-simulator/StreetMap.git + ${CARLA_STREETMAP_TAG} + SOURCE_DIR ${CARLA_WORKSPACE_PATH}/Unreal/CarlaUnreal/Plugins/StreetMap + ) +endif () + # carla_dependency_add ( # gtest # https://github.com/google/googletest.git diff --git a/CMake/CarlaOptions.cmake b/CMake/CarlaOptions.cmake index 673659627..a001426f8 100644 --- a/CMake/CarlaOptions.cmake +++ b/CMake/CarlaOptions.cmake @@ -250,3 +250,18 @@ carla_string_option ( "Target libosmscout git tag." ${CARLA_LIBOSMSCOUT_VERSION} ) + + +# ==== STREETMAP ==== + +carla_string_option ( + CARLA_STREETMAP_VERSION + "Target StreetMap version." + UE5Native +) + +carla_string_option ( + CARLA_STREETMAP_TAG + "Target StreetMap git tag." + ${CARLA_LIBOSMSCOUT_VERSION} +) diff --git a/Configure.py b/Configure.py index b317ce61d..6d3de66e1 100644 --- a/Configure.py +++ b/Configure.py @@ -1385,7 +1385,7 @@ def BuildCarlaUEMain(): if os.name == 'nt': LaunchSubprocessImmediate([ UNREAL_ENGINE_PATH / 'Engine' / 'Build' / 'BatchFiles' / 'Build.bat', - 'CarlaUE4Editor', + 'CarlaUnrealEditor', 'Win64', 'Development', '-WaitMutex', diff --git a/Docs/build_faq.md b/Docs/build_faq.md index 042b27f45..c9a4f4742 100644 --- a/Docs/build_faq.md +++ b/Docs/build_faq.md @@ -386,7 +386,7 @@ CARLA forum > This happens from time to time due to Linux updates. There is a special target in the Makefile for this issue. It takes a long time but fixes the issue: > > make hard-clean -> make CarlaUE4Editor +> make CarlaUnrealEditor diff --git a/Docs/build_system.md b/Docs/build_system.md index c12135bdf..c4d365995 100644 --- a/Docs/build_system.md +++ b/Docs/build_system.md @@ -2,7 +2,7 @@ * [__Setup__](#setup) * [__LibCarla__](#libcarla) -* [__CarlaUE4 and Carla plugin__](#carlaue4-and-carla-plugin) +* [__CarlaUnreal and Carla plugin__](#carlaue4-and-carla-plugin) * [__PythonAPI__](#pythonapi) - [Versions 0.9.12+](#versions-0912) - [Versions prior to 0.9.12](#versions-prior-to-0912) @@ -65,7 +65,7 @@ Both compiled at the same step with Unreal Engine build tool. They require the ` Command ```sh -make CarlaUE4Editor +make CarlaUnrealEditor ``` To launch Unreal Engine's Editor run diff --git a/Jenkinsfile b/Jenkinsfile index cf8b11457..fbf3d8433 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -53,7 +53,7 @@ pipeline { sh 'make LibCarla' sh 'make PythonAPI ARGS="--python-version=3.7,2 --target-wheel-platform=manylinux_2_27_x86_64"' - sh 'make CarlaUE4Editor ARGS="--chrono"' + sh 'make CarlaUnrealEditor ARGS="--chrono"' sh 'make plugins' sh 'make examples' } @@ -262,7 +262,7 @@ pipeline """ bat """ call ../setEnv64.bat - make CarlaUE4Editor ARGS="--chrono" + make CarlaUnrealEditor ARGS="--chrono" """ bat """ call ../setEnv64.bat diff --git a/Makefile b/Makefile index 5faab3686..2a20f7365 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,9 @@ -include Util/BuildTools/Vars.mk -ifeq ($(OS),Windows_NT) -include Util/BuildTools/Windows.mk -else -include Util/BuildTools/Linux.mk -endif +launch PythonAPI LibCarla CarlaUE4Editor CarlaUnrealEditor launch-only: + @echo "MakeFile build is currently disabled." + +# include Util/BuildTools/Vars.mk +# ifeq ($(OS),Windows_NT) +# include Util/BuildTools/Windows.mk +# else +# include Util/BuildTools/Linux.mk +# endif diff --git a/Unreal/CMakeLists.txt b/Unreal/CMakeLists.txt index 85f37034a..0be649fd9 100644 --- a/Unreal/CMakeLists.txt +++ b/Unreal/CMakeLists.txt @@ -24,33 +24,29 @@ set ( ${CARLA_UE_PATH}/CarlaUnreal.uproject ) -add_custom_target ( - carla-ue-generate-project-files - ALL - DEPENDS - carla-server - COMMENT - "Generating Carla UE project files..." +execute_process ( COMMAND ${CARLA_UE_GENERATE_PROJECT_SCRIPT} -project=${CARLA_UE_PROJECT_PATH} -game -engine -makefiles + RESULT_VARIABLE + GENERATE_RPJECT_FILES_RESULT ) -add_custom_target ( - carla-ue-build - ALL - DEPENDS - carla-ue-generate-project-files - COMMENT - "Building Carla UE..." - COMMAND - make -C ${CARLA_UE_PROJECT_PATH} CarlaUE4Editor -) +if (NOT ${GENERATE_RPJECT_FILES_RESULT}) + message ( + FATAL_ERROR + "Could not generate Unreal Engine project files." + ) +endif () file ( MAKE_DIRECTORY ${CARLA_UE_PATH}/Content/Carla/ExportedMaps +) + +add_subdirectory ( + CarlaUnreal ) \ No newline at end of file diff --git a/Util/BuildTools/BuildCarlaUE4.bat b/Util/BuildTools/BuildCarlaUE4.bat index be46f5195..68e9005fb 100644 --- a/Util/BuildTools/BuildCarlaUE4.bat +++ b/Util/BuildTools/BuildCarlaUE4.bat @@ -184,7 +184,7 @@ if %BUILD_UE4_EDITOR% == true ( echo %FILE_N% Building Unreal Editor... call "%UE4_ROOT%Engine\Build\BatchFiles\Build.bat"^ - CarlaUE4Editor^ + CarlaUnrealEditor^ Win64^ Development^ -WaitMutex^ diff --git a/Util/BuildTools/BuildCarlaUE4.sh b/Util/BuildTools/BuildCarlaUE4.sh index cafad2016..51159a9f5 100755 --- a/Util/BuildTools/BuildCarlaUE4.sh +++ b/Util/BuildTools/BuildCarlaUE4.sh @@ -114,7 +114,7 @@ if ${HARD_CLEAN} ; then log "Doing a \"hard\" clean of the Unreal Engine project." - make CarlaUE4Editor ARGS=-clean + make CarlaUnrealEditor ARGS=-clean fi @@ -200,7 +200,7 @@ if ${BUILD_CARLAUE4} ; then fi log "Build CarlaUnreal project." - make CarlaUE4Editor + make CarlaUnrealEditor #Providing the user with the ExportedMaps folder EXPORTED_MAPS="${CARLAUE4_ROOT_FOLDER}/Content/Carla/ExportedMaps" diff --git a/Util/BuildTools/Linux.mk b/Util/BuildTools/Linux.mk index 8e64f7689..ede34c521 100644 --- a/Util/BuildTools/Linux.mk +++ b/Util/BuildTools/Linux.mk @@ -5,18 +5,18 @@ help: launch: LibCarla.server.release osm2odr downloadplugins @${CARLA_BUILD_TOOLS_FOLDER}/BuildUE4Plugins.sh --build $(ARGS) - @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.sh --build --launch $(ARGS) + @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.sh --build --launch $(ARGS) launch-only: - @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.sh --launch $(ARGS) + @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.sh --launch $(ARGS) -import: CarlaUE4Editor PythonAPI +import: CarlaUnrealEditor PythonAPI @${CARLA_BUILD_TOOLS_FOLDER}/Import.sh $(ARGS) -package: CarlaUE4Editor PythonAPI +package: CarlaUnrealEditor PythonAPI @${CARLA_BUILD_TOOLS_FOLDER}/Package.sh $(ARGS) -package.rss: CarlaUE4Editor PythonAPI.rss.rebuild +package.rss: CarlaUnrealEditor PythonAPI.rss.rebuild @${CARLA_BUILD_TOOLS_FOLDER}/Package.sh $(ARGS) docs: @@ -27,23 +27,23 @@ clean.LibCarla: @${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.sh --clean clean.PythonAPI: @${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --clean -clean.CarlaUE4Editor: +clean.CarlaUnrealEditor: @${CARLA_BUILD_TOOLS_FOLDER}/BuildUE4Plugins.sh --clean $(ARGS) - @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.sh --clean + @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.sh --clean clean.osm2odr: @${CARLA_BUILD_TOOLS_FOLDER}/BuildOSM2ODR.sh --clean -clean: clean.CarlaUE4Editor clean.PythonAPI clean.LibCarla clean.osm2odr +clean: clean.CarlaUnrealEditor clean.PythonAPI clean.LibCarla clean.osm2odr rebuild: setup @${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.sh --rebuild @${CARLA_BUILD_TOOLS_FOLDER}/BuildOSM2ODR.sh --rebuild @${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --rebuild $(ARGS) @${CARLA_BUILD_TOOLS_FOLDER}/BuildUE4Plugins.sh --rebuild $(ARGS) - @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.sh --rebuild $(ARGS) + @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.sh --rebuild $(ARGS) hard-clean: @${CARLA_BUILD_TOOLS_FOLDER}/BuildUE4Plugins.sh --clean $(ARGS) - @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.sh --hard-clean + @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.sh --hard-clean @${CARLA_BUILD_TOOLS_FOLDER}/BuildOSM2ODR.sh --clean @${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --clean @${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.sh --clean @@ -83,9 +83,9 @@ examples: run-examples: @for D in ${CARLA_EXAMPLES_FOLDER}/*; do [ -d "$${D}" ] && make -C $${D} run.only; done -CarlaUE4Editor: LibCarla.server.release osm2odr downloadplugins +CarlaUnrealEditor: LibCarla.server.release osm2odr downloadplugins @${CARLA_BUILD_TOOLS_FOLDER}/BuildUE4Plugins.sh --build $(ARGS) - @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.sh --build $(ARGS) + @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.sh --build $(ARGS) .PHONY: PythonAPI PythonAPI: LibCarla.client.release osm2odr diff --git a/Util/BuildTools/Linux.mk.help b/Util/BuildTools/Linux.mk.help index 1dafc4024..b00a78e42 100644 --- a/Util/BuildTools/Linux.mk.help +++ b/Util/BuildTools/Linux.mk.help @@ -71,7 +71,7 @@ for developers: Build (and run) the C++ client examples. - CarlaUE4Editor: + CarlaUnrealEditor: Build CarlaUnreal project, but do not launch the editor. @@ -83,7 +83,7 @@ for developers: Build LibCarla, "Server" and/or "Client" configurations. - clean.(LibCarla|PythonAPI|CarlaUE4Editor) + clean.(LibCarla|PythonAPI|CarlaUnrealEditor) Remove intermediate build files for the specific module. diff --git a/Util/BuildTools/Package.bat b/Util/BuildTools/Package.bat index 86e59fceb..617983e6e 100644 --- a/Util/BuildTools/Package.bat +++ b/Util/BuildTools/Package.bat @@ -129,7 +129,7 @@ if %DO_PACKAGE%==true ( if not exist "!BUILD_FOLDER!" mkdir "!BUILD_FOLDER!" call "%UE4_ROOT%\Engine\Build\BatchFiles\Build.bat"^ - CarlaUE4Editor^ + CarlaUnrealEditor^ Win64^ Development^ -WaitMutex^ @@ -457,7 +457,7 @@ rem ============================================================================ :error_build_editor echo. - echo %FILE_N% [ERROR] There was a problem while building the CarlaUE4Editor. + echo %FILE_N% [ERROR] There was a problem while building the CarlaUnrealEditor. echo [ERROR] Please read the screen log for more information. goto bad_exit diff --git a/Util/BuildTools/Windows.mk b/Util/BuildTools/Windows.mk index 1728f1a72..6c358b36d 100644 --- a/Util/BuildTools/Windows.mk +++ b/Util/BuildTools/Windows.mk @@ -16,17 +16,17 @@ help: import: server @"${CARLA_BUILD_TOOLS_FOLDER}/Import.py" $(ARGS) -CarlaUE4Editor: LibCarla osm2odr - @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --build $(ARGS) +CarlaUnrealEditor: LibCarla osm2odr + @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.bat" --build $(ARGS) -launch: CarlaUE4Editor - @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --launch $(ARGS) +launch: CarlaUnrealEditor + @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.bat" --launch $(ARGS) launch-only: - @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --launch $(ARGS) + @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.bat" --launch $(ARGS) package: PythonAPI - @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --at-least-write-optionalmodules $(ARGS) + @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.bat" --at-least-write-optionalmodules $(ARGS) @"${CARLA_BUILD_TOOLS_FOLDER}/Package.bat" --ue-version 4.26 $(ARGS) .PHONY: docs @@ -40,13 +40,13 @@ PythonAPI.docs: clean: @"${CARLA_BUILD_TOOLS_FOLDER}/Package.bat" --clean --ue-version 4.26 - @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --clean + @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.bat" --clean @"${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.bat" --clean @"${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.bat" --clean @"${CARLA_BUILD_TOOLS_FOLDER}/BuildOSM2ODR.bat" --clean rebuild: setup - @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --rebuild + @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.bat" --rebuild @"${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.bat" --rebuild @"${CARLA_BUILD_TOOLS_FOLDER}/BuildOSM2ODR.bat" --rebuild @"${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.bat" --rebuild diff --git a/Util/CARLA.sublime-project b/Util/CARLA.sublime-project index 46d555bca..fe91c30cd 100644 --- a/Util/CARLA.sublime-project +++ b/Util/CARLA.sublime-project @@ -59,13 +59,13 @@ "build_systems": [ { - "name": "CARLA - make CarlaUE4Editor", + "name": "CARLA - make CarlaUnrealEditor", "working_dir": "${project_path}/..", "file_regex": "(Unreal\\/CarlaUnreal\\/[^:]*):([0-9]+):?([0-9]+)?:? (.*)$", "syntax": "Packages/Makefile/Make Output.sublime-syntax", "linux": { - "shell_cmd": "CARLA_BUILD_NO_COLOR=true make CarlaUE4Editor" + "shell_cmd": "CARLA_BUILD_NO_COLOR=true make CarlaUnrealEditor" } }, { diff --git a/Util/Docker/Carla.Dockerfile b/Util/Docker/Carla.Dockerfile index 65f5d67dd..a7982a3a7 100644 --- a/Util/Docker/Carla.Dockerfile +++ b/Util/Docker/Carla.Dockerfile @@ -10,7 +10,7 @@ RUN cd /home/carla/ && \ else git clone --depth 1 --branch $GIT_BRANCH https://github.com/carla-simulator/carla.git; fi && \ cd /home/carla/carla && \ ./Update.sh && \ - make CarlaUE4Editor && \ + make CarlaUnrealEditor && \ make PythonAPI && \ make build.utils && \ make package && \ From fefe396ec310b21385796f9613578fb5d3494935 Mon Sep 17 00:00:00 2001 From: Marcel Pi Date: Wed, 6 Mar 2024 16:35:20 +0100 Subject: [PATCH 4/9] More renames + add StreetMap gitignore. --- Unreal/CarlaUnreal/Plugins/.gitignore | 1 + .../Source/{CarlaUE4.Target.cs => CarlaUnreal.Target.cs} | 0 .../Source/{CarlaUE4 => CarlaUnreal}/CarlaUE4.Build.cs | 0 Unreal/CarlaUnreal/Source/{CarlaUE4 => CarlaUnreal}/CarlaUE4.cpp | 0 Unreal/CarlaUnreal/Source/{CarlaUE4 => CarlaUnreal}/CarlaUE4.h | 0 .../{CarlaUE4Editor.Target.cs => CarlaUnrealEditor.Target.cs} | 0 6 files changed, 1 insertion(+) create mode 100644 Unreal/CarlaUnreal/Plugins/.gitignore rename Unreal/CarlaUnreal/Source/{CarlaUE4.Target.cs => CarlaUnreal.Target.cs} (100%) rename Unreal/CarlaUnreal/Source/{CarlaUE4 => CarlaUnreal}/CarlaUE4.Build.cs (100%) rename Unreal/CarlaUnreal/Source/{CarlaUE4 => CarlaUnreal}/CarlaUE4.cpp (100%) rename Unreal/CarlaUnreal/Source/{CarlaUE4 => CarlaUnreal}/CarlaUE4.h (100%) rename Unreal/CarlaUnreal/Source/{CarlaUE4Editor.Target.cs => CarlaUnrealEditor.Target.cs} (100%) diff --git a/Unreal/CarlaUnreal/Plugins/.gitignore b/Unreal/CarlaUnreal/Plugins/.gitignore new file mode 100644 index 000000000..91cc76f3e --- /dev/null +++ b/Unreal/CarlaUnreal/Plugins/.gitignore @@ -0,0 +1 @@ +StreetMap/ \ No newline at end of file diff --git a/Unreal/CarlaUnreal/Source/CarlaUE4.Target.cs b/Unreal/CarlaUnreal/Source/CarlaUnreal.Target.cs similarity index 100% rename from Unreal/CarlaUnreal/Source/CarlaUE4.Target.cs rename to Unreal/CarlaUnreal/Source/CarlaUnreal.Target.cs diff --git a/Unreal/CarlaUnreal/Source/CarlaUE4/CarlaUE4.Build.cs b/Unreal/CarlaUnreal/Source/CarlaUnreal/CarlaUE4.Build.cs similarity index 100% rename from Unreal/CarlaUnreal/Source/CarlaUE4/CarlaUE4.Build.cs rename to Unreal/CarlaUnreal/Source/CarlaUnreal/CarlaUE4.Build.cs diff --git a/Unreal/CarlaUnreal/Source/CarlaUE4/CarlaUE4.cpp b/Unreal/CarlaUnreal/Source/CarlaUnreal/CarlaUE4.cpp similarity index 100% rename from Unreal/CarlaUnreal/Source/CarlaUE4/CarlaUE4.cpp rename to Unreal/CarlaUnreal/Source/CarlaUnreal/CarlaUE4.cpp diff --git a/Unreal/CarlaUnreal/Source/CarlaUE4/CarlaUE4.h b/Unreal/CarlaUnreal/Source/CarlaUnreal/CarlaUE4.h similarity index 100% rename from Unreal/CarlaUnreal/Source/CarlaUE4/CarlaUE4.h rename to Unreal/CarlaUnreal/Source/CarlaUnreal/CarlaUE4.h diff --git a/Unreal/CarlaUnreal/Source/CarlaUE4Editor.Target.cs b/Unreal/CarlaUnreal/Source/CarlaUnrealEditor.Target.cs similarity index 100% rename from Unreal/CarlaUnreal/Source/CarlaUE4Editor.Target.cs rename to Unreal/CarlaUnreal/Source/CarlaUnrealEditor.Target.cs From d72dd89db457174e87b8a1eea31ed35374304a3c Mon Sep 17 00:00:00 2001 From: Marcel Pi Date: Wed, 6 Mar 2024 17:20:13 +0100 Subject: [PATCH 5/9] More Ubuntu build progress... --- CMake/CarlaOptions.cmake | 4 +- CMakeLists.txt | 10 ---- Makefile | 2 +- PythonAPI/CMakeLists.txt | 3 +- Unreal/CMakeLists.txt | 49 +++++++++++++----- Unreal/CarlaUnreal/.gitignore | 1 + .../{CarlaUE4.png => CarlaUnreal.png} | Bin ...CarlaUE4.uproject => CarlaUnreal.uproject} | 0 .../Content/Python/generate_tile.py | 2 +- .../CarlaUnreal/Source/CarlaUnreal.Target.cs | 4 +- ...CarlaUE4.Build.cs => CarlaUnreal.Build.cs} | 0 .../{CarlaUE4.cpp => CarlaUnreal.cpp} | 0 .../CarlaUnreal/{CarlaUE4.h => CarlaUnreal.h} | 0 .../Source/CarlaUnrealEditor.Target.cs | 4 +- 14 files changed, 46 insertions(+), 33 deletions(-) rename Unreal/CarlaUnreal/{CarlaUE4.png => CarlaUnreal.png} (100%) rename Unreal/CarlaUnreal/{CarlaUE4.uproject => CarlaUnreal.uproject} (100%) rename Unreal/CarlaUnreal/Source/CarlaUnreal/{CarlaUE4.Build.cs => CarlaUnreal.Build.cs} (100%) rename Unreal/CarlaUnreal/Source/CarlaUnreal/{CarlaUE4.cpp => CarlaUnreal.cpp} (100%) rename Unreal/CarlaUnreal/Source/CarlaUnreal/{CarlaUE4.h => CarlaUnreal.h} (100%) diff --git a/CMake/CarlaOptions.cmake b/CMake/CarlaOptions.cmake index a001426f8..6bb5ed422 100644 --- a/CMake/CarlaOptions.cmake +++ b/CMake/CarlaOptions.cmake @@ -257,11 +257,11 @@ carla_string_option ( carla_string_option ( CARLA_STREETMAP_VERSION "Target StreetMap version." - UE5Native + ue5.3 ) carla_string_option ( CARLA_STREETMAP_TAG "Target StreetMap git tag." - ${CARLA_LIBOSMSCOUT_VERSION} + ${CARLA_STREETMAP_VERSION} ) diff --git a/CMakeLists.txt b/CMakeLists.txt index 36c9e7f12..1815701af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,13 +114,3 @@ endif () if (BUILD_CARLA_UE) add_subdirectory (Unreal) endif () - -carla_two_step_configure_file ( - ${CARLA_WORKSPACE_PATH}/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Carla.Build.cs - ${CARLA_WORKSPACE_PATH}/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Carla.Build.cs.in -) - -carla_two_step_configure_file ( - ${CARLA_WORKSPACE_PATH}/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs - ${CARLA_WORKSPACE_PATH}/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs.in -) diff --git a/Makefile b/Makefile index 2a20f7365..789e9446b 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -launch PythonAPI LibCarla CarlaUE4Editor CarlaUnrealEditor launch-only: +launch PythonAPI LibCarla CarlaUnrealEditor CarlaUnrealEditor launch-only: @echo "MakeFile build is currently disabled." # include Util/BuildTools/Vars.mk diff --git a/PythonAPI/CMakeLists.txt b/PythonAPI/CMakeLists.txt index b2bf4bca6..8012af050 100644 --- a/PythonAPI/CMakeLists.txt +++ b/PythonAPI/CMakeLists.txt @@ -81,7 +81,6 @@ target_compile_definitions ( ${CARLA_COMMON_DEFINITIONS} ${CARLA_RTTI_DEFINITIONS} BOOST_ALL_NO_LIB - BOOST_PYTHON_STATIC_LINK LIBCARLA_WITH_PYTHON_SUPPORT ) @@ -101,6 +100,8 @@ endif () add_custom_target ( carla-python-api-symlink ALL + COMMENT + "Creating CARLA PythonAPI .PYD/.SO symlink..." COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${PYTHON_API_PATH}/examples/carla${PYD_EXT} ) diff --git a/Unreal/CMakeLists.txt b/Unreal/CMakeLists.txt index 0be649fd9..3e1d8a472 100644 --- a/Unreal/CMakeLists.txt +++ b/Unreal/CMakeLists.txt @@ -19,34 +19,55 @@ set ( ${CARLA_WORKSPACE_PATH}/Unreal/CarlaUnreal ) +set ( + CARLA_UE_PLUGINS_PATH + ${CARLA_UE_PATH}/Plugins +) + set ( CARLA_UE_PROJECT_PATH ${CARLA_UE_PATH}/CarlaUnreal.uproject ) -execute_process ( +carla_two_step_configure_file ( + ${CARLA_UE_PLUGINS_PATH}/Carla/Source/Carla/Carla.Build.cs + ${CARLA_UE_PLUGINS_PATH}/Carla/Source/Carla/Carla.Build.cs.in +) + +carla_two_step_configure_file ( + ${CARLA_UE_PLUGINS_PATH}/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs + ${CARLA_UE_PLUGINS_PATH}/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs.in +) + +add_custom_target ( + carla-ue-generate-project-files + ALL + COMMENT + "Generating UE project files for CARLA..." COMMAND ${CARLA_UE_GENERATE_PROJECT_SCRIPT} -project=${CARLA_UE_PROJECT_PATH} -game -engine - -makefiles - RESULT_VARIABLE - GENERATE_RPJECT_FILES_RESULT + -CMakefile ) -if (NOT ${GENERATE_RPJECT_FILES_RESULT}) - message ( - FATAL_ERROR - "Could not generate Unreal Engine project files." - ) -endif () +add_custom_target ( + carla-ue-build + ALL + DEPENDS + carla-ue-generate-project-files + COMMENT + "Building CARLA UE..." + COMMAND + ${CMAKE_COMMAND} + -S ${CARLA_UE_PATH} + -B ${CMAKE_CURRENT_BINARY_DIR} + -G ${CMAKE_GENERATOR} + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} +) file ( MAKE_DIRECTORY ${CARLA_UE_PATH}/Content/Carla/ExportedMaps -) - -add_subdirectory ( - CarlaUnreal ) \ No newline at end of file diff --git a/Unreal/CarlaUnreal/.gitignore b/Unreal/CarlaUnreal/.gitignore index c89859c25..84318b7a7 100644 --- a/Unreal/CarlaUnreal/.gitignore +++ b/Unreal/CarlaUnreal/.gitignore @@ -21,5 +21,6 @@ Config/CarSimConfig.ini *.code-workspace .idea .vscode +.ignore CMakeLists.txt Makefile diff --git a/Unreal/CarlaUnreal/CarlaUE4.png b/Unreal/CarlaUnreal/CarlaUnreal.png similarity index 100% rename from Unreal/CarlaUnreal/CarlaUE4.png rename to Unreal/CarlaUnreal/CarlaUnreal.png diff --git a/Unreal/CarlaUnreal/CarlaUE4.uproject b/Unreal/CarlaUnreal/CarlaUnreal.uproject similarity index 100% rename from Unreal/CarlaUnreal/CarlaUE4.uproject rename to Unreal/CarlaUnreal/CarlaUnreal.uproject diff --git a/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/Python/generate_tile.py b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/Python/generate_tile.py index e68a03b11..e24c77534 100644 --- a/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/Python/generate_tile.py +++ b/Unreal/CarlaUnreal/Plugins/CarlaTools/Content/Python/generate_tile.py @@ -8,7 +8,7 @@ import subprocess """Generic function for running a commandlet with its arguments.""" ue4_path = os.environ["UE4_ROOT"] -uproject_path = unreal.Paths.project_dir() + ("CarlaUE4.uproject") +uproject_path = unreal.Paths.project_dir() + ("CarlaUnreal.uproject") run = "-run=%s" % ("GenerateTileCommandlet") print("Before any Commandlet:") diff --git a/Unreal/CarlaUnreal/Source/CarlaUnreal.Target.cs b/Unreal/CarlaUnreal/Source/CarlaUnreal.Target.cs index 7d88f0427..e7687e1f9 100644 --- a/Unreal/CarlaUnreal/Source/CarlaUnreal.Target.cs +++ b/Unreal/CarlaUnreal/Source/CarlaUnreal.Target.cs @@ -4,7 +4,7 @@ using UnrealBuildTool; using System; using EpicGames.Core; -public class CarlaUE4Target : TargetRules +public class CarlaUnrealTarget : TargetRules { [CommandLine("-unity-build")] bool EnableUnityBuild = true; @@ -15,7 +15,7 @@ public class CarlaUE4Target : TargetRules Console.WriteLine(string.Format("{0} is {1}.", name, state)); } - public CarlaUE4Target(TargetInfo Target) : + public CarlaUnrealTarget(TargetInfo Target) : base(Target) { DefaultBuildSettings = BuildSettingsVersion.Latest; diff --git a/Unreal/CarlaUnreal/Source/CarlaUnreal/CarlaUE4.Build.cs b/Unreal/CarlaUnreal/Source/CarlaUnreal/CarlaUnreal.Build.cs similarity index 100% rename from Unreal/CarlaUnreal/Source/CarlaUnreal/CarlaUE4.Build.cs rename to Unreal/CarlaUnreal/Source/CarlaUnreal/CarlaUnreal.Build.cs diff --git a/Unreal/CarlaUnreal/Source/CarlaUnreal/CarlaUE4.cpp b/Unreal/CarlaUnreal/Source/CarlaUnreal/CarlaUnreal.cpp similarity index 100% rename from Unreal/CarlaUnreal/Source/CarlaUnreal/CarlaUE4.cpp rename to Unreal/CarlaUnreal/Source/CarlaUnreal/CarlaUnreal.cpp diff --git a/Unreal/CarlaUnreal/Source/CarlaUnreal/CarlaUE4.h b/Unreal/CarlaUnreal/Source/CarlaUnreal/CarlaUnreal.h similarity index 100% rename from Unreal/CarlaUnreal/Source/CarlaUnreal/CarlaUE4.h rename to Unreal/CarlaUnreal/Source/CarlaUnreal/CarlaUnreal.h diff --git a/Unreal/CarlaUnreal/Source/CarlaUnrealEditor.Target.cs b/Unreal/CarlaUnreal/Source/CarlaUnrealEditor.Target.cs index 46dce32c5..9b8d7d1b1 100644 --- a/Unreal/CarlaUnreal/Source/CarlaUnrealEditor.Target.cs +++ b/Unreal/CarlaUnreal/Source/CarlaUnrealEditor.Target.cs @@ -4,7 +4,7 @@ using UnrealBuildTool; using System; using EpicGames.Core; -public class CarlaUE4EditorTarget : TargetRules +public class CarlaUnrealEditorTarget : TargetRules { [CommandLine("-unity-build")] bool EnableUnityBuild = true; @@ -15,7 +15,7 @@ public class CarlaUE4EditorTarget : TargetRules Console.WriteLine(string.Format("{0} is {1}.", name, state)); } - public CarlaUE4EditorTarget(TargetInfo Target) : + public CarlaUnrealEditorTarget(TargetInfo Target) : base(Target) { DefaultBuildSettings = BuildSettingsVersion.Latest; From ccb5d98d26f4f1fe07018eb13ca3745bb7b1ad7d Mon Sep 17 00:00:00 2001 From: Marcel Pi Date: Thu, 7 Mar 2024 17:11:15 +0100 Subject: [PATCH 6/9] Add Linux Toolchain file. --- CMake/CarlaDependencies.cmake | 42 +- CMake/CarlaOptions.cmake | 1 - CMake/LinuxToolchain.cmake | 156 +++++++ CMakeLists.txt | 26 +- LibCarla/CMakeLists.txt | 571 ++++++++++++-------------- LibCarla/source/carla/geom/Vector3D.h | 2 +- PythonAPI/CMakeLists.txt | 38 +- Unreal/CMakeLists.txt | 55 ++- 8 files changed, 528 insertions(+), 363 deletions(-) create mode 100644 CMake/LinuxToolchain.cmake diff --git a/CMake/CarlaDependencies.cmake b/CMake/CarlaDependencies.cmake index d806a138f..60f60e601 100644 --- a/CMake/CarlaDependencies.cmake +++ b/CMake/CarlaDependencies.cmake @@ -48,7 +48,7 @@ target_link_libraries ( set (CARLA_DEPENDENCIES) macro (carla_dependency_add NAME URL TAG) - message ("Fetching ${NAME}...") + message ("Downloading+building ${NAME}...") FetchContent_Declare( ${NAME} GIT_SUBMODULES_RECURSE ON @@ -69,12 +69,12 @@ macro (carla_dependencies_make_available) endmacro () macro (carla_fetchcontent_option NAME VALUE) - set (${NAME} ${VALUE} CACHE INTERNAL "") + set (${NAME} ${VALUE}) endmacro () -set (ZLIB_BUILD_EXAMPLES OFF) +carla_fetchcontent_option (ZLIB_BUILD_EXAMPLES OFF) carla_dependency_add ( zlib https://github.com/madler/zlib.git @@ -83,17 +83,17 @@ carla_dependency_add ( carla_dependencies_make_available () include_directories (${zlib_SOURCE_DIR} ${zlib_BINARY_DIR}) # HACK -set (PNG_TESTS OFF) -set (PNG_SHARED OFF) -set (PNG_TOOLS OFF) -set (PNG_BUILD_ZLIB ON) +carla_fetchcontent_option (PNG_TESTS OFF) +carla_fetchcontent_option (PNG_SHARED OFF) +carla_fetchcontent_option (PNG_TOOLS OFF) +carla_fetchcontent_option (PNG_BUILD_ZLIB ON) if (WIN32) - set (ZLIB_LIBRARY ${zlib_BINARY_DIR}/zlibstatic${CARLA_DEBUG_AFFIX}.lib) + carla_fetchcontent_option (ZLIB_LIBRARY ${zlib_BINARY_DIR}/zlibstatic${CARLA_DEBUG_AFFIX}.lib) else () - set (ZLIB_LIBRARY ${zlib_BINARY_DIR}/libz.a) + carla_fetchcontent_option (ZLIB_LIBRARY ${zlib_BINARY_DIR}/libz.a) endif () -set (ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR} ${zlib_BINARY_DIR}) -set (ZLIB_LIBRARIES ${ZLIB_LIBRARY}) +carla_fetchcontent_option (ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR} ${zlib_BINARY_DIR}) +carla_fetchcontent_option (ZLIB_LIBRARIES ${ZLIB_LIBRARY}) carla_dependency_add ( libpng https://github.com/glennrp/libpng.git @@ -104,19 +104,22 @@ include_directories (${libpng_SOURCE_DIR} ${libpng_BINARY_DIR}) # HACK +carla_fetchcontent_option (BOOST_ENABLE_MPI OFF) +carla_fetchcontent_option (BOOST_LOCALE_WITH_ICU OFF) +carla_fetchcontent_option (BOOST_LOCALE_WITH_ICONV OFF) +carla_fetchcontent_option (BOOST_EXCLUDE_LIBRARIES "iostreams;locale;fiber;log") if (BUILD_PYTHON_API) - set (BOOST_ENABLE_PYTHON ${BUILD_PYTHON_API}) +carla_fetchcontent_option (BOOST_ENABLE_PYTHON ${BUILD_PYTHON_API}) endif () - carla_dependency_add ( boost https://github.com/boostorg/boost.git ${CARLA_BOOST_TAG} ) -set (EIGEN_BUILD_PKGCONFIG OFF) -set (BUILD_TESTING OFF) -set (EIGEN_BUILD_DOC OFF) +carla_fetchcontent_option (EIGEN_BUILD_PKGCONFIG OFF) +carla_fetchcontent_option (BUILD_TESTING OFF) +carla_fetchcontent_option (EIGEN_BUILD_DOC OFF) carla_dependency_add ( eigen https://gitlab.com/libeigen/eigen.git @@ -129,6 +132,7 @@ carla_dependency_add ( ${CARLA_RPCLIB_TAG} ) +carla_fetchcontent_option (RECASTNAVIGATION_BUILDER OFF) carla_dependency_add ( recastnavigation https://github.com/carla-simulator/recastnavigation.git @@ -136,9 +140,9 @@ carla_dependency_add ( ) if (ENABLE_OSM2ODR) - set (BUILD_TESTING OFF) - set (ENABLE_TIFF OFF) - set (ENABLE_CURL OFF) + carla_fetchcontent_option (BUILD_TESTING OFF) + carla_fetchcontent_option (ENABLE_TIFF OFF) + carla_fetchcontent_option (ENABLE_CURL OFF) carla_dependency_add ( proj https://github.com/OSGeo/PROJ.git diff --git a/CMake/CarlaOptions.cmake b/CMake/CarlaOptions.cmake index 6bb5ed422..042906a60 100644 --- a/CMake/CarlaOptions.cmake +++ b/CMake/CarlaOptions.cmake @@ -4,7 +4,6 @@ endmacro () # ==== Common target flags ==== -set (BUILD_SHARED_LIBS OFF) set (CMAKE_POSITION_INDEPENDENT_CODE ON) option ( diff --git a/CMake/LinuxToolchain.cmake b/CMake/LinuxToolchain.cmake new file mode 100644 index 000000000..ff4eb0d31 --- /dev/null +++ b/CMake/LinuxToolchain.cmake @@ -0,0 +1,156 @@ +set (UE_ROOT /home/marcel/CarlaUnrealEngine5) + +# set (UE_ROOT ${CARLA_UNREAL_ENGINE_PATH} CACHE PATH "") +message ("UE_ROOT=${UE_ROOT}") + +set (ARCH ${CMAKE_HOST_SYSTEM_PROCESSOR}) + +if (${ARCH} STREQUAL "x86_64") + set (CMAKE_SYSTEM_PROCESSOR x86_64 CACHE STRING "") + set (TARGET_TRIPLE "x86_64-unknown-linux-gnu" CACHE STRING "") +elseif (${ARCH} STREQUAL "aarch64") + set (CMAKE_SYSTEM_PROCESSOR aarch64 CACHE STRING "") + set (TARGET_TRIPLE "aarch64-unknown-linux-gnueabi" CACHE STRING "") +endif() + +set ( + UE_SYSROOT + ${UE_ROOT}/Engine/Extras/ThirdPartyNotUE/SDKs/HostLinux/Linux_x64/v22_clang-16.0.6-centos7/${TARGET_TRIPLE} + CACHE PATH "" +) + +set ( + UE_THIRD_PARTY + ${UE_ROOT}/Engine/Source/ThirdParty CACHE PATH "" +) + +set ( + UE_INCLUDE + ${UE_THIRD_PARTY}/Unix/LibCxx/include CACHE PATH "" +) + +set ( + UE_LIBS + ${UE_THIRD_PARTY}/Unix/LibCxx/lib/Unix/${TARGET_TRIPLE} CACHE PATH "" +) + +add_compile_options ( + -fms-extensions + -fno-math-errno + -fdiagnostics-absolute-paths + $<$:-stdlib=libc++> +) + +add_link_options (-stdlib=libc++ -L${UE_LIBS} ) + +set ( + CMAKE_AR + ${UE_SYSROOT}/bin/llvm-ar + CACHE FILEPATH "" +) + +set ( + CMAKE_ASM_COMPILER + ${UE_SYSROOT}/bin/clang + CACHE FILEPATH "" +) + +set ( + CMAKE_C_COMPILER + ${UE_SYSROOT}/bin/clang + CACHE FILEPATH "" +) + +set ( + CMAKE_C_COMPILER_AR + ${UE_SYSROOT}/bin/llvm-ar + CACHE FILEPATH "" +) + +set ( + CMAKE_CXX_COMPILER + ${UE_SYSROOT}/bin/clang++ + CACHE FILEPATH "" +) + +set ( + CMAKE_CXX_COMPILER_AR + ${UE_SYSROOT}/bin/llvm-ar + CACHE FILEPATH "" +) + +set ( + CMAKE_OBJCOPY + ${UE_SYSROOT}/bin/llvm-objcopy + CACHE FILEPATH "" +) + +set ( + CMAKE_ADDR2LINE + ${UE_SYSROOT}/bin/${TARGET_TRIPLE}-addr2line + CACHE FILEPATH "" +) + +set ( + CMAKE_C_COMPILER_RANLIB + ${UE_SYSROOT}/bin/${TARGET_TRIPLE}-ranlib + CACHE FILEPATH "" +) + +set ( + CMAKE_CXX_COMPILER_RANLIB + ${UE_SYSROOT}/bin/${TARGET_TRIPLE}-ranlib + CACHE FILEPATH "" +) + +set ( + CMAKE_LINKER + ${UE_SYSROOT}/bin/${TARGET_TRIPLE}-ld + CACHE FILEPATH "" +) + +set ( + CMAKE_NM + ${UE_SYSROOT}/bin/${TARGET_TRIPLE}-nm + CACHE FILEPATH "" +) + +set ( + CMAKE_OBJDUMP + ${UE_SYSROOT}/bin/${TARGET_TRIPLE}-objdump + CACHE FILEPATH "" +) + +set ( + CMAKE_RANLIB + ${UE_SYSROOT}/bin/${TARGET_TRIPLE}-ranlib + CACHE FILEPATH "" +) + +set ( + CMAKE_READELF + ${UE_SYSROOT}/bin/${TARGET_TRIPLE}-readelf + CACHE FILEPATH "" +) + +set ( + CMAKE_STRIP + ${UE_SYSROOT}/bin/${TARGET_TRIPLE}-strip + CACHE FILEPATH "" +) + +set ( + COVERAGE_COMMAND + ${UE_SYSROOT}/bin/${TARGET_TRIPLE}-gcov + CACHE FILEPATH "" +) + +set ( + CMAKE_CXX_STANDARD_LIBRARIES + "${UE_LIBS}/libc++.a ${UE_LIBS}/libc++abi.a" +) + +set ( + CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES + ${UE_INCLUDE} ${UE_INCLUDE}/c++/v1 +) \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 1815701af..332d8e670 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.20.0) +cmake_minimum_required (VERSION 3.28.0) cmake_policy (SET CMP0097 NEW) cmake_policy (SET CMP0091 NEW) @@ -41,6 +41,15 @@ set ( ${CARLA_WORKSPACE_PATH}/Unreal/CarlaUnreal/Plugins ) +if (NOT WIN32) + set (THREADS_PREFER_PTHREAD_FLAG ON) + set (CMAKE_THREADS_PREFER_PTHREAD_FLAG ON) + find_package ( + Threads + REQUIRED + ) +endif () + include (CheckCCompilerFlag) include (CheckCXXCompilerFlag) include (${CARLA_WORKSPACE_PATH}/CMake/CarlaOptions.cmake) @@ -53,17 +62,6 @@ macro (carla_two_step_configure_file DESTINATION SOURCE) file (GENERATE OUTPUT ${DESTINATION} INPUT ${DESTINATION}) endmacro () -set ( - CMAKE_INSTALL_PREFIX - ${CARLA_DEPENDENCIES_INSTALL_PREFIX} -) - -if (WIN32) - set (LIB_EXT .lib) -else () - set (LIB_EXT .a) -endif () - if (WIN32) if (CMAKE_BUILD_TYPE STREQUAL "Debug") set (CARLA_DEBUG_AFFIX d) @@ -97,7 +95,9 @@ else () list (APPEND CARLA_EXCEPTION_DEFINITIONS PUGIXML_NO_EXCEPTIONS) endif () -include (${CARLA_WORKSPACE_PATH}/CMake/CarlaDependencies.cmake) +include ( + ${CARLA_WORKSPACE_PATH}/CMake/CarlaDependencies.cmake +) if (BUILD_CARLA_CLIENT OR BUILD_CARLA_SERVER) add_subdirectory (LibCarla) diff --git a/LibCarla/CMakeLists.txt b/LibCarla/CMakeLists.txt index 79fd20f71..947182be0 100644 --- a/LibCarla/CMakeLists.txt +++ b/LibCarla/CMakeLists.txt @@ -22,337 +22,302 @@ endif () if (BUILD_CARLA_SERVER) - project ( - carla-server - LANGUAGES CXX - VERSION ${CARLA_VERSION} - ) + project ( + carla-server + LANGUAGES CXX + VERSION ${CARLA_VERSION} + ) + file ( + GLOB + LIBCARLA_SERVER_SOURCES + ${LIBCARLA_SOURCE_PATH}/carla/Buffer.cpp + ${LIBCARLA_SOURCE_PATH}/carla/Exception.cpp + ${LIBCARLA_SOURCE_PATH}/carla/geom/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/opendrive/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/opendrive/parser/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/road/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/road/element/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/road/general/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/road/object/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/road/signal/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/rpc/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/sensor/s11n/SensorHeaderSerializer.cpp + ${LIBCARLA_SOURCE_PATH}/carla/streaming/detail/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/streaming/detail/tcp/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/multigpu/*.cpp + ) + if (ENABLE_ROS2) file ( - GLOB - LIBCARLA_SERVER_SOURCES - ${LIBCARLA_SOURCE_PATH}/carla/Buffer.cpp - ${LIBCARLA_SOURCE_PATH}/carla/Exception.cpp - ${LIBCARLA_SOURCE_PATH}/carla/geom/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/opendrive/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/opendrive/parser/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/road/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/road/element/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/road/general/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/road/object/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/road/signal/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/rpc/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/sensor/s11n/SensorHeaderSerializer.cpp - ${LIBCARLA_SOURCE_PATH}/carla/streaming/detail/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/streaming/detail/tcp/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/multigpu/*.cpp + GLOB + LIBCARLA_SERVER_SOURCES_ROS2 + ${LIBCARLA_SOURCE_PATH}/carla/ros2/*.cpp ) + list ( + APPEND + LIBCARLA_SERVER_SOURCES + ${LIBCARLA_SERVER_SOURCES_ROS2} + ) + endif () - if (ENABLE_ROS2) - file ( - GLOB - LIBCARLA_SERVER_SOURCES_ROS2 - ${LIBCARLA_SOURCE_PATH}/carla/ros2/*.cpp - ) - list ( - APPEND - LIBCARLA_SERVER_SOURCES - ${LIBCARLA_SERVER_SOURCES_ROS2} - ) - endif () + file ( + GLOB + LIBCARLA_SERVER_SOURCES_THIRD_PARTY + ${LIBCARLA_THIRD_PARTY_SOURCE_PATH}/odrSpiral/*.cpp + ${LIBCARLA_THIRD_PARTY_SOURCE_PATH}/moodycamel/*.cpp + ${LIBCARLA_THIRD_PARTY_SOURCE_PATH}/pugixml/*.cpp + ) + file ( + GLOB + LIBCARLA_SERVER_HEADERS + ${LIBCARLA_SOURCE_PATH}/carla/*.h + ${LIBCARLA_SOURCE_PATH}/carla/geom/*.h + ${LIBCARLA_SOURCE_PATH}/carla/opendrive/*.h + ${LIBCARLA_SOURCE_PATH}/carla/opendrive/parser/*.h + ${LIBCARLA_SOURCE_PATH}/carla/road/*.h + ${LIBCARLA_SOURCE_PATH}/carla/road/element/*.h + ${LIBCARLA_SOURCE_PATH}/carla/road/general/*.h + ${LIBCARLA_SOURCE_PATH}/carla/road/object/*.h + ${LIBCARLA_SOURCE_PATH}/carla/road/signal/*.h + ${LIBCARLA_SOURCE_PATH}/carla/rpc/*.h + ${LIBCARLA_SOURCE_PATH}/carla/sensor/*.h + ${LIBCARLA_SOURCE_PATH}/carla/sensor/s11n/*.h + ${LIBCARLA_SOURCE_PATH}/carla/streaming/*.h + ${LIBCARLA_SOURCE_PATH}/carla/streaming/detail/*.h + ${LIBCARLA_SOURCE_PATH}/carla/streaming/low_level/*.h + ${LIBCARLA_SOURCE_PATH}/carla/multigpu/*.h + ${LIBCARLA_SOURCE_PATH}/compiler/*.h + ) + + if (ENABLE_ROS2) file ( - GLOB - LIBCARLA_SERVER_SOURCES_THIRD_PARTY - ${LIBCARLA_THIRD_PARTY_SOURCE_PATH}/odrSpiral/*.cpp - ${LIBCARLA_THIRD_PARTY_SOURCE_PATH}/moodycamel/*.cpp - ${LIBCARLA_THIRD_PARTY_SOURCE_PATH}/pugixml/*.cpp + GLOB + LIBCARLA_SERVER_HEADERS_ROS2 + ${LIBCARLA_SOURCE_PATH}/carla/ros2/*.h ) - - file ( - GLOB - LIBCARLA_SERVER_HEADERS - ${LIBCARLA_SOURCE_PATH}/carla/*.h - ${LIBCARLA_SOURCE_PATH}/carla/geom/*.h - ${LIBCARLA_SOURCE_PATH}/carla/opendrive/*.h - ${LIBCARLA_SOURCE_PATH}/carla/opendrive/parser/*.h - ${LIBCARLA_SOURCE_PATH}/carla/road/*.h - ${LIBCARLA_SOURCE_PATH}/carla/road/element/*.h - ${LIBCARLA_SOURCE_PATH}/carla/road/general/*.h - ${LIBCARLA_SOURCE_PATH}/carla/road/object/*.h - ${LIBCARLA_SOURCE_PATH}/carla/road/signal/*.h - ${LIBCARLA_SOURCE_PATH}/carla/rpc/*.h - ${LIBCARLA_SOURCE_PATH}/carla/sensor/*.h - ${LIBCARLA_SOURCE_PATH}/carla/sensor/s11n/*.h - ${LIBCARLA_SOURCE_PATH}/carla/streaming/*.h - ${LIBCARLA_SOURCE_PATH}/carla/streaming/detail/*.h - ${LIBCARLA_SOURCE_PATH}/carla/streaming/low_level/*.h - ${LIBCARLA_SOURCE_PATH}/carla/multigpu/*.h - ${LIBCARLA_SOURCE_PATH}/compiler/*.h + list ( + APPEND + LIBCARLA_SERVER_HEADERS + ${LIBCARLA_SERVER_HEADERS_ROS2} ) - - if (ENABLE_ROS2) - file ( - GLOB - LIBCARLA_SERVER_HEADERS_ROS2 - ${LIBCARLA_SOURCE_PATH}/carla/ros2/*.h - ) - list ( - APPEND - LIBCARLA_SERVER_HEADERS - ${LIBCARLA_SERVER_HEADERS_ROS2} - ) - endif () + endif () - file ( - GLOB - LIBCARLA_SERVER_HEADERS_THIRD_PARTY - ${LIBCARLA_THIRD_PARTY_SOURCE_PATH}/odrSpiral/*.h - ${LIBCARLA_THIRD_PARTY_SOURCE_PATH}/moodycamel/*.h - ${LIBCARLA_THIRD_PARTY_SOURCE_PATH}/pugixml/*.hpp - ) + file ( + GLOB + LIBCARLA_SERVER_HEADERS_THIRD_PARTY + ${LIBCARLA_THIRD_PARTY_SOURCE_PATH}/odrSpiral/*.h + ${LIBCARLA_THIRD_PARTY_SOURCE_PATH}/moodycamel/*.h + ${LIBCARLA_THIRD_PARTY_SOURCE_PATH}/pugixml/*.hpp + ) - add_library ( - carla-server - ${LIBCARLA_SERVER_HEADERS} - ${LIBCARLA_SERVER_SOURCES} - ${LIBCARLA_SERVER_HEADERS_THIRD_PARTY} - ${LIBCARLA_SERVER_SOURCES_THIRD_PARTY} - ) + add_library ( + carla-server + ${LIBCARLA_SERVER_HEADERS} + ${LIBCARLA_SERVER_SOURCES} + ${LIBCARLA_SERVER_HEADERS_THIRD_PARTY} + ${LIBCARLA_SERVER_SOURCES_THIRD_PARTY} + ) - target_link_libraries ( - carla-server PUBLIC - Boost::asio - Boost::geometry - Boost::algorithm - Boost::assert - Boost::gil - RecastNavigation::Recast - RecastNavigation::Detour - RecastNavigation::DetourCrowd - png_static - zlibstatic - rpc - ) - - target_include_directories ( - carla-server PUBLIC - ${LIBCARLA_SOURCE_PATH} - ) - - target_compile_definitions ( - carla-server PUBLIC - ${CARLA_COMMON_DEFINITIONS} - ${CARLA_EXCEPTION_DEFINITIONS} - ${CARLA_RTTI_DEFINITIONS} - ) - - install ( - TARGETS - carla-server - DESTINATION lib - ) - - foreach (HEADER ${LIBCARLA_SERVER_HEADERS}) - cmake_path (GET HEADER PARENT_PATH HEADER_PARENT) - cmake_path ( - RELATIVE_PATH HEADER_PARENT - BASE_DIRECTORY ${LIBCARLA_SOURCE_PATH}/carla - OUTPUT_VARIABLE HEADER_RELATIVE - ) - install ( - FILES ${HEADER} - DESTINATION include/carla/${HEADER_RELATIVE} - ) - endforeach () + target_link_libraries ( + carla-server PUBLIC + Boost::asio + Boost::geometry + Boost::algorithm + Boost::assert + Boost::gil + RecastNavigation::Recast + RecastNavigation::Detour + RecastNavigation::DetourCrowd + png_static + zlibstatic + rpc + ) + + target_include_directories ( + carla-server PUBLIC + ${LIBCARLA_SOURCE_PATH} + ) + target_compile_definitions ( + carla-server PUBLIC + ${CARLA_COMMON_DEFINITIONS} + ${CARLA_EXCEPTION_DEFINITIONS} + ${CARLA_RTTI_DEFINITIONS} + ) + endif () if (BUILD_CARLA_CLIENT) - project ( - carla-client - LANGUAGES CXX - VERSION ${CARLA_VERSION} - ) + project ( + carla-client + LANGUAGES CXX + VERSION ${CARLA_VERSION} + ) + file ( + GLOB + LIBCARLA_CLIENT_HEADERS + ${LIBCARLA_SOURCE_PATH}/carla/*.h + ${LIBCARLA_SOURCE_PATH}/carla/client/*.h + ${LIBCARLA_SOURCE_PATH}/carla/client/detail/*.h + ${LIBCARLA_SOURCE_PATH}/carla/geom/*.h + ${LIBCARLA_SOURCE_PATH}/carla/image/*.h + ${LIBCARLA_SOURCE_PATH}/carla/nav/*.h + ${LIBCARLA_SOURCE_PATH}/carla/opendrive/*.h + ${LIBCARLA_SOURCE_PATH}/carla/opendrive/parser/*.h + ${LIBCARLA_SOURCE_PATH}/carla/pointcloud/*.h + ${LIBCARLA_SOURCE_PATH}/carla/profiler/*.h + ${LIBCARLA_SOURCE_PATH}/carla/road/*.h + ${LIBCARLA_SOURCE_PATH}/carla/road/element/*.h + ${LIBCARLA_SOURCE_PATH}/carla/road/general/*.h + ${LIBCARLA_SOURCE_PATH}/carla/road/object/*.h + ${LIBCARLA_SOURCE_PATH}/carla/road/signal/*.h + ${LIBCARLA_SOURCE_PATH}/carla/rpc/*.h + ${LIBCARLA_SOURCE_PATH}/carla/sensor/*.h + ${LIBCARLA_SOURCE_PATH}/carla/sensor/data/*.h + ${LIBCARLA_SOURCE_PATH}/carla/sensor/s11n/*.h + ${LIBCARLA_SOURCE_PATH}/carla/streaming/*.h + ${LIBCARLA_SOURCE_PATH}/carla/streaming/detail/*.h + ${LIBCARLA_SOURCE_PATH}/carla/streaming/detail/tcp/*.h + ${LIBCARLA_SOURCE_PATH}/carla/streaming/low_level/*.h + ${LIBCARLA_SOURCE_PATH}/carla/multigpu/*.h + ${LIBCARLA_SOURCE_PATH}/carla/trafficmanager/*.h + ${LIBCARLA_SOURCE_PATH}/compiler/*.h + ) + + if (ENABLE_ROS2) file ( - GLOB - LIBCARLA_CLIENT_HEADERS - ${LIBCARLA_SOURCE_PATH}/carla/*.h - ${LIBCARLA_SOURCE_PATH}/carla/client/*.h - ${LIBCARLA_SOURCE_PATH}/carla/client/detail/*.h - ${LIBCARLA_SOURCE_PATH}/carla/geom/*.h - ${LIBCARLA_SOURCE_PATH}/carla/image/*.h - ${LIBCARLA_SOURCE_PATH}/carla/nav/*.h - ${LIBCARLA_SOURCE_PATH}/carla/opendrive/*.h - ${LIBCARLA_SOURCE_PATH}/carla/opendrive/parser/*.h - ${LIBCARLA_SOURCE_PATH}/carla/pointcloud/*.h - ${LIBCARLA_SOURCE_PATH}/carla/profiler/*.h - ${LIBCARLA_SOURCE_PATH}/carla/road/*.h - ${LIBCARLA_SOURCE_PATH}/carla/road/element/*.h - ${LIBCARLA_SOURCE_PATH}/carla/road/general/*.h - ${LIBCARLA_SOURCE_PATH}/carla/road/object/*.h - ${LIBCARLA_SOURCE_PATH}/carla/road/signal/*.h - ${LIBCARLA_SOURCE_PATH}/carla/rpc/*.h - ${LIBCARLA_SOURCE_PATH}/carla/sensor/*.h - ${LIBCARLA_SOURCE_PATH}/carla/sensor/data/*.h - ${LIBCARLA_SOURCE_PATH}/carla/sensor/s11n/*.h - ${LIBCARLA_SOURCE_PATH}/carla/streaming/*.h - ${LIBCARLA_SOURCE_PATH}/carla/streaming/detail/*.h - ${LIBCARLA_SOURCE_PATH}/carla/streaming/detail/tcp/*.h - ${LIBCARLA_SOURCE_PATH}/carla/streaming/low_level/*.h - ${LIBCARLA_SOURCE_PATH}/carla/multigpu/*.h - ${LIBCARLA_SOURCE_PATH}/carla/trafficmanager/*.h - ${LIBCARLA_SOURCE_PATH}/compiler/*.h + GLOB + LIBCARLA_CLIENT_HEADERS_ROS2 + ${LIBCARLA_SOURCE_PATH}/carla/ros2/*.h ) - - if (ENABLE_ROS2) + list ( + APPEND + LIBCARLA_CLIENT_HEADERS + ${LIBCARLA_CLIENT_HEADERS_ROS2} + ) + endif () + + if (ENABLE_RSS) + file ( + GLOB + LIBCARLA_CLIENT_HEADERS_RSS + ${LIBCARLA_SOURCE_PATH}/carla/rss/*.h + ) + list ( + APPEND + LIBCARLA_CLIENT_HEADERS + ${LIBCARLA_CLIENT_HEADERS_RSS} + ) + endif () + + file ( + GLOB + LIBCARLA_CLIENT_HEADERS_THIRD_PARTY + ${LIBCARLA_THIRD_PARTY_SOURCE_PATH}/odrSpiral/*.h + ${LIBCARLA_THIRD_PARTY_SOURCE_PATH}/moodycamel/*.h + ${LIBCARLA_THIRD_PARTY_SOURCE_PATH}/pugixml/*.hpp + ${LIBCARLA_THIRD_PARTY_SOURCE_PATH}/pugixml/*.h + ) + + file ( + GLOB + LIBCARLA_CLIENT_SOURCES + ${LIBCARLA_SOURCE_PATH}/carla/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/client/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/client/detail/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/geom/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/image/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/nav/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/opendrive/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/opendrive/parser/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/pointcloud/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/road/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/road/element/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/road/general/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/road/object/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/road/signal/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/rpc/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/sensor/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/sensor/data/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/sensor/s11n/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/streaming/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/streaming/detail/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/streaming/detail/tcp/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/streaming/low_level/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/multigpu/*.cpp + ${LIBCARLA_SOURCE_PATH}/carla/trafficmanager/*.cpp + ) + + if (ENABLE_ROS2) + file ( + GLOB + LIBCARLA_CLIENT_SOURCES_ROS2 + ${LIBCARLA_SOURCE_PATH}/carla/ros2/*.cpp + ) + list ( + APPEND + LIBCARLA_CLIENT_SOURCES + ${LIBCARLA_CLIENT_SOURCES_ROS2} + ) + endif () + + if (ENABLE_RSS) file ( - GLOB - LIBCARLA_CLIENT_HEADERS_ROS2 - ${LIBCARLA_SOURCE_PATH}/carla/ros2/*.h + GLOB + LIBCARLA_CLIENT_SOURCES_RSS + ${LIBCARLA_SOURCE_PATH}/carla/rss/*.cpp ) list ( - APPEND - LIBCARLA_CLIENT_HEADERS - ${LIBCARLA_CLIENT_HEADERS_ROS2} + APPEND + LIBCARLA_CLIENT_SOURCES + ${LIBCARLA_CLIENT_SOURCES_RSS} ) - endif () + endif () - if (ENABLE_RSS) - file ( - GLOB - LIBCARLA_CLIENT_HEADERS_RSS - ${LIBCARLA_SOURCE_PATH}/carla/rss/*.h - ) - list ( - APPEND - LIBCARLA_CLIENT_HEADERS - ${LIBCARLA_CLIENT_HEADERS_RSS} - ) - endif () + file ( + GLOB + LIBCARLA_CLIENT_SOURCES_THIRD_PARTY + ${LIBCARLA_THIRD_PARTY_SOURCE_PATH}/odrSpiral/*.cpp + ${LIBCARLA_THIRD_PARTY_SOURCE_PATH}/pugixml/*.cpp + ) - file ( - GLOB - LIBCARLA_CLIENT_HEADERS_THIRD_PARTY - ${LIBCARLA_THIRD_PARTY_SOURCE_PATH}/odrSpiral/*.h - ${LIBCARLA_THIRD_PARTY_SOURCE_PATH}/moodycamel/*.h - ${LIBCARLA_THIRD_PARTY_SOURCE_PATH}/pugixml/*.hpp - ${LIBCARLA_THIRD_PARTY_SOURCE_PATH}/pugixml/*.h - ) + add_library ( + carla-client + ${LIBCARLA_CLIENT_HEADERS} + ${LIBCARLA_CLIENT_SOURCES} + ${LIBCARLA_CLIENT_HEADERS_THIRD_PARTY} + ${LIBCARLA_CLIENT_SOURCES_THIRD_PARTY} + ) - file ( - GLOB - LIBCARLA_CLIENT_SOURCES - ${LIBCARLA_SOURCE_PATH}/carla/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/client/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/client/detail/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/geom/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/image/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/nav/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/opendrive/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/opendrive/parser/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/pointcloud/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/road/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/road/element/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/road/general/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/road/object/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/road/signal/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/rpc/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/sensor/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/sensor/data/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/sensor/s11n/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/streaming/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/streaming/detail/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/streaming/detail/tcp/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/streaming/low_level/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/multigpu/*.cpp - ${LIBCARLA_SOURCE_PATH}/carla/trafficmanager/*.cpp - ) - - if (ENABLE_ROS2) - file ( - GLOB - LIBCARLA_CLIENT_SOURCES_ROS2 - ${LIBCARLA_SOURCE_PATH}/carla/ros2/*.cpp - ) - list ( - APPEND - LIBCARLA_CLIENT_SOURCES - ${LIBCARLA_CLIENT_SOURCES_ROS2} - ) - endif () + target_link_libraries ( + carla-client PUBLIC + Boost::asio + Boost::algorithm + Boost::geometry + Boost::assert + Boost::gil + RecastNavigation::Recast + RecastNavigation::Detour + RecastNavigation::DetourCrowd + png_static + zlibstatic + rpc + ) + + target_include_directories ( + carla-client PUBLIC + ${LIBCARLA_SOURCE_PATH} + ) - if (ENABLE_RSS) - file ( - GLOB - LIBCARLA_CLIENT_SOURCES_RSS - ${LIBCARLA_SOURCE_PATH}/carla/rss/*.cpp - ) - list ( - APPEND - LIBCARLA_CLIENT_SOURCES - ${LIBCARLA_CLIENT_SOURCES_RSS} - ) - endif () - - file ( - GLOB - LIBCARLA_CLIENT_SOURCES_THIRD_PARTY - ${LIBCARLA_THIRD_PARTY_SOURCE_PATH}/odrSpiral/*.cpp - ${LIBCARLA_THIRD_PARTY_SOURCE_PATH}/pugixml/*.cpp - ) - - add_library ( - carla-client - ${LIBCARLA_CLIENT_HEADERS} - ${LIBCARLA_CLIENT_SOURCES} - ${LIBCARLA_CLIENT_HEADERS_THIRD_PARTY} - ${LIBCARLA_CLIENT_SOURCES_THIRD_PARTY} - ) - - target_link_libraries ( - carla-client PUBLIC - Boost::asio - Boost::algorithm - Boost::geometry - Boost::assert - Boost::gil - RecastNavigation::Recast - RecastNavigation::Detour - RecastNavigation::DetourCrowd - png_static - zlibstatic - rpc - ) - - target_include_directories ( - carla-client PUBLIC - ${LIBCARLA_SOURCE_PATH} - ) - - target_compile_definitions ( - carla-client PUBLIC - ${CARLA_COMMON_DEFINITIONS} - ${CARLA_RTTI_DEFINITIONS} - ) - - install (TARGETS carla-client DESTINATION lib) - - foreach (HEADER ${LIBCARLA_CLIENT_HEADERS}) - cmake_path (GET HEADER PARENT_PATH HEADER_PARENT) - cmake_path ( - RELATIVE_PATH HEADER_PARENT - BASE_DIRECTORY ${LIBCARLA_SOURCE_PATH}/carla - OUTPUT_VARIABLE HEADER_RELATIVE - ) - install ( - FILES ${HEADER} - DESTINATION include/carla/${HEADER_RELATIVE} - ) - endforeach () + target_compile_definitions ( + carla-client PUBLIC + ${CARLA_COMMON_DEFINITIONS} + ${CARLA_RTTI_DEFINITIONS} + ) endif () diff --git a/LibCarla/source/carla/geom/Vector3D.h b/LibCarla/source/carla/geom/Vector3D.h index 408d5c82c..77d6af117 100644 --- a/LibCarla/source/carla/geom/Vector3D.h +++ b/LibCarla/source/carla/geom/Vector3D.h @@ -59,7 +59,7 @@ namespace geom { return std::sqrt(SquaredLength2D()); } - constexpr Vector3D Abs() const { + inline Vector3D Abs() const { return Vector3D(abs(x), abs(y), abs(z)); } diff --git a/PythonAPI/CMakeLists.txt b/PythonAPI/CMakeLists.txt index 8012af050..cbffc9232 100644 --- a/PythonAPI/CMakeLists.txt +++ b/PythonAPI/CMakeLists.txt @@ -4,15 +4,6 @@ project ( VERSION ${CARLA_VERSION} ) -find_package ( - Python - COMPONENTS - Interpreter - Development.Module - Development.Embed - REQUIRED -) - set (PYTHON_API_PATH ${CARLA_WORKSPACE_PATH}/PythonAPI) set (PYTHON_API_CARLA_PATH ${PYTHON_API_PATH}/carla) @@ -49,7 +40,17 @@ if (ENABLE_RSS) list (APPEND PYTHON_API_SOURCES ${PYTHON_API_CARLA_PATH}/src/AdRss.cpp) endif () -Python_add_library ( +find_package ( + Python3 + COMPONENTS + Interpreter + Development.Module + Development.Embed + Development.SABIModule + REQUIRED +) + +Python3_add_library ( carla-python-api MODULE WITH_SOABI ${PYTHON_API_SOURCES} ) @@ -96,16 +97,25 @@ else () set (PYD_EXT .so) endif () -# If this command fails, enable developer mode if on Windows. -add_custom_target ( - carla-python-api-symlink - ALL +set ( + CARLA_PYTHON_API_SYMLINK_PATH + ${PYTHON_API_PATH}/examples/carla${PYD_EXT} +) + +add_custom_command ( + OUTPUT ${CARLA_PYTHON_API_SYMLINK_PATH} COMMENT "Creating CARLA PythonAPI .PYD/.SO symlink..." COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${PYTHON_API_PATH}/examples/carla${PYD_EXT} ) +# If this command fails, enable developer mode if on Windows. +add_custom_target ( + carla-python-api-symlink + DEPENDS ${CARLA_PYTHON_API_SYMLINK_PATH} +) + add_dependencies ( carla-python-api-symlink carla-python-api diff --git a/Unreal/CMakeLists.txt b/Unreal/CMakeLists.txt index 3e1d8a472..a9f0835ff 100644 --- a/Unreal/CMakeLists.txt +++ b/Unreal/CMakeLists.txt @@ -39,9 +39,8 @@ carla_two_step_configure_file ( ${CARLA_UE_PLUGINS_PATH}/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs.in ) -add_custom_target ( - carla-ue-generate-project-files - ALL +add_custom_command ( + OUTPUT ${CARLA_UE_PATH}/CMakeLists.txt COMMENT "Generating UE project files for CARLA..." COMMAND @@ -53,18 +52,50 @@ add_custom_target ( ) add_custom_target ( - carla-ue-build - ALL - DEPENDS - carla-ue-generate-project-files + carla-ue-generate-project-files + DEPENDS ${CARLA_UE_PATH}/CMakeLists.txt +) + +add_custom_command ( + OUTPUT carla-ue-configure.stamp + COMMAND + ${CMAKE_COMMAND} -E touch carla-ue-configure.stamp COMMENT - "Building CARLA UE..." + "Configuring Carla Unreal..." COMMAND ${CMAKE_COMMAND} - -S ${CARLA_UE_PATH} - -B ${CMAKE_CURRENT_BINARY_DIR} - -G ${CMAKE_GENERATOR} - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + -S ${CARLA_UE_PATH} + -G ${CMAKE_GENERATOR} + -B ${CMAKE_CURRENT_BINARY_DIR} +) + +add_custom_target ( + carla-ue-configure + DEPENDS + carla-ue-configure.stamp + carla-ue-generate-project-files +) + +add_custom_command ( + OUTPUT carla-ue.stamp + VERBATIM + COMMAND + ${CMAKE_COMMAND} -E touch carla-ue.stamp + COMMENT + "Building Carla Unreal..." + COMMAND + ${CMAKE_COMMAND} + --build ${CMAKE_CURRENT_BINARY_DIR} + --target CarlaUnrealEditor + --verbose +) + +add_custom_target ( + carla-ue + ALL + DEPENDS + carla-ue-configure + carla-ue.stamp ) file ( From dab4487a96fd2ec862fdf64186d9ecb86856c786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Sol=C3=A9=20Nogu=C3=A9s?= Date: Thu, 7 Mar 2024 20:21:44 +0100 Subject: [PATCH 7/9] Fix fetch content slow speed due boost download (#7222) --- CMake/CarlaDependencies.cmake | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/CMake/CarlaDependencies.cmake b/CMake/CarlaDependencies.cmake index ea729cb48..ce224e04f 100644 --- a/CMake/CarlaDependencies.cmake +++ b/CMake/CarlaDependencies.cmake @@ -107,11 +107,16 @@ if (BUILD_PYTHON_API) set (BOOST_ENABLE_PYTHON ${BUILD_PYTHON_API}) endif () -carla_dependency_add ( +set (BOOST_VERSION 1.84.0) +FetchContent_Declare( boost - https://github.com/boostorg/boost.git - ${CARLA_BOOST_TAG} + GIT_SUBMODULES_RECURSE ON + GIT_SHALLOW ON + GIT_PROGRESS ON + URL https://github.com/boostorg/boost/releases/download/boost-${BOOST_VERSION}/boost-${BOOST_VERSION}.zip + OVERRIDE_FIND_PACKAGE ) +list (APPEND CARLA_DEPENDENCIES boost) set (EIGEN_BUILD_PKGCONFIG OFF) set (BUILD_TESTING OFF) From 25503738459c7b2d95411d9c102947a9a3788c84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Sol=C3=A9=20Nogu=C3=A9s?= Date: Fri, 8 Mar 2024 09:47:18 +0100 Subject: [PATCH 8/9] Cmake migrate FetchContent from git clone to zip download (#7225) * Fix fetch content slow speed due boost download * Migrate all mandatory dependencies FetchContent from git clone to url approach --- CMake/CarlaDependencies.cmake | 103 ++++++++++++++++------------------ 1 file changed, 48 insertions(+), 55 deletions(-) diff --git a/CMake/CarlaDependencies.cmake b/CMake/CarlaDependencies.cmake index ce224e04f..4b5205208 100644 --- a/CMake/CarlaDependencies.cmake +++ b/CMake/CarlaDependencies.cmake @@ -10,17 +10,50 @@ if (LINUX) find_package (Threads REQUIRED) endif () +set (CARLA_DEPENDENCIES) +macro (carla_dependency_add_git NAME URL TAG) + message ("Fetching ${NAME}...") + FetchContent_Declare( + ${NAME} + GIT_SUBMODULES_RECURSE ON + GIT_SHALLOW ON + GIT_PROGRESS ON + GIT_REPOSITORY ${URL} + GIT_TAG ${TAG} + OVERRIDE_FIND_PACKAGE + ) + list (APPEND CARLA_DEPENDENCIES ${NAME}) +endmacro () + +macro (carla_dependency_add_zip NAME URL) + FetchContent_Declare( + ${NAME} + URL ${URL} + OVERRIDE_FIND_PACKAGE + ) + list (APPEND CARLA_DEPENDENCIES ${NAME}) +endmacro () + +macro (carla_dependencies_make_available) + FetchContent_MakeAvailable ( + ${CARLA_DEPENDENCIES}) + set (CARLA_DEPENDENCIES) +endmacro () + +macro (carla_fetchcontent_option NAME VALUE) + set (${NAME} ${VALUE} CACHE INTERNAL "") +endmacro () set (CARLA_DEPENDENCIES_INSTALL_PATH) string (REPLACE "." "" CARLA_SQLITE_TAG ${CARLA_SQLITE_VERSION}) -FetchContent_Declare ( +carla_dependency_add_zip ( sqlite3 - URL https://www.sqlite.org/2024/sqlite-amalgamation-${CARLA_SQLITE_TAG}.zip + https://www.sqlite.org/2024/sqlite-amalgamation-${CARLA_SQLITE_TAG}.zip ) -FetchContent_MakeAvailable (sqlite3) +carla_dependencies_make_available () add_library ( libsqlite3 STATIC @@ -43,41 +76,10 @@ target_link_libraries ( libsqlite3 ) - - -set (CARLA_DEPENDENCIES) - -macro (carla_dependency_add NAME URL TAG) - message ("Fetching ${NAME}...") - FetchContent_Declare( - ${NAME} - GIT_SUBMODULES_RECURSE ON - GIT_SHALLOW ON - GIT_PROGRESS ON - GIT_REPOSITORY ${URL} - GIT_TAG ${TAG} - OVERRIDE_FIND_PACKAGE - ) - list (APPEND CARLA_DEPENDENCIES ${NAME}) -endmacro () - -macro (carla_dependencies_make_available) - FetchContent_MakeAvailable ( - ${CARLA_DEPENDENCIES}) - set (CARLA_DEPENDENCIES) -endmacro () - -macro (carla_fetchcontent_option NAME VALUE) - set (${NAME} ${VALUE} CACHE INTERNAL "") -endmacro () - - - set (ZLIB_BUILD_EXAMPLES OFF) -carla_dependency_add ( +carla_dependency_add_zip ( zlib - https://github.com/madler/zlib.git - ${CARLA_ZLIB_TAG} + https://github.com/madler/zlib/archive/refs/tags/${CARLA_ZLIB_TAG}.zip ) carla_dependencies_make_available () include_directories (${zlib_SOURCE_DIR} ${zlib_BINARY_DIR}) # HACK @@ -93,10 +95,9 @@ else () endif () set (ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR} ${zlib_BINARY_DIR}) set (ZLIB_LIBRARIES ${ZLIB_LIBRARY}) -carla_dependency_add ( +carla_dependency_add_zip ( libpng - https://github.com/glennrp/libpng.git - ${CARLA_LIBPNG_TAG} + https://github.com/pnggroup/libpng/archive/refs/tags/${CARLA_LIBPNG_TAG}.zip ) carla_dependencies_make_available () include_directories (${libpng_SOURCE_DIR} ${libpng_BINARY_DIR}) # HACK @@ -107,36 +108,28 @@ if (BUILD_PYTHON_API) set (BOOST_ENABLE_PYTHON ${BUILD_PYTHON_API}) endif () -set (BOOST_VERSION 1.84.0) -FetchContent_Declare( +carla_dependency_add_zip( boost - GIT_SUBMODULES_RECURSE ON - GIT_SHALLOW ON - GIT_PROGRESS ON - URL https://github.com/boostorg/boost/releases/download/boost-${BOOST_VERSION}/boost-${BOOST_VERSION}.zip - OVERRIDE_FIND_PACKAGE + https://github.com/boostorg/boost/releases/download/${CARLA_BOOST_TAG}/${CARLA_BOOST_TAG}.zip ) list (APPEND CARLA_DEPENDENCIES boost) set (EIGEN_BUILD_PKGCONFIG OFF) set (BUILD_TESTING OFF) set (EIGEN_BUILD_DOC OFF) -carla_dependency_add ( +carla_dependency_add_zip ( eigen - https://gitlab.com/libeigen/eigen.git - ${CARLA_EIGEN_TAG} + https://gitlab.com/libeigen/eigen/-/archive/${CARLA_EIGEN_TAG}/eigen-${CARLA_EIGEN_TAG}.tar.gz ) -carla_dependency_add ( +carla_dependency_add_zip ( rpclib - https://github.com/carla-simulator/rpclib.git - ${CARLA_RPCLIB_TAG} + https://github.com/carla-simulator/rpclib/archive/refs/heads/${CARLA_RPCLIB_TAG}.zip ) -carla_dependency_add ( +carla_dependency_add_zip ( recastnavigation - https://github.com/carla-simulator/recastnavigation.git - ${CARLA_RECAST_TAG} + https://github.com/carla-simulator/recastnavigation/archive/refs/heads/${CARLA_RECAST_TAG}.zip ) if (ENABLE_OSM2ODR) From 01852e6a6e183339dd4a5ca53488451b93df7882 Mon Sep 17 00:00:00 2001 From: Marcel Pi Date: Fri, 8 Mar 2024 20:31:22 +0100 Subject: [PATCH 9/9] - Update gitignore. - Add launch and launch-only CMake custom targets. - Temporary workaround for lack of a properly parameterized toolchain file. - Change all references to CarlaUE4 to CarlaUnreal. - Separate CMake Options files. --- .gitignore | 64 +---- CMake/CarlaDependencies.cmake | 253 +++++++++---------- CMake/CarlaOptions.cmake | 275 +-------------------- CMake/LinuxToolchain.cmake | 12 +- CMake/Options/Common.cmake | 87 +++++++ CMake/Options/Dependencies.cmake | 172 +++++++++++++ CMake/Options/Unreal.cmake | 50 ++++ CMakeLists.txt | 49 +++- PythonAPI/examples/.gitignore | 3 +- Unreal/CMakeLists.txt | 90 +++++-- Unreal/CarlaUnreal/Config/DefaultInput.ini | 112 ++++++--- 11 files changed, 642 insertions(+), 525 deletions(-) create mode 100644 CMake/Options/Common.cmake create mode 100644 CMake/Options/Dependencies.cmake create mode 100644 CMake/Options/Unreal.cmake diff --git a/.gitignore b/.gitignore index b376352f3..e171c1b0a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,67 +1,9 @@ .vs/ .vscode/ - .cache/ +__pycache__/ Build/ -out/ - -Dist/ Doxygen/ -Deprecated/PythonClient/dist/ -TrafficManager/build/ -Util/Build/ -Dependencies/ -Install/ -Plugins/ - -!Unreal/CarlaUnreal/Plugins -Unreal/CarlaUnreal/Plugins/Streetmap -Unreal/CarlaUnreal/Plugins/HoudiniEngine - -/ExportedMaps -/Import/* -!/Import/README.md - -*.VC.db -*.VC.opendb - -*.o -*.a -*.so -*.lib - -*.pyd -*.whl -*.egg - -*.egg-info -*.kdev4 -*.log -*.pb.cc -*.pb.h -*.pid -*.pri -*.pro -*.py[cod] -*.sln -*.stackdump -*.sublime-workspace -*.workspace - -*CodeCompletionFolders.txt -*CodeLitePreProcessor.txt -.aria2c.input -.codelite -.gdb_history -.gtest -.idea -.tags* -__pycache__/ -_benchmarks_results/ -_images* -_out* -_site -core -profiler.csv -ArgsSync.json +Dist/ +out/ \ No newline at end of file diff --git a/CMake/CarlaDependencies.cmake b/CMake/CarlaDependencies.cmake index 4b5205208..1aa74df0c 100644 --- a/CMake/CarlaDependencies.cmake +++ b/CMake/CarlaDependencies.cmake @@ -1,57 +1,67 @@ +#[[ + + Copyright (c) 2024 Computer Vision Center (CVC) at the Universitat Autonoma + de Barcelona (UAB). + + This work is licensed under the terms of the MIT license. + For a copy, see . + +]] + include (FetchContent) -include (ExternalProject) +set (CARLA_DEPENDENCIES_PENDING) - -# These checks may be incomplete: - -if (LINUX) - set (THREADS_PREFER_PTHREAD_FLAG ON) - find_package (Threads REQUIRED) -endif () - -set (CARLA_DEPENDENCIES) - -macro (carla_dependency_add_git NAME URL TAG) - message ("Fetching ${NAME}...") - FetchContent_Declare( - ${NAME} - GIT_SUBMODULES_RECURSE ON - GIT_SHALLOW ON - GIT_PROGRESS ON - GIT_REPOSITORY ${URL} - GIT_TAG ${TAG} - OVERRIDE_FIND_PACKAGE - ) - list (APPEND CARLA_DEPENDENCIES ${NAME}) -endmacro () - -macro (carla_dependency_add_zip NAME URL) - FetchContent_Declare( - ${NAME} - URL ${URL} - OVERRIDE_FIND_PACKAGE - ) - list (APPEND CARLA_DEPENDENCIES ${NAME}) +macro (carla_dependency_add NAME TAG ARCHIVE_URL GIT_URL) + if (PREFER_CLONE) + message ("Cloning ${NAME}...") + FetchContent_Declare( + ${NAME} + GIT_REPOSITORY ${GIT_URL} + GIT_TAG ${TAG} + GIT_SUBMODULES_RECURSE ON + GIT_SHALLOW ON + GIT_PROGRESS ON + OVERRIDE_FIND_PACKAGE + ${ARGN} + ) + list (APPEND CARLA_DEPENDENCIES_PENDING ${NAME}) + else () + message ("Downloading ${NAME}...") + FetchContent_Declare( + ${NAME} + URL ${ARCHIVE_URL} + OVERRIDE_FIND_PACKAGE + ${ARGN} + ) + list (APPEND CARLA_DEPENDENCIES_PENDING ${NAME}) + endif () endmacro () macro (carla_dependencies_make_available) FetchContent_MakeAvailable ( - ${CARLA_DEPENDENCIES}) - set (CARLA_DEPENDENCIES) + ${CARLA_DEPENDENCIES_PENDING}) + set (CARLA_DEPENDENCIES_PENDING) endmacro () macro (carla_fetchcontent_option NAME VALUE) set (${NAME} ${VALUE} CACHE INTERNAL "") endmacro () -set (CARLA_DEPENDENCIES_INSTALL_PATH) + + +# ==== SQLITE3 ==== + +set (THREADS_PREFER_PTHREAD_FLAG ON) +find_package (Threads REQUIRED) string (REPLACE "." "" CARLA_SQLITE_TAG ${CARLA_SQLITE_VERSION}) -carla_dependency_add_zip ( +carla_dependency_add ( sqlite3 + ${CARLA_SQLITE_TAG} https://www.sqlite.org/2024/sqlite-amalgamation-${CARLA_SQLITE_TAG}.zip + "" ) carla_dependencies_make_available () @@ -76,165 +86,144 @@ target_link_libraries ( libsqlite3 ) -set (ZLIB_BUILD_EXAMPLES OFF) -carla_dependency_add_zip ( +# ==== ZLIB ==== + +carla_fetchcontent_option (ZLIB_BUILD_EXAMPLES OFF) +carla_dependency_add ( zlib + ${CARLA_ZLIB_TAG} https://github.com/madler/zlib/archive/refs/tags/${CARLA_ZLIB_TAG}.zip + https://github.com/madler/zlib.git ) carla_dependencies_make_available () -include_directories (${zlib_SOURCE_DIR} ${zlib_BINARY_DIR}) # HACK +include_directories (${zlib_SOURCE_DIR} ${zlib_BINARY_DIR}) # @TODO HACK -set (PNG_TESTS OFF) -set (PNG_SHARED OFF) -set (PNG_TOOLS OFF) -set (PNG_BUILD_ZLIB ON) +# ==== LIBPNG ==== + +carla_fetchcontent_option (PNG_TESTS OFF) +carla_fetchcontent_option (PNG_SHARED OFF) +carla_fetchcontent_option (PNG_TOOLS OFF) +carla_fetchcontent_option (PNG_BUILD_ZLIB ON) if (WIN32) - set (ZLIB_LIBRARY ${zlib_BINARY_DIR}/zlibstatic${CARLA_DEBUG_AFFIX}.lib) + carla_fetchcontent_option (ZLIB_LIBRARY ${zlib_BINARY_DIR}/zlibstatic${CARLA_DEBUG_AFFIX}.lib) else () - set (ZLIB_LIBRARY ${zlib_BINARY_DIR}/libz.a) + carla_fetchcontent_option (ZLIB_LIBRARY ${zlib_BINARY_DIR}/libz.a) endif () -set (ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR} ${zlib_BINARY_DIR}) -set (ZLIB_LIBRARIES ${ZLIB_LIBRARY}) -carla_dependency_add_zip ( +carla_fetchcontent_option (ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR} ${zlib_BINARY_DIR}) +carla_fetchcontent_option (ZLIB_LIBRARIES ${ZLIB_LIBRARY}) +carla_dependency_add ( libpng + ${CARLA_LIBPNG_TAG} https://github.com/pnggroup/libpng/archive/refs/tags/${CARLA_LIBPNG_TAG}.zip + https://github.com/glennrp/libpng.git ) carla_dependencies_make_available () -include_directories (${libpng_SOURCE_DIR} ${libpng_BINARY_DIR}) # HACK +include_directories (${libpng_SOURCE_DIR} ${libpng_BINARY_DIR}) # @TODO HACK -if (BUILD_PYTHON_API) - set (BOOST_ENABLE_PYTHON ${BUILD_PYTHON_API}) -endif () +# ==== BOOST ==== -carla_dependency_add_zip( +carla_fetchcontent_option (BOOST_ENABLE_PYTHON ${BUILD_PYTHON_API}) +carla_fetchcontent_option (BOOST_ENABLE_MPI OFF) +carla_fetchcontent_option (BOOST_LOCALE_WITH_ICU OFF) +carla_fetchcontent_option (BOOST_LOCALE_WITH_ICONV OFF) +carla_fetchcontent_option (BOOST_EXCLUDE_LIBRARIES "iostreams;locale;fiber;log") +carla_dependency_add( boost + ${CARLA_BOOST_TAG} https://github.com/boostorg/boost/releases/download/${CARLA_BOOST_TAG}/${CARLA_BOOST_TAG}.zip + https://github.com/boostorg/boost.git ) -list (APPEND CARLA_DEPENDENCIES boost) -set (EIGEN_BUILD_PKGCONFIG OFF) -set (BUILD_TESTING OFF) -set (EIGEN_BUILD_DOC OFF) -carla_dependency_add_zip ( +# ==== EIGEN ==== + +carla_fetchcontent_option (EIGEN_BUILD_PKGCONFIG OFF) +carla_fetchcontent_option (BUILD_TESTING OFF) +carla_fetchcontent_option (EIGEN_BUILD_DOC OFF) +carla_dependency_add ( eigen + ${CARLA_EIGEN_TAG} https://gitlab.com/libeigen/eigen/-/archive/${CARLA_EIGEN_TAG}/eigen-${CARLA_EIGEN_TAG}.tar.gz + https://gitlab.com/libeigen/eigen.git ) -carla_dependency_add_zip ( +# ==== RPCLIB ==== + +carla_dependency_add ( rpclib + ${CARLA_RPCLIB_TAG} https://github.com/carla-simulator/rpclib/archive/refs/heads/${CARLA_RPCLIB_TAG}.zip + https://github.com/carla-simulator/rpclib.git ) -carla_dependency_add_zip ( +# ==== RECAST ==== + +carla_fetchcontent_option (RECASTNAVIGATION_BUILDER OFF) +carla_dependency_add ( recastnavigation + ${CARLA_RECAST_TAG} https://github.com/carla-simulator/recastnavigation/archive/refs/heads/${CARLA_RECAST_TAG}.zip + https://github.com/carla-simulator/recastnavigation.git ) +# ==== PROJ ==== + if (ENABLE_OSM2ODR) - set (BUILD_TESTING OFF) - set (ENABLE_TIFF OFF) - set (ENABLE_CURL OFF) + carla_fetchcontent_option (BUILD_TESTING OFF) + carla_fetchcontent_option (ENABLE_TIFF OFF) + carla_fetchcontent_option (ENABLE_CURL OFF) carla_dependency_add ( proj + https://github.com/OSGeo/PROJ/archive/refs/tags/${CARLA_PROJ_TAG}.zip https://github.com/OSGeo/PROJ.git ${CARLA_PROJ_TAG} ) endif () +# ==== XERCESC ==== + if (ENABLE_OSM2ODR) carla_dependency_add ( xercesc + https://github.com/apache/xerces-c/archive/refs/tags/${CARLA_XERCESC_TAG}.zip https://github.com/apache/xerces-c.git ${CARLA_XERCESC_TAG} ) endif () +# ==== LUNASVG ==== + if (BUILD_OSM_WORLD_RENDERER) carla_dependency_add ( lunasvg + https://github.com/sammycage/lunasvg/archive/refs/tags/${CARLA_LUNASVG_TAG}.zip https://github.com/sammycage/lunasvg.git ${CARLA_LUNASVG_TAG} ) endif () +# ==== LIBOSMSCOUT ==== + if (BUILD_OSM_WORLD_RENDERER) carla_dependency_add ( libosmscout + https://github.com/Framstag/libosmscout/archive/refs/tags/${CARLA_LIBOSMSCOUT_TAG}.zip https://github.com/Framstag/libosmscout.git ${CARLA_LIBOSMSCOUT_TAG} ) endif () -# carla_dependency_add ( -# gtest -# https://github.com/google/googletest.git -# ${CARLA_GTEST_TAG} -# ) +# ==== STREETMAP ==== -carla_dependencies_make_available () +if (BUILD_CARLA_UE) + carla_dependency_add ( + StreetMap + https://github.com/carla-simulator/StreetMap.git + https://github.com/carla-simulator/StreetMap/archive/refs/heads/${CARLA_STREETMAP_TAG}.zip + ${CARLA_STREETMAP_TAG} + DOWNLOAD_DIR ${CARLA_WORKSPACE_PATH}/Unreal/CarlaUnreal/Plugins + ) +endif () -#[[ - -ExternalProject_Add ( - recastnavigation - GIT_REPOSITORY https://github.com/carla-simulator/recastnavigation.git - GIT_TAG ${CARLA_RECAST_TAG} -) - -ExternalProject_Add ( - proj - GIT_REPOSITORY https://github.com/OSGeo/PROJ.git - GIT_TAG ${CARLA_PROJ_TAG} - CMAKE_ARGS - -DSQLITE3_INCLUDE_DIR=${sqlite3_SOURCE_DIR} - -DSQLITE3_LIBRARY=$ - -DEXE_SQLITE3=$ - -DENABLE_TIFF=OFF - -DENABLE_CURL=OFF - -DBUILD_SHARED_LIBS=OFF - -DBUILD_PROJSYNC=OFF - -DBUILD_PROJINFO=OFF - -DBUILD_CCT=OFF - -DBUILD_CS2CS=OFF - -DBUILD_GEOD=OFF - -DBUILD_GIE=OFF - -DBUILD_PROJ=OFF - -DBUILD_TESTING=OFF -) - -add_dependencies (proj sqlite3 libsqlite3) - -ExternalProject_Add ( - xercesc - GIT_REPOSITORY https://github.com/apache/xerces-c.git - GIT_TAG ${CARLA_XERCESC_TAG} -) - -ExternalProject_Add ( - libpng - GIT_REPOSITORY https://github.com/glennrp/libpng.git - GIT_TAG ${CARLA_LIBPNG_TAG} - CMAKE_ARGS - -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH} - -DPNG_TESTS=OFF - -DPNG_SHARED=OFF - -DPNG_TOOLS=OFF -) - -ExternalProject_Add ( - lunasvg - GIT_REPOSITORY https://github.com/sammycage/lunasvg.git -) - -ExternalProject_Add ( - libosmscout - GIT_REPOSITORY https://github.com/Framstag/libosmscout.git -) - -ExternalProject_Add ( - gtest - GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG ${CARLA_GTEST_TAG} -)]] +carla_dependencies_make_available () \ No newline at end of file diff --git a/CMake/CarlaOptions.cmake b/CMake/CarlaOptions.cmake index 042906a60..492257970 100644 --- a/CMake/CarlaOptions.cmake +++ b/CMake/CarlaOptions.cmake @@ -1,266 +1,17 @@ +#[[ + + Copyright (c) 2024 Computer Vision Center (CVC) at the Universitat Autonoma + de Barcelona (UAB). + + This work is licensed under the terms of the MIT license. + For a copy, see . + +]] + macro (carla_string_option NAME DESCRIPTION VALUE) set (${NAME} ${VALUE} CACHE STRING ${DESCRIPTION}) endmacro () -# ==== Common target flags ==== - -set (CMAKE_POSITION_INDEPENDENT_CODE ON) - -option ( - BUILD_CARLA_CLIENT - "Build the LibCarla client." - ON -) - -option ( - BUILD_CARLA_SERVER - "Build the LibCarla server." - ON -) - -option ( - ENABLE_LIBCARLA_PYTORCH - "Enable LibCarla-PyTorch." - OFF -) - -option ( - BUILD_PYTHON_API - "Build the CARLA Python API." - ON -) - -option ( - BUILD_CARLA_UE - "Build the Carla Unreal Engine project." - OFF -) - -option ( - ENABLE_ROS2 - "Enable ROS2." - OFF -) - -option ( - ENABLE_OSM2ODR - "Enable OSM2ODR." - OFF -) - -option ( - ENABLE_RSS - "Enable RSS components (ad-rss-lib)" - OFF -) - -option ( - INSTALL_LIBCARLA - "Install LibCarla and all of its dependencies." - ON -) - -option ( - BUILD_OSM_WORLD_RENDERER - "Build OSM World Renderer." - OFF -) - -option ( - ENABLE_RTTI - "Enable C++ RTTI." - OFF -) - -option ( - ENABLE_EXCEPTIONS - "Enable C++ Exceptions." - OFF -) - -carla_string_option ( - CARLA_UNREAL_ENGINE_PATH - "Path to the CARLA fork of Unreal Engine" - "" -) - -if (EXISTS ${CARLA_UNREAL_ENGINE_PATH}) - set (CARLA_HAS_UNREAL_ENGINE_PATH ON) -else () - set (CARLA_HAS_UNREAL_ENGINE_PATH OFF) -endif () - -if (${BUILD_CARLA_UE}) - if (${CARLA_HAS_UNREAL_ENGINE_PATH}) - message ("Carla UE project successfully added to build. (UE path: ${CARLA_UNREAL_ENGINE_PATH})") - else () - message ( - FATAL_ERROR - "Could not add UE project to build since the option CARLA_UNREAL_ENGINE_PATH is not set to a valid path (\"${CARLA_UNREAL_ENGINE_PATH}\"). Please set it to point to the root path of your CARLA Unreal Engine installation.") - endif () -endif () - -# ==== DEPENDENCIES ==== - -# ==== BOOST ==== - -carla_string_option ( - CARLA_BOOST_VERSION - "Target boost version." - 1.84.0 -) - -carla_string_option ( - CARLA_BOOST_TAG - "Target boost git tag." - boost-${CARLA_BOOST_VERSION} -) - -# ==== EIGEN ==== - -carla_string_option ( - CARLA_EIGEN_VERSION - "Target Eigen version." - 3.4.0 -) - -carla_string_option ( - CARLA_EIGEN_TAG - "Target Eigen git tag." - ${CARLA_EIGEN_VERSION} -) - -# ==== GOOGLE TEST ==== - -carla_string_option ( - CARLA_GTEST_VERSION - "Target googletest version." - 1.14.0 -) - -carla_string_option ( - CARLA_GTEST_TAG - "Target googletest git tag." - v${CARLA_GTEST_VERSION} -) - -# ==== LIBPNG ==== - -carla_string_option ( - CARLA_LIBPNG_VERSION - "Target libpng version." - 1.6.40 -) - -carla_string_option ( - CARLA_LIBPNG_TAG - "Target libpng git tag." - v${CARLA_LIBPNG_VERSION} -) - -# ==== PROJ ==== - -carla_string_option ( - CARLA_PROJ_VERSION - "Target PROJ version." - 7.2.1 -) - -carla_string_option ( - CARLA_PROJ_TAG - "Target PROJ git tag." - ${CARLA_PROJ_VERSION} -) - -# ==== RECAST ==== - -carla_string_option ( - CARLA_RECAST_TAG - "Target recastnavigation git tag." - carla -) - -# ==== RPCLIB ==== - -carla_string_option ( - CARLA_RPCLIB_TAG - "Target rpclib git tag." - carla -) - -# ==== SQLITE3 ==== - -carla_string_option ( - CARLA_SQLITE_VERSION - "Target SQLite version (major[1].minor[2].patch[2].revision[2])." - 3.45.01.00 -) - -# ==== XERCESC ==== - -carla_string_option ( - CARLA_XERCESC_VERSION - "Target xerces-c version." - 3.2.4 -) - -carla_string_option ( - CARLA_XERCESC_TAG - "Target xerces-c git tag." - v${CARLA_XERCESC_VERSION} -) - -# ==== ZLIB ==== - -carla_string_option ( - CARLA_ZLIB_VERSION - "Target zlib git tag." - 1.3.1) - -carla_string_option ( - CARLA_ZLIB_TAG - "Target zlib git tag." - v${CARLA_ZLIB_VERSION}) - -# ==== LUNASVG ==== - -carla_string_option ( - CARLA_LUNASVG_VERSION - "Target lunasvg version." - master -) - -carla_string_option ( - CARLA_LUNASVG_TAG - "Target lunasvg git tag." - ${CARLA_LUNASVG_VERSION} -) - -# ==== LIBOSMSCOUT ==== - -carla_string_option ( - CARLA_LIBOSMSCOUT_VERSION - "Target libosmscout version." - master -) - -carla_string_option ( - CARLA_LIBOSMSCOUT_TAG - "Target libosmscout git tag." - ${CARLA_LIBOSMSCOUT_VERSION} -) - - -# ==== STREETMAP ==== - -carla_string_option ( - CARLA_STREETMAP_VERSION - "Target StreetMap version." - ue5.3 -) - -carla_string_option ( - CARLA_STREETMAP_TAG - "Target StreetMap git tag." - ${CARLA_STREETMAP_VERSION} -) +include (${CARLA_WORKSPACE_PATH}/CMake/Options/Common.cmake) +include (${CARLA_WORKSPACE_PATH}/CMake/Options/Unreal.cmake) +include (${CARLA_WORKSPACE_PATH}/CMake/Options/Dependencies.cmake) \ No newline at end of file diff --git a/CMake/LinuxToolchain.cmake b/CMake/LinuxToolchain.cmake index ff4eb0d31..e84381077 100644 --- a/CMake/LinuxToolchain.cmake +++ b/CMake/LinuxToolchain.cmake @@ -1,4 +1,14 @@ -set (UE_ROOT /home/marcel/CarlaUnrealEngine5) +#[[ + + Copyright (c) 2024 Computer Vision Center (CVC) at the Universitat Autonoma + de Barcelona (UAB). + + This work is licensed under the terms of the MIT license. + For a copy, see . + +]] + +set (UE_ROOT /home/marcel/CarlaUnrealEngine5) # @TODO # set (UE_ROOT ${CARLA_UNREAL_ENGINE_PATH} CACHE PATH "") message ("UE_ROOT=${UE_ROOT}") diff --git a/CMake/Options/Common.cmake b/CMake/Options/Common.cmake new file mode 100644 index 000000000..07dd0d176 --- /dev/null +++ b/CMake/Options/Common.cmake @@ -0,0 +1,87 @@ +#[[ + + Copyright (c) 2024 Computer Vision Center (CVC) at the Universitat Autonoma + de Barcelona (UAB). + + This work is licensed under the terms of the MIT license. + For a copy, see . + +]] + +option ( + BUILD_CARLA_CLIENT + "Build the LibCarla client." + ON +) + +option ( + BUILD_CARLA_SERVER + "Build the LibCarla server." + ON +) + +option ( + ENABLE_LIBCARLA_PYTORCH + "Enable LibCarla-PyTorch." + OFF +) + +option ( + BUILD_PYTHON_API + "Build the CARLA Python API." + ON +) + +option ( + BUILD_CARLA_UE + "Build the Carla Unreal Engine project." + OFF +) + +option ( + ENABLE_ROS2 + "Enable ROS2." + OFF +) + +option ( + ENABLE_OSM2ODR + "Enable OSM2ODR." + OFF +) + +option ( + ENABLE_RSS + "Enable RSS components (ad-rss-lib)" + OFF +) + +option ( + INSTALL_LIBCARLA + "Install LibCarla and all of its dependencies." + ON +) + +option ( + BUILD_OSM_WORLD_RENDERER + "Build OSM World Renderer." + OFF +) + +option ( + ENABLE_RTTI + "Enable C++ RTTI." + OFF +) + +option ( + ENABLE_EXCEPTIONS + "Enable C++ Exceptions." + OFF +) + +option ( + PREFER_CLONE + "Whether to clone dependencies instead of directly downloading a compressed archive." + OFF +) \ No newline at end of file diff --git a/CMake/Options/Dependencies.cmake b/CMake/Options/Dependencies.cmake new file mode 100644 index 000000000..d19651d80 --- /dev/null +++ b/CMake/Options/Dependencies.cmake @@ -0,0 +1,172 @@ +#[[ + + Copyright (c) 2024 Computer Vision Center (CVC) at the Universitat Autonoma + de Barcelona (UAB). + + This work is licensed under the terms of the MIT license. + For a copy, see . + +]] + +# ==== BOOST ==== + +carla_string_option ( + CARLA_BOOST_VERSION + "Target boost version." + 1.84.0 +) + +carla_string_option ( + CARLA_BOOST_TAG + "Target boost git tag." + boost-${CARLA_BOOST_VERSION} +) + +# ==== EIGEN ==== + +carla_string_option ( + CARLA_EIGEN_VERSION + "Target Eigen version." + 3.4.0 +) + +carla_string_option ( + CARLA_EIGEN_TAG + "Target Eigen git tag." + ${CARLA_EIGEN_VERSION} +) + +# ==== GOOGLE TEST ==== + +carla_string_option ( + CARLA_GTEST_VERSION + "Target googletest version." + 1.14.0 +) + +carla_string_option ( + CARLA_GTEST_TAG + "Target googletest git tag." + v${CARLA_GTEST_VERSION} +) + +# ==== LIBPNG ==== + +carla_string_option ( + CARLA_LIBPNG_VERSION + "Target libpng version." + 1.6.40 +) + +carla_string_option ( + CARLA_LIBPNG_TAG + "Target libpng git tag." + v${CARLA_LIBPNG_VERSION} +) + +# ==== PROJ ==== + +carla_string_option ( + CARLA_PROJ_VERSION + "Target PROJ version." + 7.2.1 +) + +carla_string_option ( + CARLA_PROJ_TAG + "Target PROJ git tag." + ${CARLA_PROJ_VERSION} +) + +# ==== RECAST ==== + +carla_string_option ( + CARLA_RECAST_TAG + "Target recastnavigation git tag." + carla +) + +# ==== RPCLIB ==== + +carla_string_option ( + CARLA_RPCLIB_TAG + "Target rpclib git tag." + carla +) + +# ==== SQLITE3 ==== + +carla_string_option ( + CARLA_SQLITE_VERSION + "Target SQLite version (major[1].minor[2].patch[2].revision[2])." + 3.45.01.00 +) + +# ==== XERCESC ==== + +carla_string_option ( + CARLA_XERCESC_VERSION + "Target xerces-c version." + 3.2.4 +) + +carla_string_option ( + CARLA_XERCESC_TAG + "Target xerces-c git tag." + v${CARLA_XERCESC_VERSION} +) + +# ==== ZLIB ==== + +carla_string_option ( + CARLA_ZLIB_VERSION + "Target zlib git tag." + 1.3.1) + +carla_string_option ( + CARLA_ZLIB_TAG + "Target zlib git tag." + v${CARLA_ZLIB_VERSION}) + +# ==== LUNASVG ==== + +carla_string_option ( + CARLA_LUNASVG_VERSION + "Target lunasvg version." + master +) + +carla_string_option ( + CARLA_LUNASVG_TAG + "Target lunasvg git tag." + ${CARLA_LUNASVG_VERSION} +) + +# ==== LIBOSMSCOUT ==== + +carla_string_option ( + CARLA_LIBOSMSCOUT_VERSION + "Target libosmscout version." + master +) + +carla_string_option ( + CARLA_LIBOSMSCOUT_TAG + "Target libosmscout git tag." + ${CARLA_LIBOSMSCOUT_VERSION} +) + + +# ==== STREETMAP ==== + +carla_string_option ( + CARLA_STREETMAP_VERSION + "Target StreetMap version." + ue5.3 +) + +carla_string_option ( + CARLA_STREETMAP_TAG + "Target StreetMap git tag." + ${CARLA_STREETMAP_VERSION} +) \ No newline at end of file diff --git a/CMake/Options/Unreal.cmake b/CMake/Options/Unreal.cmake new file mode 100644 index 000000000..f8907a446 --- /dev/null +++ b/CMake/Options/Unreal.cmake @@ -0,0 +1,50 @@ +#[[ + + Copyright (c) 2024 Computer Vision Center (CVC) at the Universitat Autonoma + de Barcelona (UAB). + + This work is licensed under the terms of the MIT license. + For a copy, see . + +]] + +option ( + CARLA_UNREAL_CONTENT_PREFER_CLONE + "Whether to perform a git clone instead of a direct archive download of the CARLA Unreal assets (EXTREMELY DISCOURAGED)." + OFF +) + +carla_string_option ( + CARLA_UNREAL_ENGINE_PATH + "Path to the CARLA fork of Unreal Engine." + "" +) + +if (WIN32) + set (CARLA_UNREAL_RHI_DEFAULT d3d12) +elseif (LINUX) + set (CARLA_UNREAL_RHI_DEFAULT vulkan) +endif () + +carla_string_option ( + CARLA_UNREAL_RHI + "Target CARLA Unreal Engine RHI." + "vulkan" + "${CARLA_UNREAL_RHI_DEFAULT}" +) + +if (EXISTS ${CARLA_UNREAL_ENGINE_PATH}) + set (CARLA_HAS_UNREAL_ENGINE_PATH ON) +else () + set (CARLA_HAS_UNREAL_ENGINE_PATH OFF) +endif () + +if (${BUILD_CARLA_UE}) + if (${CARLA_HAS_UNREAL_ENGINE_PATH}) + message ("Carla UE project successfully added to build. (UE path: ${CARLA_UNREAL_ENGINE_PATH})") + else () + message ( + FATAL_ERROR + "Could not add UE project to build since the option CARLA_UNREAL_ENGINE_PATH is not set to a valid path (\"${CARLA_UNREAL_ENGINE_PATH}\"). Please set it to point to the root path of your CARLA Unreal Engine installation.") + endif () +endif () diff --git a/CMakeLists.txt b/CMakeLists.txt index 332d8e670..2c7d22652 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,13 @@ +#[[ + + Copyright (c) 2024 Computer Vision Center (CVC) at the Universitat Autonoma + de Barcelona (UAB). + + This work is licensed under the terms of the MIT license. + For a copy, see . + +]] + cmake_minimum_required (VERSION 3.28.0) cmake_policy (SET CMP0097 NEW) @@ -41,19 +51,25 @@ set ( ${CARLA_WORKSPACE_PATH}/Unreal/CarlaUnreal/Plugins ) -if (NOT WIN32) - set (THREADS_PREFER_PTHREAD_FLAG ON) - set (CMAKE_THREADS_PREFER_PTHREAD_FLAG ON) - find_package ( - Threads - REQUIRED - ) -endif () - include (CheckCCompilerFlag) include (CheckCXXCompilerFlag) +include (CheckLinkerFlag) + include (${CARLA_WORKSPACE_PATH}/CMake/CarlaOptions.cmake) +if (LINUX) + check_linker_flag ( + CXX + -lpthread + HAS_PTHREAD + ) + if (HAS_PTHREAD) + add_link_options (-lpthread) + endif () +endif () + +# Similar to configure_file, but also expands variables +# that are set at generate time, like generator expressions. macro (carla_two_step_configure_file DESTINATION SOURCE) message ("Configuring file \"${DESTINATION}\"") # Configure-time step; evaluate variables: @@ -62,6 +78,10 @@ macro (carla_two_step_configure_file DESTINATION SOURCE) file (GENERATE OUTPUT ${DESTINATION} INPUT ${DESTINATION}) endmacro () + + +set (CMAKE_POSITION_INDEPENDENT_CODE ON) + if (WIN32) if (CMAKE_BUILD_TYPE STREQUAL "Debug") set (CARLA_DEBUG_AFFIX d) @@ -72,6 +92,8 @@ if (WIN32) endif () endif () + + set ( CARLA_COMMON_DEFINITIONS LIBCARLA_IMAGE_WITH_PNG_SUPPORT=true @@ -86,6 +108,7 @@ if (WIN32) endif () set (CARLA_EXCEPTION_DEFINITIONS) + if (ENABLE_EXCEPTIONS) # Nothing else () @@ -95,9 +118,11 @@ else () list (APPEND CARLA_EXCEPTION_DEFINITIONS PUGIXML_NO_EXCEPTIONS) endif () -include ( - ${CARLA_WORKSPACE_PATH}/CMake/CarlaDependencies.cmake -) + + +include (${CARLA_WORKSPACE_PATH}/CMake/CarlaDependencies.cmake) + + if (BUILD_CARLA_CLIENT OR BUILD_CARLA_SERVER) add_subdirectory (LibCarla) diff --git a/PythonAPI/examples/.gitignore b/PythonAPI/examples/.gitignore index 5e4659675..bcb8636d9 100644 --- a/PythonAPI/examples/.gitignore +++ b/PythonAPI/examples/.gitignore @@ -1 +1,2 @@ -cache \ No newline at end of file +carla.so +carla.pyd \ No newline at end of file diff --git a/Unreal/CMakeLists.txt b/Unreal/CMakeLists.txt index a9f0835ff..329d07bac 100644 --- a/Unreal/CMakeLists.txt +++ b/Unreal/CMakeLists.txt @@ -2,18 +2,6 @@ project ( carla-ue ) -if (WIN32) - set ( - CARLA_UE_GENERATE_PROJECT_SCRIPT - ${CARLA_UNREAL_ENGINE_PATH}/GenerateProjectFiles.bat - ) -else () - set ( - CARLA_UE_GENERATE_PROJECT_SCRIPT - ${CARLA_UNREAL_ENGINE_PATH}/GenerateProjectFiles.sh - ) -endif () - set ( CARLA_UE_PATH ${CARLA_WORKSPACE_PATH}/Unreal/CarlaUnreal @@ -29,15 +17,19 @@ set ( ${CARLA_UE_PATH}/CarlaUnreal.uproject ) -carla_two_step_configure_file ( - ${CARLA_UE_PLUGINS_PATH}/Carla/Source/Carla/Carla.Build.cs - ${CARLA_UE_PLUGINS_PATH}/Carla/Source/Carla/Carla.Build.cs.in -) +if (WIN32) + set ( + CARLA_UE_GENERATE_PROJECT_SCRIPT + ${CARLA_UNREAL_ENGINE_PATH}/GenerateProjectFiles.bat + ) +else () + set ( + CARLA_UE_GENERATE_PROJECT_SCRIPT + ${CARLA_UNREAL_ENGINE_PATH}/GenerateProjectFiles.sh + ) +endif () + -carla_two_step_configure_file ( - ${CARLA_UE_PLUGINS_PATH}/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs - ${CARLA_UE_PLUGINS_PATH}/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs.in -) add_custom_command ( OUTPUT ${CARLA_UE_PATH}/CMakeLists.txt @@ -56,12 +48,28 @@ add_custom_target ( DEPENDS ${CARLA_UE_PATH}/CMakeLists.txt ) + + +if (CMAKE_TOOLCHAIN_FILE) + cmake_path ( + ABSOLUTE_PATH CMAKE_TOOLCHAIN_FILE + BASE_DIRECTORY ${CARLA_WORKSPACE_PATH} + NORMALIZE + OUTPUT_VARIABLE TOOLCHAIN_FILE + ) + set (TOOLCHAIN_FILE_OPTION --toolchain=${TOOLCHAIN_FILE}) +else () + set (TOOLCHAIN_FILE_OPTION) +endif () + + + add_custom_command ( OUTPUT carla-ue-configure.stamp - COMMAND - ${CMAKE_COMMAND} -E touch carla-ue-configure.stamp COMMENT "Configuring Carla Unreal..." + COMMAND + ${CMAKE_COMMAND} -E touch carla-ue-configure.stamp COMMAND ${CMAKE_COMMAND} -S ${CARLA_UE_PATH} @@ -76,13 +84,14 @@ add_custom_target ( carla-ue-generate-project-files ) + + add_custom_command ( OUTPUT carla-ue.stamp - VERBATIM - COMMAND - ${CMAKE_COMMAND} -E touch carla-ue.stamp COMMENT "Building Carla Unreal..." + COMMAND + ${CMAKE_COMMAND} -E touch carla-ue.stamp COMMAND ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR} @@ -98,7 +107,38 @@ add_custom_target ( carla-ue.stamp ) + + +add_custom_target ( + launch-only + COMMAND + ${CARLA_UNREAL_ENGINE_PATH}/Engine/Binaries/Linux/UnrealEditor + ${CARLA_UE_PROJECT_PATH} + -${CARLA_UNREAL_RHI} +) + + + +add_custom_target ( + launch + DEPENDS + carla-ue + launch-only +) + + + file ( MAKE_DIRECTORY ${CARLA_UE_PATH}/Content/Carla/ExportedMaps +) + +carla_two_step_configure_file ( + ${CARLA_UE_PLUGINS_PATH}/Carla/Source/Carla/Carla.Build.cs + ${CARLA_UE_PLUGINS_PATH}/Carla/Source/Carla/Carla.Build.cs.in +) + +carla_two_step_configure_file ( + ${CARLA_UE_PLUGINS_PATH}/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs + ${CARLA_UE_PLUGINS_PATH}/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs.in ) \ No newline at end of file diff --git a/Unreal/CarlaUnreal/Config/DefaultInput.ini b/Unreal/CarlaUnreal/Config/DefaultInput.ini index 84bc72bbc..7f5b377cb 100644 --- a/Unreal/CarlaUnreal/Config/DefaultInput.ini +++ b/Unreal/CarlaUnreal/Config/DefaultInput.ini @@ -1,4 +1,5 @@ + [/Script/Engine.InputSettings] -AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f)) -AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f)) @@ -6,6 +7,8 @@ -AxisConfig=(AxisKeyName="Gamepad_RightY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f)) -AxisConfig=(AxisKeyName="MouseX",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f)) -AxisConfig=(AxisKeyName="MouseY",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f)) +-AxisConfig=(AxisKeyName="Mouse2D",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f)) ++AxisConfig=(AxisKeyName="Mouse2D",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False)) +AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) +AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) +AxisConfig=(AxisKeyName="Gamepad_RightX",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) @@ -27,46 +30,93 @@ +AxisConfig=(AxisKeyName="MotionController_Right_Grip2Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) +AxisConfig=(AxisKeyName="Gamepad_Special_Left_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) +AxisConfig=(AxisKeyName="Gamepad_Special_Left_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Vive_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Vive_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Vive_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Vive_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Vive_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Vive_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="OculusTouch_Left_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="OculusTouch_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="OculusTouch_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="OculusTouch_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="OculusTouch_Right_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="OculusTouch_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="OculusTouch_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="OculusTouch_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Grip_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Grip_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Trackpad_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) bAltEnterTogglesFullscreen=True bF11TogglesFullscreen=True bUseMouseForTouch=False bEnableMouseSmoothing=True bEnableFOVScaling=True -FOVScale=0.011110 -DoubleClickTime=0.200000 bCaptureMouseOnLaunch=False -DefaultViewportMouseCaptureMode=CaptureDuringMouseDown -bDefaultViewportMouseLock=False -DefaultViewportMouseLockMode=DoNotLock -+ActionMappings=(ActionName="RestartLevel",Key=R,bShift=False,bCtrl=False,bAlt=False,bCmd=False) -+ActionMappings=(ActionName="Handbrake",Key=SpaceBar,bShift=False,bCtrl=False,bAlt=False,bCmd=False) -+ActionMappings=(ActionName="ToggleManualMode",Key=M,bShift=False,bCtrl=False,bAlt=False,bCmd=False) -+ActionMappings=(ActionName="ToggleHUD",Key=G,bShift=False,bCtrl=False,bAlt=False,bCmd=False) -+ActionMappings=(ActionName="Jump",Key=Enter,bShift=False,bCtrl=False,bAlt=False,bCmd=False) -+ActionMappings=(ActionName="ToggleReverse",Key=Q,bShift=False,bCtrl=False,bAlt=False,bCmd=False) -+ActionMappings=(ActionName="UseTheForce",Key=F,bShift=False,bCtrl=False,bAlt=False,bCmd=False) -+ActionMappings=(ActionName="ToggleCamera",Key=Tab,bShift=False,bCtrl=False,bAlt=False,bCmd=False) -+ActionMappings=(ActionName="ChangeWeather",Key=C,bShift=False,bCtrl=False,bAlt=False,bCmd=False) -+ActionMappings=(ActionName="ToggleAutopilot",Key=P,bShift=False,bCtrl=False,bAlt=False,bCmd=False) -+AxisMappings=(AxisName="CameraZoom",Key=MouseWheelAxis,Scale=-20.000000) -+AxisMappings=(AxisName="CameraZoom",Key=PageUp,Scale=-10.000000) -+AxisMappings=(AxisName="CameraZoom",Key=PageDown,Scale=10.000000) -+AxisMappings=(AxisName="CameraUp",Key=Up,Scale=1.000000) -+AxisMappings=(AxisName="CameraUp",Key=Down,Scale=-1.000000) -+AxisMappings=(AxisName="CameraRight",Key=Right,Scale=1.000000) -+AxisMappings=(AxisName="CameraRight",Key=Left,Scale=-1.000000) -+AxisMappings=(AxisName="MoveForward",Key=W,Scale=1.000000) -+AxisMappings=(AxisName="MoveRight",Key=D,Scale=1.000000) -+AxisMappings=(AxisName="MoveRight",Key=A,Scale=-1.000000) -+AxisMappings=(AxisName="Brake",Key=B,Scale=1.000000) -+AxisMappings=(AxisName="MoveForward",Key=S,Scale=-1.000000) -+AxisMappings=(AxisName="MoveUp",Key=E,Scale=1.000000) -+AxisMappings=(AxisName="MoveUp",Key=Q,Scale=-1.000000) +bEnableLegacyInputScales=True +bEnableMotionControls=True +bFilterInputByPlatformUser=False +bEnableInputDeviceSubsystem=True +bShouldFlushPressedKeysOnViewportFocusLost=True +bEnableDynamicComponentInputBinding=True bAlwaysShowTouchInterface=False bShowConsoleOnFourFingerTap=True +bEnableGestureRecognizer=False +bUseAutocorrect=False +DefaultViewportMouseCaptureMode=CaptureDuringMouseDown +DefaultViewportMouseLockMode=DoNotLock +FOVScale=0.011110 +DoubleClickTime=0.200000 ++ActionMappings=(ActionName="RestartLevel",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=R) ++ActionMappings=(ActionName="Handbrake",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=SpaceBar) ++ActionMappings=(ActionName="ToggleManualMode",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=M) ++ActionMappings=(ActionName="ToggleHUD",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=G) ++ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Enter) ++ActionMappings=(ActionName="ToggleReverse",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Q) ++ActionMappings=(ActionName="UseTheForce",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=F) ++ActionMappings=(ActionName="ToggleCamera",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Tab) ++ActionMappings=(ActionName="ChangeWeather",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=C) ++ActionMappings=(ActionName="ToggleAutopilot",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=P) ++AxisMappings=(AxisName="CameraZoom",Scale=-20.000000,Key=MouseWheelAxis) ++AxisMappings=(AxisName="CameraZoom",Scale=-10.000000,Key=PageUp) ++AxisMappings=(AxisName="CameraZoom",Scale=10.000000,Key=PageDown) ++AxisMappings=(AxisName="CameraUp",Scale=1.000000,Key=Up) ++AxisMappings=(AxisName="CameraUp",Scale=-1.000000,Key=Down) ++AxisMappings=(AxisName="CameraRight",Scale=1.000000,Key=Right) ++AxisMappings=(AxisName="CameraRight",Scale=-1.000000,Key=Left) ++AxisMappings=(AxisName="MoveForward",Scale=1.000000,Key=W) ++AxisMappings=(AxisName="MoveRight",Scale=1.000000,Key=D) ++AxisMappings=(AxisName="MoveRight",Scale=-1.000000,Key=A) ++AxisMappings=(AxisName="Brake",Scale=1.000000,Key=B) ++AxisMappings=(AxisName="MoveForward",Scale=-1.000000,Key=S) ++AxisMappings=(AxisName="MoveUp",Scale=1.000000,Key=E) ++AxisMappings=(AxisName="MoveUp",Scale=-1.000000,Key=Q) +DefaultPlayerInputClass=/Script/EnhancedInput.EnhancedPlayerInput +DefaultInputComponentClass=/Script/EnhancedInput.EnhancedInputComponent DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.DefaultVirtualJoysticks -ConsoleKey=None -ConsoleKeys=Tilde +ConsoleKeys=Tilde -