Fix crash when launching cooked environment created with SUV vehicle.

Mayankm96 · Apr 5, 2018 · 87f0797 · 87f0797
1 parent 4d02910
commit 87f0797
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/Unreal/Plugins/AirSim/Source/Car/CarPawn.cpp b/Unreal/Plugins/AirSim/Source/Car/CarPawn.cpp
@@ -34,6 +34,19 @@ ACarPawn::ACarPawn()
 
     UWheeledVehicleMovementComponent4W* Vehicle4W = CastChecked<UWheeledVehicleMovementComponent4W>(GetVehicleMovement());
 
+    // load assets
+    if (UseDefaultMesh) {
+        static MeshContructionHelpers helpers(AirSimSettings::singleton().car_mesh_paths);
+        GetMesh()->SetSkeletalMesh(helpers.skeleton);
+        GetMesh()->SetAnimationMode(EAnimationMode::AnimationBlueprint);
+        GetMesh()->SetAnimInstanceClass(helpers.bp->GeneratedClass);
+        SlipperyMaterial = helpers.slippery_mat;
+        NonSlipperyMaterial = helpers.non_slippery_mat;
+    }
+
+    static ConstructorHelpers::FClassFinder<APIPCamera> pip_camera_class(TEXT("Blueprint'/AirSim/Blueprints/BP_PIPCamera'"));
+    pip_camera_class_ = pip_camera_class.Succeeded() ? pip_camera_class.Class : nullptr;
+
     check(Vehicle4W->WheelSetups.Num() == 4);
 
     // Wheels/Tyres
@@ -165,17 +178,6 @@ void ACarPawn::initializeForBeginPlay(bool enable_rpc, const std::string& api_se
     else
         EngineSoundComponent->Deactivate();
 
-    // load assets
-    MeshContructionHelpers helpers(AirSimSettings::singleton().car_mesh_paths);
-    GetMesh()->SetSkeletalMesh(helpers.skeleton);
-    GetMesh()->SetAnimationMode(EAnimationMode::AnimationBlueprint);
-    GetMesh()->SetAnimInstanceClass(helpers.bp->GeneratedClass);
-    SlipperyMaterial = helpers.slippery_mat;
-    NonSlipperyMaterial = helpers.non_slippery_mat;
-
-    ConstructorHelpers::FClassFinder<APIPCamera> pip_camera_class(TEXT("Blueprint'/AirSim/Blueprints/BP_PIPCamera'"));
-    pip_camera_class_ = pip_camera_class.Succeeded() ? pip_camera_class.Class : nullptr;
-
     //put camera little bit above vehicle
     FTransform camera_transform(FVector::ZeroVector);
     FActorSpawnParameters camera_spawn_params;

diff --git a/Unreal/Plugins/AirSim/Source/Car/CarPawn.h b/Unreal/Plugins/AirSim/Source/Car/CarPawn.h
@@ -65,6 +65,11 @@ class ACarPawn : public AWheeledVehicle
     UPROPERTY(Category = Display, VisibleDefaultsOnly, BlueprintReadOnly, meta = (AllowPrivateAccess = "true"))
     UAudioComponent* EngineSoundComponent;
 
+
+    /** Whether to load the default meshes */
+    UPROPERTY(Category = Display, VisibleDefaultsOnly, BlueprintReadOnly, meta = (AllowPrivateAccess = "true"))
+    bool UseDefaultMesh = false;
+
 public:
     ACarPawn();