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

Added workarround to enable custom Carsim simfile.

This commit is contained in:
Axel 2020-12-02 19:30:32 +01:00 committed by bernat
parent 952bdfcfce
commit 009663e57d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.cpp
View File

@ -558,13 +558,17 @@ void ACarlaWheeledVehicle::SetCarSimEnabled(bool bEnabled, FString SimfilePath)
CarSimMovementComponent->DisableVehicle = false;
CarSimMovementComponent->VsConfigFile = SimfilePath;
CarSimMovementComponent->Activate();
// super hack to work arround CarSim component limitations to specify simfiles
CarSimMovementComponent->EndPlay(EEndPlayReason::Type::RemovedFromWorld);
CarSimMovementComponent->BeginPlay();
CarSimMovementComponent->ResetVsVehicle(false);
// set carsim position to actor's
CarSimMovementComponent->SyncVsVehicleLocOri();
CarSimMovementComponent->SetComponentTickEnabled(true);
// set kinematic mode for root component and bones
GetMesh()->PhysicsTransformUpdateMode = EPhysicsTransformUpdateMode::ComponentTransformIsKinematic;
auto * Bone = GetMesh()->GetBodyInstance("Vehicle_Base");
auto * Bone = GetMesh()->GetBodyInstance(NAME_None);
if (Bone)
{
Bone->SetInstanceSimulatePhysics(false);
@ -586,7 +590,7 @@ void ACarlaWheeledVehicle::SetCarSimEnabled(bool bEnabled, FString SimfilePath)
CarSimMovementComponent->Deactivate();
CarSimMovementComponent->VsConfigFile = "";
GetMesh()->PhysicsTransformUpdateMode = EPhysicsTransformUpdateMode::SimulationUpatesComponentTransform;
auto * Bone = GetMesh()->GetBodyInstance("Vehicle_Base");
auto * Bone = GetMesh()->GetBodyInstance(NAME_None);
if (Bone)
{
Bone->SetInstanceSimulatePhysics(true);
@ -598,6 +602,7 @@ void ACarlaWheeledVehicle::SetCarSimEnabled(bool bEnabled, FString SimfilePath)
OnActorHit.RemoveDynamic(this, &ACarlaWheeledVehicle::OnCarSimHit);
GetMesh()->OnComponentBeginOverlap.RemoveDynamic(this, &ACarlaWheeledVehicle::OnCarSimOverlap);
GetMesh()->SetCollisionResponseToChannel(ECollisionChannel::ECC_WorldStatic, ECollisionResponse::ECR_Block);
GetMesh()->SetCollisionProfileName("Vehicle");
}
bCarSimEnabled = bEnabled;
}