Merge pull request #221 from FS-Online/laptimer-referee-fixes

SijmenHuizenga · web-flow · commit c9be9678d009 · 2020-08-05T02:20:45.000+02:00
Fix laptimer bugs and improved blueprint communication
diff --git a/UE4Project/Config/DefaultGame.ini b/UE4Project/Config/DefaultGame.ini
@@ -11,7 +11,7 @@ CopyrightNotice=This program is free software; you can redistribute it and/ormod
 
 [/Script/UnrealEd.ProjectPackagingSettings]
 Build=IfProjectHasCode
-BuildConfiguration=PPBC_Test
+BuildConfiguration=PPBC_Development
 BuildTarget=
 StagingDirectory=(Path="C:/Users/developer/Desktop/beta-4g")
 FullRebuild=True
diff --git a/UE4Project/Content/Competition/CompetitionMapTestday1.umap b/UE4Project/Content/Competition/CompetitionMapTestday1.umap
diff --git a/UE4Project/Content/Competition/CompetitionMapTestday2.umap b/UE4Project/Content/Competition/CompetitionMapTestday2.umap
diff --git a/UE4Project/Content/FormulaStudentAssets/LaptimeDisplay.uasset b/UE4Project/Content/FormulaStudentAssets/LaptimeDisplay.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bc3fbd50f9e05c4219eac8a2e5ff535180dcd8c11821c2d91b1ad52ed9304542
+size 45377
diff --git a/UE4Project/Content/FormulaStudentAssets/RefereeBP.uasset b/UE4Project/Content/FormulaStudentAssets/RefereeBP.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fdb0a922f029fa22852c1e5a0fdfae6ada0c0d0db016ac2cc4019498119748f5
+size 82086
diff --git a/UE4Project/Content/FormulaStudentAssets/RefereeBlueprint.uasset b/UE4Project/Content/FormulaStudentAssets/RefereeBlueprint.uasset
diff --git a/UE4Project/Content/FormulaStudentAssets/StartFinishLine.uasset b/UE4Project/Content/FormulaStudentAssets/StartFinishLine.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b00664de9010876cd75dab605896ed5da467395b9e0dc1fd10b8627cad200e0
-size 241576
+oid sha256:cb0e946cf2eb8f4ca1f851ec037be0b86c7e623235ba222f1349a5257a25e005
+size 229488
diff --git a/UE4Project/Content/RaceCourse/Model/Splines/spline_cones.uasset b/UE4Project/Content/RaceCourse/Model/Splines/spline_cones.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:53e09495a9797a63e947d063bbb62794fc3719ad137afc1ba65b7448cd8ce407
-size 222045
+oid sha256:291a474a189911ab1e97c3051b0e2d0c09d55cfcf940356392e7787b99fccae4
+size 209447
diff --git a/UE4Project/Content/TrainingMap.umap b/UE4Project/Content/TrainingMap.umap
diff --git a/UE4Project/Plugins/AirSim/Source/SimMode/SimModeBase.cpp b/UE4Project/Plugins/AirSim/Source/SimMode/SimModeBase.cpp
@@ -40,6 +40,9 @@ ASimModeBase::ASimModeBase()
 
     static ConstructorHelpers::FClassFinder<AActor> sky_sphere_class(TEXT("Blueprint'/Engine/EngineSky/BP_Sky_Sphere'"));
     sky_sphere_class_ = sky_sphere_class.Succeeded() ? sky_sphere_class.Class : nullptr;
+
+    static ConstructorHelpers::FClassFinder<AReferee> refereeBP_class(TEXT("Blueprint'/Game/FormulaStudentAssets/RefereeBP'"));
+    refereeBP_class_ = refereeBP_class.Succeeded() ? refereeBP_class.Class : nullptr;
 }
 
 void ASimModeBase::BeginPlay()
diff --git a/UE4Project/Plugins/AirSim/Source/SimMode/SimModeBase.h b/UE4Project/Plugins/AirSim/Source/SimMode/SimModeBase.h
@@ -13,6 +13,7 @@
 #include "api/ApiServerBase.hpp"
 #include "api/ApiProvider.hpp"
 #include "Vehicles/Car/CarPawnSimApi.h"
+#include "Referee.h"
 
 #include "SimModeBase.generated.h"
 
@@ -70,6 +71,8 @@ class AIRSIM_API ASimModeBase : public AActor
         return static_cast<CarPawnSimApi*>(api_provider_->getVehicleSimApi(vehicle_name));
     }
 
+    UPROPERTY() UClass* refereeBP_class_;
+
 protected: //must overrides
     typedef msr::airlib::AirSimSettings AirSimSettings;
 
diff --git a/UE4Project/Plugins/AirSim/Source/WorldSimApi.cpp b/UE4Project/Plugins/AirSim/Source/WorldSimApi.cpp
@@ -88,7 +88,7 @@ msr::airlib::CarApiBase::RefereeState WorldSimApi::getRefereeState() const
 {
     msr::airlib::CarApiBase::RefereeState result;
     UAirBlueprintLib::RunCommandOnGameThread([this, &result]() {
-        AReferee* referee = UAirBlueprintLib::FindActor<AReferee>(simmode_, FString("referee"));
+        AReferee* referee = (AReferee*) UGameplayStatics::GetActorOfClass(simmode_, simmode_->refereeBP_class_);
         result = referee ? referee->getState() : msr::airlib::CarApiBase::RefereeState();
     }, true);
     return result;
diff --git a/UE4Project/Plugins/AirSim/Source/WorldSimApi.h b/UE4Project/Plugins/AirSim/Source/WorldSimApi.h
@@ -52,4 +52,5 @@ class WorldSimApi : public msr::airlib::WorldSimApiBase {
 
 private:
     ASimModeBase* simmode_;
+    UClass* refereeBPClass_;
 };

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:bc3fbd50f9e05c4219eac8a2e5ff535180dcd8c11821c2d91b1ad52ed9304542`
	`3`	`+size 45377`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:fdb0a922f029fa22852c1e5a0fdfae6ada0c0d0db016ac2cc4019498119748f5`
	`3`	`+size 82086`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,9 @@ ASimModeBase::ASimModeBase()`
`40`	`40`
`41`	`41`	`static ConstructorHelpers::FClassFinder<AActor> sky_sphere_class(TEXT("Blueprint'/Engine/EngineSky/BP_Sky_Sphere'"));`
`42`	`42`	`sky_sphere_class_ = sky_sphere_class.Succeeded() ? sky_sphere_class.Class : nullptr;`
	`43`	`+`
	`44`	`+ static ConstructorHelpers::FClassFinder<AReferee> refereeBP_class(TEXT("Blueprint'/Game/FormulaStudentAssets/RefereeBP'"));`
	`45`	`+ refereeBP_class_ = refereeBP_class.Succeeded() ? refereeBP_class.Class : nullptr;`
`43`	`46`	`}`
`44`	`47`
`45`	`48`	`void ASimModeBase::BeginPlay()`