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 0.9-win32

This commit is contained in:
Andrei Jianu 2018-08-27 17:40:29 +02:00 committed by GitHub
parent 42048c06df 8805d0d79a
commit e7291e2ce4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LibCarla/source/compiler/disable-ue4-macros.h
View File

@ -38,7 +38,7 @@
namespace boost {
static inline void throw_exception(const std::exception &e) {
UE_LOG(LogCarla, Fatal, TEXT("Exception thronw on Boost libraries: %s"), UTF8_TO_TCHAR(e.what()));
UE_LOG(LogCarla, Fatal, TEXT("Exception thrown on Boost libraries: %s"), UTF8_TO_TCHAR(e.what()));
}
} // namespace boost

4
PythonAPI/example.py
View File

@ -48,9 +48,9 @@ def main(add_a_camera, enable_autopilot):
world = client.get_world()
blueprint_library = world.get_blueprint_library();
blueprint_library = world.get_blueprint_library()
vehicle_blueprints = blueprint_library.filter('vehicle');
vehicle_blueprints = blueprint_library.filter('vehicle')
actor_list = []

2
PythonAPI/manual_control.py
View File

@ -93,7 +93,7 @@ class CarlaGame(object):
cam_blueprint = world.get_blueprint_library().find('sensor.camera')
self._camera = world.spawn_actor(cam_blueprint, CAMERA_POSITION, attach_to=self._vehicle)
self._camera.listen(lambda image: self._parse_image(image))
self._camera.listen(self._parse_image)
while True:
for event in pygame.event.get():

2
PythonAPI/vehicle_gallery.py
View File

@ -25,7 +25,7 @@ def main():
client = carla.Client('localhost', 2000)
world = client.get_world()
spectator = world.get_spectator()
vehicle_blueprints = world.get_blueprint_library().filter('vehicle');
vehicle_blueprints = world.get_blueprint_library().filter('vehicle')
for blueprint in vehicle_blueprints:
transform = carla.Transform(LOCATION, carla.Rotation(yaw=-45.0))