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

Changes from PR

This commit is contained in:
bernatx 2019-07-03 15:51:26 +02:00 committed by Néstor Subirón
parent af17bf97f7
commit e0cdc80cc1
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LibCarla/source/carla/nav/Navigation.cpp
View File

@ -602,7 +602,7 @@ namespace nav {
// get a random location for navigation // get a random location for navigation
bool Navigation::GetRandomLocation(carla::geom::Location &location, float maxHeight, dtQueryFilter * filter, bool Navigation::GetRandomLocation(carla::geom::Location &location, float maxHeight, dtQueryFilter * filter,
bool use_lock) { bool use_lock) const {
std::unique_lock<std::mutex> guard(_mutex, std::defer_lock); std::unique_lock<std::mutex> guard(_mutex, std::defer_lock);

4
LibCarla/source/carla/nav/Navigation.h
View File

@ -59,7 +59,7 @@ namespace nav {
void UpdateCrowd(const client::detail::EpisodeState &state); void UpdateCrowd(const client::detail::EpisodeState &state);
/// get a random location for navigation /// get a random location for navigation
bool GetRandomLocation(carla::geom::Location &location, float maxHeight = -1.0f, bool GetRandomLocation(carla::geom::Location &location, float maxHeight = -1.0f,
dtQueryFilter * filter = nullptr, bool use_lock = true); dtQueryFilter * filter = nullptr, bool use_lock = true) const;
private: private:
@ -76,7 +76,7 @@ namespace nav {
/// Store walkers yaw angle from previous tick /// Store walkers yaw angle from previous tick
std::unordered_map<ActorId, float> _yaw_walkers; std::unordered_map<ActorId, float> _yaw_walkers;
std::mutex _mutex; mutable std::mutex _mutex;
}; };

4
PythonAPI/examples/spawn_npc.py
View File

@ -166,6 +166,10 @@ def main():
all_id.append(walkers_list[i]["con"]) all_id.append(walkers_list[i]["con"])
all_id.append(walkers_list[i]["id"]) all_id.append(walkers_list[i]["id"])
all_actors = world.get_actors(all_id) all_actors = world.get_actors(all_id)
# wait for a tick to ensure client receives the last transform of the walkers we have just created
world.wait_for_tick()
# 5. initialize each controller and set target to walk to (list is [controler, actor, controller, actor ...]) # 5. initialize each controller and set target to walk to (list is [controler, actor, controller, actor ...])
for i in range(0, len(all_id), 2): for i in range(0, len(all_id), 2):
# start walker # start walker

2
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/CarlaServer.cpp
View File

@ -617,7 +617,7 @@ void FCarlaServer::FPimpl::BindActions()
auto ActorView = Episode->FindActor(ActorId); auto ActorView = Episode->FindActor(ActorId);
if (!ActorView.IsValid()) if (!ActorView.IsValid())
{ {
RESPOND_ERROR("unable to apply control: actor view is invalid"); RESPOND_ERROR("unable to apply control: actor not found");
} }
auto Pawn = Cast<APawn>(ActorView.GetActor()); auto Pawn = Cast<APawn>(ActorView.GetActor());
if (Pawn == nullptr) if (Pawn == nullptr)