From 59e39f27da8350d7694de55baa9636bf1a7c2d16 Mon Sep 17 00:00:00 2001
From: Rajat Singhal <rajatsinghal564@gmail.com>
Date: Sat, 13 Feb 2021 12:50:16 +0530
Subject: [PATCH] More warnings, cleanup

---
 Unreal/Plugins/AirSim/Source/WorldSimApi.cpp | 25 ++++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/Unreal/Plugins/AirSim/Source/WorldSimApi.cpp b/Unreal/Plugins/AirSim/Source/WorldSimApi.cpp
index 1ff42ca337..9dc331d186 100644
--- a/Unreal/Plugins/AirSim/Source/WorldSimApi.cpp
+++ b/Unreal/Plugins/AirSim/Source/WorldSimApi.cpp
@@ -564,11 +564,11 @@ void WorldSimApi::setWind(const Vector3r& wind) const
     simmode_->setWind(wind);
 }
 
-CameraInfo WorldSimApi::getCameraInfo(const std::string& camera_name, const std::string& vehicle_name, bool external) const
+msr::airlib::CameraInfo WorldSimApi::getCameraInfo(const std::string& camera_name, const std::string& vehicle_name, bool external) const
 {
-    CameraInfo info;
-    UAirBlueprintLib::RunCommandOnGameThread([this, &camera_name, &vehicle_name, &external, &info]() {
-        auto camera = simmode_->getCamera(camera_name, vehicle_name, external);
+    msr::airlib::CameraInfo info;
+    auto camera = simmode_->getCamera(camera_name, vehicle_name, external);
+    UAirBlueprintLib::RunCommandOnGameThread([camera, &info]() {
         info = camera->getCameraInfo();
     }, true);
 
@@ -578,8 +578,8 @@ CameraInfo WorldSimApi::getCameraInfo(const std::string& camera_name, const std:
 void WorldSimApi::setCameraPose(const std::string& camera_name, const msr::airlib::Pose& pose,
                                const std::string& vehicle_name, bool external)
 {
-    UAirBlueprintLib::RunCommandOnGameThread([this, &camera_name, &vehicle_name, &external, &pose]() {
-        auto camera = simmode_->getCamera(camera_name, vehicle_name, external);
+    auto camera = simmode_->getCamera(camera_name, vehicle_name, external);
+    UAirBlueprintLib::RunCommandOnGameThread([camera, &pose]() {
         camera->setCameraPose(pose);
     }, true);
 }
@@ -587,8 +587,8 @@ void WorldSimApi::setCameraPose(const std::string& camera_name, const msr::airli
 void WorldSimApi::setCameraFoV(const std::string& camera_name, float fov_degrees,
                                const std::string& vehicle_name, bool external)
 {
-    UAirBlueprintLib::RunCommandOnGameThread([this, &camera_name, &vehicle_name, &external, &fov_degrees]() {
-        auto camera = simmode_->getCamera(camera_name, vehicle_name, external);
+    auto camera = simmode_->getCamera(camera_name, vehicle_name, external);
+    UAirBlueprintLib::RunCommandOnGameThread([camera, &fov_degrees]() {
         camera->setCameraFoV(fov_degrees);
     }, true);
 }
@@ -596,9 +596,8 @@ void WorldSimApi::setCameraFoV(const std::string& camera_name, float fov_degrees
 void WorldSimApi::setDistortionParam(const std::string& camera_name, const std::string& param_name, float value,
                                     const std::string& vehicle_name, bool external)
 {
-    UAirBlueprintLib::RunCommandOnGameThread([this, &camera_name, &vehicle_name, &external,
-                                              &param_name, &value]() {
-        auto camera = simmode_->getCamera(camera_name, vehicle_name, external);
+    auto camera = simmode_->getCamera(camera_name, vehicle_name, external);
+    UAirBlueprintLib::RunCommandOnGameThread([camera, &param_name, &value]() {
         camera->setDistortionParam(param_name, value);
     }, true);
 }
@@ -606,8 +605,8 @@ void WorldSimApi::setDistortionParam(const std::string& camera_name, const std::
 std::vector<float> WorldSimApi::getDistortionParams(const std::string& camera_name, const std::string& vehicle_name, bool external) const
 {
     std::vector<float> param_values;
-    UAirBlueprintLib::RunCommandOnGameThread([this, &camera_name, &vehicle_name, &external, &param_values]() {
-        auto camera = simmode_->getCamera(camera_name, vehicle_name, external);
+    auto camera = simmode_->getCamera(camera_name, vehicle_name, external);
+    UAirBlueprintLib::RunCommandOnGameThread([camera, &param_values]() {
         param_values = camera->getDistortionParams();
     }, true);