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

Changes for compiling UE 4.26

This commit is contained in:
bernat 2021-02-02 15:21:08 +01:00
parent e34e0f40b7
commit 812508116e
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PythonAPI/carla/setup.py
View File

@ -126,7 +126,7 @@ def get_libcarla_extensions():
'/experimental:external', '/external:I', 'dependencies/include/system',
'/DBOOST_ALL_NO_LIB', '/DBOOST_PYTHON_STATIC_LIB',
'/DBOOST_ERROR_CODE_HEADER_ONLY', '/D_WIN32_WINNT=0x0600', '/DHAVE_SNPRINTF',
'/DLIBCARLA_WITH_PYTHON_SUPPORT', '-DLIBCARLA_IMAGE_WITH_PNG_SUPPORT=true']
'/DLIBCARLA_WITH_PYTHON_SUPPORT', '-DLIBCARLA_IMAGE_WITH_PNG_SUPPORT=true', '/MD']
else:
raise NotImplementedError

5
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/PrepareAssetsForCookingCommandlet.h
View File

@ -13,6 +13,11 @@
#include "Runtime/Engine/Classes/Engine/StaticMeshActor.h"
#include "PrepareAssetsForCookingCommandlet.generated.h"
// undef this API to avoid conflict with UE 4.26
// (see UE_4.26\Engine\Source\Runtime\Core\Public\Windows\HideWindowsPlatformAtomics.h)
#undef InterlockedCompareExchange
#undef _InterlockedCompareExchange
/// Struct containing Package with @a Name and @a bOnlyPrepareMaps flag used to
/// separate the cooking of maps and props across the different stages (Maps
/// will be imported during make import command and Props will be imported

2
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveGenerator.cpp
View File

@ -16,7 +16,7 @@
#include <compiler/enable-ue4-macros.h>
#include "Engine/Classes/Interfaces/Interface_CollisionDataProvider.h"
#include "PhysicsEngine/BodySetupEnums.h"
#include "PhysicsCore/Public/BodySetupEnums.h"
AProceduralMeshActor::AProceduralMeshActor()
{

3
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/PixelReader.cpp
View File

@ -92,7 +92,8 @@ TUniquePtr<TImagePixelData<FColor>> FPixelReader::DumpPixels(
{
const FIntPoint DestSize(RenderTarget.GetSurfaceWidth(), RenderTarget.GetSurfaceHeight());
TUniquePtr<TImagePixelData<FColor>> PixelData = MakeUnique<TImagePixelData<FColor>>(DestSize);
if (!WritePixelsToArray(RenderTarget, PixelData->Pixels))
TArray<FColor> Pixels(PixelData->Pixels.GetData(), PixelData->Pixels.Num());
if (!WritePixelsToArray(RenderTarget, Pixels))
{
return nullptr;
}

7
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.cpp
View File

@ -337,13 +337,13 @@ float ASceneCaptureSensor::GetExposureSpeedUp() const
void ASceneCaptureSensor::SetExposureCalibrationConstant(float Constant)
{
check(CaptureComponent2D != nullptr);
CaptureComponent2D->PostProcessSettings.AutoExposureCalibrationConstant = Constant;
CaptureComponent2D->PostProcessSettings.AutoExposureCalibrationConstant_DEPRECATED = Constant;
}
float ASceneCaptureSensor::GetExposureCalibrationConstant() const
{
check(CaptureComponent2D != nullptr);
return CaptureComponent2D->PostProcessSettings.AutoExposureCalibrationConstant;
return CaptureComponent2D->PostProcessSettings.AutoExposureCalibrationConstant_DEPRECATED;
}
void ASceneCaptureSensor::SetMotionBlurIntensity(float Intensity)
@ -542,7 +542,7 @@ namespace SceneCaptureSensor_local_ns {
PostProcessSettings.bOverride_AutoExposureMaxBrightness = true;
PostProcessSettings.bOverride_AutoExposureSpeedUp = true;
PostProcessSettings.bOverride_AutoExposureSpeedDown = true;
PostProcessSettings.bOverride_AutoExposureCalibrationConstant = true;
PostProcessSettings.bOverride_AutoExposureCalibrationConstant_DEPRECATED = true;
PostProcessSettings.bOverride_HistogramLogMin = true;
PostProcessSettings.HistogramLogMin = 1.0f;
PostProcessSettings.bOverride_HistogramLogMax = true;
@ -753,7 +753,6 @@ namespace SceneCaptureSensor_local_ns {
// ShowFlags.SetVisualizeBloom(false);
ShowFlags.SetVisualizeBuffer(false);
ShowFlags.SetVisualizeDistanceFieldAO(false);
ShowFlags.SetVisualizeDistanceFieldGI(false);
ShowFlags.SetVisualizeDOF(false);
ShowFlags.SetVisualizeHDR(false);
ShowFlags.SetVisualizeLightCulling(false);