Merge branch 'aburgm-mesh-naming-method'

AirLib/include/common/AirSimSettings.hpp

@@ -120,8 +120,13 @@ struct AirSimSettings {
             None, CommonObjectsRandomIDs
         };
 
+        enum class MeshNamingMethodType {
+            OwnerName, StaticMeshName
+        };
+
         InitMethodType init_method = InitMethodType::CommonObjectsRandomIDs;
         bool override_existing = false;
+        MeshNamingMethodType mesh_naming_method = MeshNamingMethodType::OwnerName;
     };
 
 private: //fields
@@ -401,6 +406,14 @@ struct AirSimSettings {
                 throw std::invalid_argument(std::string("SegmentationSettings init_method has invalid value in settings ") + init_method);
 
             segmentation_settings.override_existing = json_parent.getBool("OverrideExisting", false);
+
+            std::string mesh_naming_method = Utils::toLower(json_parent.getString("MeshNamingMethod", ""));
+            if (mesh_naming_method == "" || mesh_naming_method == "ownername")
+                segmentation_settings.mesh_naming_method = SegmentationSettings::MeshNamingMethodType::OwnerName;
+            else if (mesh_naming_method == "staticmeshname")
+                segmentation_settings.mesh_naming_method = SegmentationSettings::MeshNamingMethodType::StaticMeshName;
+            else
+                throw std::invalid_argument(std::string("SegmentationSettings MeshNamingMethod has invalid value in settings ") + mesh_naming_method);
         }
     }
 

Unreal/Plugins/AirSim/Source/AirBlueprintLib.cpp

@@ -11,6 +11,7 @@
 #include "Components/StaticMeshComponent.h"
 #include "EngineUtils.h"
 #include "Runtime/Landscape/Classes/LandscapeComponent.h"
+#include "Runtime/Engine/Classes/Engine/StaticMesh.h"
 #include "UObjectIterator.h"
 //#include "Runtime/Foliage/Public/FoliageType.h"
 #include "Kismet/KismetStringLibrary.h"
@@ -26,6 +27,8 @@ parameters -> camel_case
 
 
 bool UAirBlueprintLib::log_messages_hidden = false;
+msr::airlib::AirSimSettings::SegmentationSettings::MeshNamingMethodType UAirBlueprintLib::mesh_naming_method =
+    msr::airlib::AirSimSettings::SegmentationSettings::MeshNamingMethodType::OwnerName;
 
 void UAirBlueprintLib::LogMessageString(const std::string &prefix, const std::string &suffix, LogDebugLevel level, float persist_sec)
 {
@@ -224,10 +227,21 @@ void UAirBlueprintLib::SetObjectStencilID(ALandscapeProxy* mesh, int object_id)
 template<class T>
 std::string UAirBlueprintLib::GetMeshName(T* mesh)
 {
-    if (mesh->GetOwner())
-        return std::string(TCHAR_TO_UTF8(*(mesh->GetOwner()->GetName())));
-    else
-        return ""; // std::string(TCHAR_TO_UTF8(*(UKismetSystemLibrary::GetDisplayName(mesh))));
+    switch(mesh_naming_method)
+    {
+    case msr::airlib::AirSimSettings::SegmentationSettings::MeshNamingMethodType::OwnerName:
+        if (mesh->GetOwner())
+            return std::string(TCHAR_TO_UTF8(*(mesh->GetOwner()->GetName())));
+        else
+            return ""; // std::string(TCHAR_TO_UTF8(*(UKismetSystemLibrary::GetDisplayName(mesh))));
+    case msr::airlib::AirSimSettings::SegmentationSettings::MeshNamingMethodType::StaticMeshName:
+        if (mesh->GetStaticMesh())
+            return std::string(TCHAR_TO_UTF8(*(mesh->GetStaticMesh()->GetName())));
+        else
+            return "";
+    default:
+        return "";
+    }
 }
 
 std::string UAirBlueprintLib::GetMeshName(ALandscapeProxy* mesh)

Unreal/Plugins/AirSim/Source/AirBlueprintLib.h

@@ -13,6 +13,7 @@
 #include "Kismet/KismetMathLibrary.h"
 #include "Components/MeshComponent.h"
 #include "LandscapeProxy.h"
+#include "common/AirSimSettings.hpp"
 #include "AirBlueprintLib.generated.h"
 
 
@@ -91,6 +92,10 @@ class UAirBlueprintLib : public UBlueprintFunctionLibrary
     {
         log_messages_hidden = is_hidden;
     }
+    static void SetMeshNamingMethod(msr::airlib::AirSimSettings::SegmentationSettings::MeshNamingMethodType method)
+    {
+        mesh_naming_method = method;
+    }
 
     static void enableWorldRendering(AActor* context, bool enable);
 
@@ -110,5 +115,6 @@ class UAirBlueprintLib : public UBlueprintFunctionLibrary
 
 private:
     static bool log_messages_hidden;
+    static msr::airlib::AirSimSettings::SegmentationSettings::MeshNamingMethodType mesh_naming_method;
 };
 

Unreal/Plugins/AirSim/Source/SimMode/SimModeBase.cpp

@@ -33,6 +33,8 @@ void ASimModeBase::BeginPlay()
 
 void ASimModeBase::setStencilIDs()
 {
+    UAirBlueprintLib::SetMeshNamingMethod(getSettings().segmentation_settings.mesh_naming_method);
+
     if (getSettings().segmentation_settings.init_method ==
         AirSimSettings::SegmentationSettings::InitMethodType::CommonObjectsRandomIDs) {
 

docs/image_apis.md

@@ -253,6 +253,8 @@ If you don't know how to open Unreal Environment in Unreal Editor then try follo
 
 Once you decide on the meshes you are interested, note down their names and use above API to set their object IDs.
 
+Alternatively, the `MeshNamingMethod` can be switched to "StaticMeshName" in the [settings](settings.md). In this case, the static mesh name as shown in the content browser in the Unreal Editor is used to refer to meshes. Note that it is not possible to tell individual instances of the same static mesh apart this way, but the names are often more intuitive.
+
 #### Changing Colors for Object IDs
 At present the color for each object ID is fixed as in [this pallet](../Unreal/Plugins/AirSim/Content/HUDAssets/seg_color_pallet.png). We will be adding ability to change colors for object IDs to desired values shortly. In the meantime you can open the segmentation image in your favorite image editor and get the RGB values you are interested in.
 

docs/settings.md

@@ -99,6 +99,9 @@ Below are complete list of settings available along with their default values. I
     },
     "ApiServerPort": 41451
   },
+  "SegmentationSettings": {
+    "MeshNamingMethod": "OwnerName"
+  },
   "PX4": {
     "FirmwareName": "PX4",
     "LogViewerHostIp": "127.0.0.1",