From 4083adcba2f09e2802045b7e482f6515f6d97990 Mon Sep 17 00:00:00 2001 From: felipecode Date: Fri, 12 Jan 2018 15:57:53 -0200 Subject: [PATCH] Adding dependencies and fixing a few bugs --- PythonClient/carla/planner/city_track.py | 4 ++-- PythonClient/manual_control.py | 2 +- PythonClient/requirements.txt | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/PythonClient/carla/planner/city_track.py b/PythonClient/carla/planner/city_track.py index db543b44d..f7adff1b1 100644 --- a/PythonClient/carla/planner/city_track.py +++ b/PythonClient/carla/planner/city_track.py @@ -118,7 +118,7 @@ class CityTrack(object): return sorted(distance_vector)[0] -""" + def _closest_intersection_route_position(self, current_node, route): distance_vector = [] @@ -127,4 +127,4 @@ class CityTrack(object): distance_vector.append(sldist(node_iterator, current_node)) return sorted(distance_vector)[0] -""" + diff --git a/PythonClient/manual_control.py b/PythonClient/manual_control.py index dfca225db..9e3d9d69b 100755 --- a/PythonClient/manual_control.py +++ b/PythonClient/manual_control.py @@ -127,7 +127,7 @@ class CarlaGame(object): self._map_view = None self._is_on_reverse = False self._city_name = city_name - self._map = CarlaMap(city_name) if city_name is not None else None + self._map = CarlaMap(city_name, 16.43, 50.0) if city_name is not None else None self._map_shape = self._map.map_image.shape if city_name is not None else None self._map_view = self._map.get_map(WINDOW_HEIGHT) if city_name is not None else None self._position = None diff --git a/PythonClient/requirements.txt b/PythonClient/requirements.txt index 1a697a692..c6c7a2cfe 100644 --- a/PythonClient/requirements.txt +++ b/PythonClient/requirements.txt @@ -2,3 +2,5 @@ Pillow numpy protobuf pygame +matplotlib +builtins