Fix for microsoft#507

fords · Oct 3, 2017 · c9d45cf · c9d45cf
1 parent e371553
commit c9d45cf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/Unreal/Plugins/AirSim/Source/SimHUD/SimHUD.cpp b/Unreal/Plugins/AirSim/Source/SimHUD/SimHUD.cpp
@@ -199,12 +199,14 @@ void ASimHUD::setupInputBindings()
 void ASimHUD::createSimMode()
 {
     Settings& settings = Settings::singleton();
-    std::string simmode_name = settings.getString("SimMode", "Quadrotor");
+    std::string simmode_name = settings.getString("SimMode", "");
+    if (simmode_name == "")
+        simmode_name = "Multirotor";
 
     FActorSpawnParameters simmode_spawn_params;
     simmode_spawn_params.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AdjustIfPossibleButAlwaysSpawn;
 
-    if (simmode_name == "Quadrotor")
+    if (simmode_name == "Multirotor")
         simmode_ = this->GetWorld()->SpawnActor<ASimModeWorldMultiRotor>(FVector::ZeroVector, FRotator::ZeroRotator, simmode_spawn_params);
     else if (simmode_name == "Car")
         simmode_ = this->GetWorld()->SpawnActor<ASimModeCar>(FVector::ZeroVector, FRotator::ZeroRotator, simmode_spawn_params);

diff --git a/Unreal/Plugins/AirSim/Source/SimMode/SimModeBase.cpp b/Unreal/Plugins/AirSim/Source/SimMode/SimModeBase.cpp
@@ -88,13 +88,18 @@ void ASimModeBase::readSettings()
     }
 
     std::string simmode_name = settings.getString("SimMode", "");
+    if (simmode_name == "")
+        simmode_name = "Multirotor";
+
     usage_scenario = settings.getString("UsageScenario", "");
     default_vehicle_config = settings.getString("DefaultVehicleConfig", "");
     if (default_vehicle_config == "") {
-        if (simmode_name == "")
+        if (simmode_name == "Multirotor")
             default_vehicle_config = "SimpleFlight";
-        else
+        else if (simmode_name == "Car")
             default_vehicle_config = "PhysXCar4x4";
+        else         
+            UAirBlueprintLib::LogMessageString("SimMode is not valid: ", simmode_name, LogDebugLevel::Failure);
     }
 
     enable_rpc = settings.getBool("RpcEnabled", true);
@@ -107,7 +112,7 @@ void ASimModeBase::readSettings()
     std::string view_mode_string = settings.getString("ViewMode", "");
 
     if (view_mode_string == "") {
-        if (simmode_name == "")
+        if (simmode_name == "Multirotor")
             view_mode_string = "FlyWithMe";
         else
             view_mode_string = "SpringArmChase";
@@ -128,7 +133,7 @@ void ASimModeBase::readSettings()
 
     physics_engine_name = settings.getString("PhysicsEngineName", "");
     if (physics_engine_name == "") {
-        if (simmode_name == "")
+        if (simmode_name == "Multirotor")
             physics_engine_name = "FastPhysicsEngine";
         else
             physics_engine_name = "PhysX";

diff --git a/docs/settings.md b/docs/settings.md
@@ -133,7 +133,7 @@ And for each flying drone added to the simulator there is a named block of addit
 
 ## Other Settings
 #### SimMode
-Currently SimMode can be set to `"Multirotor"` or  `"Car"`. This determines which vehicle you would be using.
+Currently SimMode can be set to `""`, `"Multirotor"` or `"Car"`. The empty string value `""` means that use the default vehicle which is `"Multirotor"`. This determines which vehicle you would be using.
 
 #### PhysicsEngineName
 For cars, we support only PhysX for now (regardless of value in this setting). For multirotors, we support `"FastPhysicsEngine"` only.