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

Removed unnecessary function

This commit is contained in:
Marc Garcia Puig 2019-11-15 17:15:35 +01:00
parent 535cb7681e
commit a21160743f
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
LibCarla/source/carla/geom/GeoLocation.h
View File

@ -58,26 +58,23 @@ namespace geom {
}
// =========================================================================
/// @todo The following is copy-pasted from MSGPACK_DEFINE_ARRAY.
/// This is a workaround for an issue in msgpack library. The
/// MSGPACK_DEFINE_ARRAY macro is shadowing our `z` variable.
/// https://github.com/msgpack/msgpack-c/issues/709
// -- Pack / Unpack GeoLocation --------------------------------------------
// =========================================================================
template <typename Packer>
void msgpack_pack(Packer& pk) const
{
clmdep_msgpack::type::make_define_array(latitude, longitude, altitude).msgpack_pack(pk);
clmdep_msgpack::type::make_define_array(
latitude,
longitude,
altitude).msgpack_pack(pk);
}
void msgpack_unpack(clmdep_msgpack::object const& o)
{
clmdep_msgpack::type::make_define_array(latitude, longitude, altitude).msgpack_unpack(o);
clmdep_msgpack::type::make_define_array(
latitude,
longitude,
altitude).msgpack_unpack(o);
}
template <typename MSGPACK_OBJECT>
void msgpack_object(MSGPACK_OBJECT* o, clmdep_msgpack::zone& sneaky_variable_that_shadows_z) const
{
clmdep_msgpack::type::make_define_array(latitude, longitude, altitude).msgpack_object(o, sneaky_variable_that_shadows_z);
}
// =========================================================================
};

6
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/GnssSensor.cpp
View File

@ -27,8 +27,6 @@ FActorDefinition AGnssSensor::GetSensorDefinition()
void AGnssSensor::Set(const FActorDescription &ActorDescription)
{
Super::Set(ActorDescription);
// Fill the parameters that the user requested
// Not currently needed in this sensor
UActorBlueprintFunctionLibrary::SetGnss(ActorDescription, this);
}
@ -38,7 +36,7 @@ void AGnssSensor::Tick(float DeltaSeconds)
carla::geom::Location location = GetActorLocation();
carla::geom::GeoLocation current_location = CurrentGeoLocation.Transform(location);
carla::geom::GeoLocation current_location = CurrentGeoReference.Transform(location);
auto Stream = GetDataStream(*this);
float lat_error = RandomEngine->GetNormalDistribution(0.0f, LatitudeDeviation);
@ -117,5 +115,5 @@ void AGnssSensor::BeginPlay()
Super::BeginPlay();
const UCarlaEpisode* episode = UCarlaStatics::GetCurrentEpisode(GetWorld());
CurrentGeoLocation = episode->GetGeoReference();
CurrentGeoReference = episode->GetGeoReference();
}

2
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/GnssSensor.h
View File

@ -58,7 +58,7 @@ protected:
private:
carla::geom::GeoLocation CurrentGeoLocation;
carla::geom::GeoLocation CurrentGeoReference;
float LatitudeDeviation;
float LongitudeDeviation;