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

Improve logging, debugging

This commit is contained in:
nsubiron 2017-03-22 13:53:27 +01:00
parent 8a769bf60a
commit d5abcee617
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Carla/Game/CarlaGameController.cpp
View File

@ -63,7 +63,7 @@ static void SendSceneValues(carla::CarlaServer &Server, const TArray<FTransform>
UE_LOG(LogCarla, Log, TEXT("Start position {%f, %f}"), Location.X, Location.Y);
sceneValues.possible_positions.push_back({Location.X, Location.Y});
}
UE_LOG(LogCarla, Log, TEXT("Send scene values"));
UE_LOG(LogCarla, Log, TEXT("Send scene values: %d positions"), sceneValues.possible_positions.size());
Server.sendSceneValues(sceneValues);
}
@ -83,7 +83,11 @@ static bool TryReadEpisodeStart(carla::CarlaServer &Server, uint32 &StartIndex)
{
uint32 EndIndex;
UE_LOG(LogCarla, Log, TEXT("tryReadEpisodeStart"));
return Server.tryReadEpisodeStart(StartIndex, EndIndex);
if (Server.tryReadEpisodeStart(StartIndex, EndIndex)) {
UE_LOG(LogCarla, Warning, TEXT("Requested new episode"));
return true;
}
return false;
}
static void SendReward(
@ -92,7 +96,7 @@ static void SendReward(
const std::array<const ASceneCaptureCamera *, 2u> &Cameras)
{
carla::Reward_Values reward;
reward.timestamp = FMath::RoundHalfToZero(FPlatformTime::Seconds());
reward.timestamp = FMath::RoundHalfToZero(1000.0 * FPlatformTime::Seconds());
Set(reward.player_location, PlayerState.GetLocation());
Set(reward.player_orientation, PlayerState.GetOrientation());
Set(reward.player_acceleration, PlayerState.GetAcceleration());
@ -107,7 +111,7 @@ static void SendReward(
reward.image_height = Cameras[0u]->GetImageSizeY();
}
Set(reward.image_rgb_0, Cameras[0u]);
// Set(reward.image_rgb_1, Cameras[1u]);
Set(reward.image_rgb_1, Cameras[1u]);
// Set(reward.image_depth_0, );
// Set(reward.image_depth_1, );
UE_LOG(LogCarla, Log, TEXT("Send reward"));
@ -137,7 +141,13 @@ static void SetActorTransform(
Index = 0u;
}
check(AvailableStartTransforms.Num() > 0);
Player.SetActorTransform(AvailableStartTransforms[Index]);
UE_LOG(LogCarla, Log, TEXT("Before: Pawn position = %s"), *Player.GetPawn()->GetActorLocation().ToString());
if (!Player.GetPawn()->SetActorTransform(AvailableStartTransforms[Index], false)) {
UE_LOG(LogCarla, Error, TEXT("Failed to set actor transform"));
} else {
Player.GetPawn()->MarkComponentsRenderStateDirty();
}
UE_LOG(LogCarla, Log, TEXT("After: Pawn position = %s"), *Player.GetPawn()->GetActorLocation().ToString());
}
// =============================================================================

3
Source/Carla/Game/MockGameController.cpp
View File

@ -13,8 +13,7 @@ void MockGameController::RegisterPlayer(AController &NewPlayer)
{
ACarlaVehicleController *VehicleController = Cast<ACarlaVehicleController>(&NewPlayer);
if (VehicleController != nullptr) {
if (!VehicleController->IsInManualMode())
VehicleController->SetManualMode(true);
VehicleController->SetManualMode(true);
} else {
UE_LOG(LogCarla, Warning, TEXT("Player is not a ACarlaVehicleController"));
}