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

Trimed whitespaces

This commit is contained in:
Aaron 2024-03-07 12:03:16 +01:00 committed by Blyron
parent 7a3a9a3178
commit 94df1fbe9b
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LibCarla/source/carla/client/detail/Simulator.h
View File

@ -250,7 +250,7 @@ namespace detail {
}
uint64_t SetEpisodeSettings(const rpc::EpisodeSettings &settings);
rpc::WeatherParameters GetWeatherParameters() {
return _client.GetWeatherParameters();
}
@ -266,7 +266,7 @@ namespace detail {
void SetIMUISensorGravity(float NewIMUISensorGravity) {
_client.SetIMUISensorGravity(NewIMUISensorGravity);
}
rpc::VehiclePhysicsControl GetVehiclePhysicsControl(const Vehicle &vehicle) const {
return _client.GetVehiclePhysicsControl(vehicle.GetId());
}
@ -469,7 +469,7 @@ namespace detail {
std::vector<std::string> GetActorBoneNames(const Actor &actor) {
return _client.GetActorBoneNames(actor.GetId());
}
}
std::vector<geom::Transform> GetActorSocketWorldTransforms(const Actor &actor) {
return _client.GetActorSocketWorldTransforms(actor.GetId());

2
PythonAPI/carla/source/libcarla/World.cpp
View File

@ -321,6 +321,8 @@ void export_world() {
.def("apply_settings", &ApplySettings, (arg("settings"), arg("seconds")=0.0))
.def("get_weather", CONST_CALL_WITHOUT_GIL(cc::World, GetWeather))
.def("set_weather", &cc::World::SetWeather)
.def("get_imui_sensor_gravity", CONST_CALL_WITHOUT_GIL(cc::World, GetIMUISensorGravity))
.def("set_imui_sensor_gravity", &cc::World::SetIMUISensorGravity, (arg("NewIMUISensorGravity")) )
.def("get_snapshot", &cc::World::GetSnapshot)
.def("get_actor", CONST_CALL_WITHOUT_GIL_1(cc::World, GetActor, carla::ActorId), (arg("actor_id")))
.def("get_actors", CONST_CALL_WITHOUT_GIL(cc::World, GetActors))

6
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.h
View File

@ -111,11 +111,11 @@ public:
const carla::rpc::MaterialParameter& TextureParam);
TArray<FString> GetNamesOfAllActors();
// Gravitational acceleration. Default is earth one, which is approximately 9.81 m/s^2
UPROPERTY(BlueprintReadOnly, EditAnywhere, Category="Sensor Gravity")
float IMUISensorGravity = 9.81f;
protected:
void InitGame(const FString &MapName, const FString &Options, FString &ErrorMessage) override;
@ -182,7 +182,7 @@ private:
UPROPERTY()
ALargeMapManager* LMManager = nullptr;
FDelegateHandle OnEpisodeSettingsChangeHandle;
boost::optional<carla::road::Map> Map;