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

Fixed compile errors in linux. Fixed lights not turning on at night.

This commit is contained in:
Axel 2021-11-05 18:30:56 +01:00 committed by bernat
parent 6fc187f4b3
commit c95ab47f87
3 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PythonAPI/carla/source/libcarla/Actor.cpp
View File

@ -188,7 +188,6 @@ void export_actor() {
class_<cc::Walker, bases<cc::Actor>, boost::noncopyable, boost::shared_ptr<cc::Walker>>("Walker", no_init) class_<cc::Walker, bases<cc::Actor>, boost::noncopyable, boost::shared_ptr<cc::Walker>>("Walker", no_init)
.def("apply_control", &ApplyControl<cr::WalkerControl>, (arg("control"))) .def("apply_control", &ApplyControl<cr::WalkerControl>, (arg("control")))
.def("apply_control", &ApplyControl<cr::WalkerBoneControlIn>, (arg("control")))
.def("get_control", &cc::Walker::GetWalkerControl) .def("get_control", &cc::Walker::GetWalkerControl)
.def("get_bones", &cc::Walker::GetBonesTransform) .def("get_bones", &cc::Walker::GetBonesTransform)
.def("set_bones", &cc::Walker::SetBonesTransform, (arg("bones"))) .def("set_bones", &cc::Walker::SetBonesTransform, (arg("bones")))

24
PythonAPI/carla/source/libcarla/Control.cpp
View File

@ -144,26 +144,6 @@ static auto GetVectorOfBoneTransformFromList(const boost::python::list &list) {
return v; return v;
} }
static auto GetVectorOfBoneTransformOutFromList(const boost::python::list &list) {
std::vector<carla::rpc::BoneTransformDataOut> v;
auto length = boost::python::len(list);
v.reserve(static_cast<size_t>(length));
for (auto i = 0u; i < length; ++i) {
boost::python::extract<carla::rpc::BoneTransformDataOut> ext(list[i]);
if (ext.check()) {
v.push_back(ext);
} else {
v.push_back(carla::rpc::BoneTransformDataOut{
boost::python::extract<std::string>(list[i][0u]),
boost::python::extract<carla::geom::Transform>(list[i][1u]),
boost::python::extract<carla::geom::Transform>(list[i][2u]),
boost::python::extract<carla::geom::Transform>(list[i][3u])});
}
}
return v;
}
static auto GetWheels(const carla::rpc::VehiclePhysicsControl &self) { static auto GetWheels(const carla::rpc::VehiclePhysicsControl &self) {
const auto &wheels = self.GetWheels(); const auto &wheels = self.GetWheels();
boost::python::object get_iter = boost::python::iterator<std::vector<carla::rpc::WheelPhysicsControl>>(); boost::python::object get_iter = boost::python::iterator<std::vector<carla::rpc::WheelPhysicsControl>>();
@ -283,10 +263,6 @@ static auto GetBonesTransformOut(const carla::rpc::WalkerBoneControlOut &self) {
return boost::python::list(iter); return boost::python::list(iter);
} }
static void SetBonesTransformOut(carla::rpc::WalkerBoneControlOut &self, const boost::python::list &list) {
self.bone_transforms = GetVectorOfBoneTransformOutFromList(list);
}
boost::python::object WalkerBoneControl_init(boost::python::tuple args, boost::python::dict kwargs) { boost::python::object WalkerBoneControl_init(boost::python::tuple args, boost::python::dict kwargs) {
// Args names // Args names
const uint32_t NUM_ARGUMENTS = 1; const uint32_t NUM_ARGUMENTS = 1;

4
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.cpp
View File

@ -224,6 +224,10 @@ void ACarlaGameModeBase::BeginPlay()
for(UCarlaLight* Light : Lights) for(UCarlaLight* Light : Lights)
{ {
Light->RegisterLight(); Light->RegisterLight();
if(!Light->HasBegunPlay())
{
Light->BeginPlay();
}
} }
} }
EnableOverlapEvents(); EnableOverlapEvents();