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

Fix conflicts with rebase

This commit is contained in:
bernatx 2019-06-21 10:55:52 +02:00 committed by Néstor Subirón
parent 65fb808f9b
commit a08a3bbc26
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
LibCarla/source/carla/client/detail/ActorFactory.cpp
View File

@ -72,8 +72,12 @@ namespace detail {
EpisodeProxy episode,
rpc::Actor description,
GarbageCollectionPolicy gc) {
auto init = ActorInitializer{description, episode, parent};
if (description.HasAStream()) {
auto init = ActorInitializer{description, episode};
if (description.description.id == "sensor.other.lane_invasion") {
return MakeActorImpl<LaneInvasionSensor>(std::move(init), gc);
} else if (description.description.id == "sensor.other.gnss") {
return MakeActorImpl<GnssSensor>(std::move(init), gc);
} else if (description.HasAStream()) {
return MakeActorImpl<ServerSideSensor>(std::move(init), gc);
} else if (StringUtil::StartsWith(description.description.id, "vehicle.")) {
return MakeActorImpl<Vehicle>(std::move(init), gc);
@ -83,10 +87,6 @@ namespace detail {
return MakeActorImpl<TrafficLight>(std::move(init), gc);
} else if (StringUtil::StartsWith(description.description.id, "traffic.")) {
return MakeActorImpl<TrafficSign>(std::move(init), gc);
} else if (description.description.id == "sensor.other.lane_invasion") {
return MakeActorImpl<LaneInvasionSensor>(std::move(init), gc);
} else if (description.description.id == "sensor.other.gnss") {
return MakeActorImpl<GnssSensor>(std::move(init), gc);
} else if (description.description.id == "controller.ai.walker") {
return MakeActorImpl<WalkerAIController>(std::move(init), gc);
}

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

@ -9,7 +9,6 @@
#include "Carla/OpenDrive/OpenDrive.h"
#include "Carla/Util/DebugShapeDrawer.h"
#include "Carla/Util/OpenDrive.h"
#include "Carla/Util/NavigationMesh.h"
#include "Carla/Vehicle/CarlaWheeledVehicle.h"
#include "Carla/Walker/WalkerController.h"