Merge pull request #2292 from madratman/PR/sim_pause_fix

[simPause fix]pause unreal engine with SetGamePaused
microsoft · Nov 4, 2019 · bf8c4ae · bf8c4ae
2 parents c6f0729 + 210bac1
commit bf8c4ae
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/Unreal/Plugins/AirSim/Source/SimMode/SimModeWorldBase.cpp b/Unreal/Plugins/AirSim/Source/SimMode/SimModeWorldBase.cpp
@@ -33,6 +33,7 @@ void ASimModeWorldBase::startAsyncUpdator()
 {
     physics_world_->startAsyncUpdator();
 }
+
 void ASimModeWorldBase::stopAsyncUpdator()
 {
     physics_world_->stopAsyncUpdator();
@@ -78,12 +79,12 @@ bool ASimModeWorldBase::isPaused() const
 void ASimModeWorldBase::pause(bool is_paused)
 {
     physics_world_->pause(is_paused);
+    UGameplayStatics::SetGamePaused(this->GetWorld(), is_paused);
 }
 
 void ASimModeWorldBase::continueForTime(double seconds)
 {
     physics_world_->continueForTime(seconds);
-
 }
 
 void ASimModeWorldBase::updateDebugReport(msr::airlib::StateReporterWrapper& debug_reporter)

diff --git a/Unreal/Plugins/AirSim/Source/Vehicles/ComputerVision/SimModeComputerVision.cpp b/Unreal/Plugins/AirSim/Source/Vehicles/ComputerVision/SimModeComputerVision.cpp
@@ -75,4 +75,14 @@ msr::airlib::VehicleApiBase* ASimModeComputerVision::getVehicleApi(const PawnSim
 {
     //we don't have real vehicle so no vehicle API
     return nullptr;
+}
+
+bool ASimModeComputerVision::isPaused() const
+{
+    return UGameplayStatics::IsGamePaused(this->GetWorld());
+}
+
+void ASimModeComputerVision::pause(bool is_paused)
+{
+    UGameplayStatics::SetGamePaused(this->GetWorld(), is_paused);
 }
diff --git a/Unreal/Plugins/AirSim/Source/Vehicles/ComputerVision/SimModeComputerVision.h b/Unreal/Plugins/AirSim/Source/Vehicles/ComputerVision/SimModeComputerVision.h
@@ -30,4 +30,6 @@ class AIRSIM_API ASimModeComputerVision : public ASimModeBase
         const PawnSimApi::Params& pawn_sim_api_params) const override;
     virtual msr::airlib::VehicleApiBase* getVehicleApi(const PawnSimApi::Params& pawn_sim_api_params,
         const PawnSimApi* sim_api) const override;
+    virtual bool isPaused() const override;
+    virtual void pause(bool is_paused) override;
 };