diff --git a/CMakeLists.txt b/CMakeLists.txt index ec12313e8..e850e1bba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,8 +23,8 @@ if (${CMAKE_MINOR_VERSION} GREATER_EQUAL 24) endif () set (CARLA_VERSION_MAJOR 0) -set (CARLA_VERSION_MINOR 9) -set (CARLA_VERSION_PATCH 15) +set (CARLA_VERSION_MINOR 10) +set (CARLA_VERSION_PATCH 0) set ( CARLA_VERSION diff --git a/Unreal/CarlaUnreal/CarlaUnreal.uproject b/Unreal/CarlaUnreal/CarlaUnreal.uproject index 29639c251..6b0a236e4 100644 --- a/Unreal/CarlaUnreal/CarlaUnreal.uproject +++ b/Unreal/CarlaUnreal/CarlaUnreal.uproject @@ -20,81 +20,6 @@ "Name": "Carla", "Enabled": true }, - { - "Name": "OnlineSubsystemGooglePlay", - "Enabled": false, - "SupportedTargetPlatforms": [ - "Android" - ] - }, - { - "Name": "AndroidPermission", - "Enabled": false - }, - { - "Name": "AppleARKit", - "Enabled": false - }, - { - "Name": "LocationServicesBPLibrary", - "Enabled": false - }, - { - "Name": "AndroidDeviceProfileSelector", - "Enabled": false - }, - { - "Name": "ExampleDeviceProfileSelector", - "Enabled": false - }, - { - "Name": "IOSDeviceProfileSelector", - "Enabled": false - }, - { - "Name": "UObjectPlugin", - "Enabled": false - }, - { - "Name": "AndroidMedia", - "Enabled": false - }, - { - "Name": "HTML5Networking", - "Enabled": false - }, - { - "Name": "MobileLauncherProfileWizard", - "Enabled": false - }, - { - "Name": "MobilePatchingUtils", - "Enabled": false - }, - { - "Name": "AndroidMoviePlayer", - "Enabled": false - }, - { - "Name": "AppleMoviePlayer", - "Enabled": false - }, - { - "Name": "GoogleCloudMessaging", - "Enabled": false - }, - { - "Name": "PerformanceMonitor", - "Enabled": true - }, - { - "Name": "OculusVR", - "Enabled": false - }, - { - "Name": "SteamVR", - "Enabled": false - }, { "Name": "RenderDocPlugin", "Enabled": true @@ -143,38 +68,18 @@ "Name": "RigLogic", "Enabled": true }, - { - "Name": "LiveLink", - "Enabled": true - }, - { - "Name": "LiveLinkControlRig", - "Enabled": true - }, - { - "Name": "AppleARKitFaceSupport", - "Enabled": true, - "SupportedTargetPlatforms": [ - "IOS", - "Win64", - "Mac", - "Linux", - "Android" - ] - }, - { - "Name": "MovieRenderPipeline", - "Enabled": true - }, { "Name": "Volumetrics", "Enabled": true + }, + { + "Name": "PerformanceMonitor", + "Enabled": true } ], "TargetPlatforms": [ "Linux", "LinuxArm64", - "Mac", "Windows" ] } \ No newline at end of file diff --git a/Unreal/CarlaUnreal/Config/DefaultGame.ini b/Unreal/CarlaUnreal/Config/DefaultGame.ini index 06369550e..2fc115280 100644 --- a/Unreal/CarlaUnreal/Config/DefaultGame.ini +++ b/Unreal/CarlaUnreal/Config/DefaultGame.ini @@ -3,7 +3,7 @@ ProjectID=675BF8694238308FA9368292CC440350 ProjectName=CarlaUnreal CompanyName=CVC CopyrightNotice="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 ." -ProjectVersion=0.9.15 +ProjectVersion=0.10.0 [/Script/Carla.CarlaSettings] +LowRoadMaterials=(MaterialInterface=MaterialInstanceConstant'"/Game/Carla/Static/GenericMaterials/Ground/SimpleRoad/CheapRoad.CheapRoad"',MaterialSlotName="Tileroad_Road",ImportedMaterialSlotName="",UVChannelData=(bInitialized=False,bOverrideDensities=False,LocalUVDensities[0]=0.000000,LocalUVDensities[1]=0.000000,LocalUVDensities[2]=0.000000,LocalUVDensities[3]=0.000000)) diff --git a/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.cpp index 9cac1f0a6..7809bdf25 100644 --- a/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.cpp +++ b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.cpp @@ -76,7 +76,7 @@ void ACarlaWheeledVehicle::BeginPlay() GetDefaultSubobjectByName(ConstraintComponent->ComponentName1.ComponentName)); if(DoorComponent) { - UE_LOG(LogCarla, Warning, TEXT("Door name: %s"), *(DoorComponent->GetName())); + UE_LOG(LogCarla, Log, TEXT("Door name: %s"), *(DoorComponent->GetName())); FTransform ComponentWorldTransform = DoorComponent->GetComponentTransform(); FTransform RelativeTransform = ComponentWorldTransform * ActorInverseTransform; DoorComponentsTransform.Add(DoorComponent, RelativeTransform);