p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/carla-simulator/carla into dev

This commit is contained in:
Blyron 2024-05-30 14:58:53 +02:00
parent 5043ad73fc a2ae705126
commit 17963902e5
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaReplayer.cpp
View File

@ -808,7 +808,7 @@ void CarlaReplayer::InterpolatePosition(
double DeltaTime) double DeltaTime)
{ {
// call the callback // call the callback
Helper.ProcessReplayerPosition(Pos1, Pos2, Per, DeltaTime); Helper.ProcessReplayerPosition(Pos1, Pos2, Per, DeltaTime, IgnoreSpectator);
} }
// tick for the replayer // tick for the replayer

7
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaReplayerHelper.cpp
View File

@ -296,7 +296,7 @@ bool CarlaReplayerHelper::ProcessReplayerEventParent(uint32_t ChildId, uint32_t
} }
// reposition actors // reposition actors
bool CarlaReplayerHelper::ProcessReplayerPosition(CarlaRecorderPosition Pos1, CarlaRecorderPosition Pos2, double Per, double DeltaTime) bool CarlaReplayerHelper::ProcessReplayerPosition(CarlaRecorderPosition Pos1, CarlaRecorderPosition Pos2, double Per, double DeltaTime, bool bIgnoreSpectator)
{ {
check(Episode != nullptr); check(Episode != nullptr);
FCarlaActor* CarlaActor = Episode->FindCarlaActor(Pos1.DatabaseId); FCarlaActor* CarlaActor = Episode->FindCarlaActor(Pos1.DatabaseId);
@ -304,6 +304,11 @@ bool CarlaReplayerHelper::ProcessReplayerPosition(CarlaRecorderPosition Pos1, Ca
FRotator Rotation; FRotator Rotation;
if(CarlaActor) if(CarlaActor)
{ {
//Hot fix to avoid spectator we should investigate why this case is possible here
if(bIgnoreSpectator && CarlaActor->GetActor()->GetClass()->GetFName().ToString().Contains("Spectator"))
{
return false;
}
// check to assign first position or interpolate between both // check to assign first position or interpolate between both
if (Per == 0.0) if (Per == 0.0)
{ {

2
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaReplayerHelper.h
View File

@ -52,7 +52,7 @@ public:
bool ProcessReplayerEventParent(uint32_t ChildId, uint32_t ParentId); bool ProcessReplayerEventParent(uint32_t ChildId, uint32_t ParentId);
// reposition actors // reposition actors
bool ProcessReplayerPosition(CarlaRecorderPosition Pos1, CarlaRecorderPosition Pos2, double Per, double DeltaTime); bool ProcessReplayerPosition(CarlaRecorderPosition Pos1, CarlaRecorderPosition Pos2, double Per, double DeltaTime, bool bIgnoreSpectator);
// replay event for traffic light state // replay event for traffic light state
bool ProcessReplayerStateTrafficLight(CarlaRecorderStateTrafficLight State); bool ProcessReplayerStateTrafficLight(CarlaRecorderStateTrafficLight State);