move game thread exec in Unreal code

JeongsooHa · Oct 17, 2017 · 44650eb · 44650eb
1 parent ffbb8cf
commit 44650eb
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/AirLib/include/vehicles/multirotor/api/DroneApi.hpp b/AirLib/include/vehicles/multirotor/api/DroneApi.hpp
@@ -266,9 +266,7 @@ class DroneApi : public VehicleApiBase {
 
     virtual void reset() override
     {
-        UAirBlueprintLib::RunCommandOnGameThread([this]() {
-            vehicle_->reset();
-        });
+        vehicle_->reset();
     }
 
 

diff --git a/Unreal/Plugins/AirSim/Source/AirBlueprintLib.cpp b/Unreal/Plugins/AirSim/Source/AirBlueprintLib.cpp
@@ -108,7 +108,10 @@ T* UAirBlueprintLib::FindActor(const UObject* context, FString name)
 
 void UAirBlueprintLib::RunCommandOnGameThread(TFunction<void()> InFunction, const TStatId InStatId)
 {
-    FFunctionGraphTask::CreateAndDispatchWhenReady(MoveTemp(InFunction), InStatId, nullptr, ENamedThreads::GameThread);
+    if (IsInGameThread())
+        InFunction();
+    else
+        FFunctionGraphTask::CreateAndDispatchWhenReady(MoveTemp(InFunction), InStatId, nullptr, ENamedThreads::GameThread);
 }
 
 

diff --git a/Unreal/Plugins/AirSim/Source/Multirotor/MultiRotorConnector.cpp b/Unreal/Plugins/AirSim/Source/Multirotor/MultiRotorConnector.cpp
@@ -273,14 +273,16 @@ bool MultiRotorConnector::isApiServerStarted()
 //*** Start: UpdatableState implementation ***//
 void MultiRotorConnector::reset()
 {
-    VehicleConnectorBase::reset();
+    UAirBlueprintLib::RunCommandOnGameThread([this]() {
+        VehicleConnectorBase::reset();
 
-    //TODO: should this be done in MultiRotor.hpp
-    //controller_->reset();
+        //TODO: should this be done in MultiRotor.hpp
+        //controller_->reset();
 
-    rc_data_ = RCData();
-    vehicle_pawn_wrapper_->reset();    //we do flier resetPose so that flier is placed back without collisons
-    vehicle_.reset();
+        rc_data_ = RCData();
+        vehicle_pawn_wrapper_->reset();    //we do flier resetPose so that flier is placed back without collisons
+        vehicle_.reset();
+    });
 }
 
 void MultiRotorConnector::update()

diff --git a/Unreal/Plugins/AirSim/Source/Recording/RecordingFile.cpp b/Unreal/Plugins/AirSim/Source/Recording/RecordingFile.cpp
@@ -22,8 +22,8 @@ void RecordingFile::appendRecord(TArray<uint8>& image_data, const msr::airlib::K
     std::string filename = std::string("img_").append(std::to_string(images_saved_)).append(".png");
 
     try {    
-        filePath = FString(common_utils::FileSystem::combine(image_path_, filename).c_str());
-        imageSavedOk = FFileHelper::SaveArrayToFile(image_data, *filePath);
+        FString image_file_path = FString(common_utils::FileSystem::combine(image_path_, filename).c_str());
+        imageSavedOk = FFileHelper::SaveArrayToFile(image_data, *image_file_path);
     }
     catch(std::exception& ex) {
         UAirBlueprintLib::LogMessage(TEXT("Image file save failed"), FString(ex.what()), LogDebugLevel::Failure);