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

Merge branch 'master' into feature/integrate_rss_3.0.0

This commit is contained in:
berndgassmann 2020-04-09 15:23:00 +02:00 committed by GitHub
parent 5e7c6bb783 9d76978f93
commit b0787c0018
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LibCarla/source/carla/client/Landmark.h
View File

@ -121,15 +121,19 @@ namespace client {
Landmark(
SharedPtr<Waypoint> waypoint,
SharedPtr<const Map> parent,
const road::element::RoadInfoSignal* signal,
double distance_from_search = 0)
: _waypoint(waypoint),
_parent(parent),
_signal(signal),
_distance_from_search(distance_from_search) {}
/// waypoint where the signal is affecting
SharedPtr<Waypoint> _waypoint;
SharedPtr<const Map> _parent;
const road::element::RoadInfoSignal* _signal;
double _distance_from_search;

6
LibCarla/source/carla/client/Map.cpp
View File

@ -137,7 +137,7 @@ namespace client {
auto signal_references = _map.GetAllSignalReferences();
for(auto* signal_reference : signal_references) {
result.emplace_back(
new Landmark(nullptr, signal_reference, 0));
new Landmark(nullptr, shared_from_this(), signal_reference, 0));
}
return result;
}
@ -148,7 +148,7 @@ namespace client {
for(auto* signal_reference : signal_references) {
if(signal_reference->GetSignalId() == id) {
result.emplace_back(
new Landmark(nullptr, signal_reference, 0));
new Landmark(nullptr, shared_from_this(), signal_reference, 0));
}
}
return result;
@ -160,7 +160,7 @@ namespace client {
for(auto* signal_reference : signal_references) {
if(signal_reference->GetSignal()->GetType() == type) {
result.emplace_back(
new Landmark(nullptr, signal_reference, 0));
new Landmark(nullptr, shared_from_this(), signal_reference, 0));
}
}
return result;

4
LibCarla/source/carla/client/Waypoint.cpp
View File

@ -220,7 +220,7 @@ namespace client {
added_signals.insert(signal_data.signal);
auto waypoint = SharedPtr<Waypoint>(new Waypoint(_parent, signal_data.waypoint));
result.emplace_back(
new Landmark(waypoint, signal_data.signal, signal_data.accumulated_s));
new Landmark(waypoint, _parent, signal_data.signal, signal_data.accumulated_s));
}
return result;
}
@ -238,7 +238,7 @@ namespace client {
}
auto waypoint = SharedPtr<Waypoint>(new Waypoint(_parent, signal_data.waypoint));
result.emplace_back(
new Landmark(waypoint, signal_data.signal, signal_data.accumulated_s));
new Landmark(waypoint, _parent, signal_data.signal, signal_data.accumulated_s));
}
}
return result;