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

Fixing vehicle name and compilation on windows

This commit is contained in:
bernat 2021-07-28 08:38:25 +02:00
parent f4bb456031
commit 2ce9897ce9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PythonAPI/test/smoke/test_sync.py
View File

@ -68,7 +68,7 @@ class TestSynchronousMode(SyncSmokeTest):
spawn_points = self.world.get_map().get_spawn_points() spawn_points = self.world.get_map().get_spawn_points()
self.assertNotEqual(len(spawn_points), 0) self.assertNotEqual(len(spawn_points), 0)
car_bp = bp_lib.find('vehicle.mustang.mustang') car_bp = bp_lib.find('vehicle.ford.mustang')
car = self.world.spawn_actor(car_bp, spawn_points[0]) car = self.world.spawn_actor(car_bp, spawn_points[0])
# List of sensors that are not events, these are retrieved every frame # List of sensors that are not events, these are retrieved every frame
sensor_ids = [ sensor_ids = [

6
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventAdd.cpp
View File

@ -67,12 +67,12 @@ void CarlaRecorderEventAdd::Read(std::ifstream &InFile)
//--------------------------------------------- //---------------------------------------------
inline void CarlaRecorderEventsAdd::Clear(void) void CarlaRecorderEventsAdd::Clear(void)
{ {
Events.clear(); Events.clear();
} }
inline void CarlaRecorderEventsAdd::Add(const CarlaRecorderEventAdd &Event) void CarlaRecorderEventsAdd::Add(const CarlaRecorderEventAdd &Event)
{ {
Events.push_back(std::move(Event)); Events.push_back(std::move(Event));
} }
@ -101,4 +101,4 @@ void CarlaRecorderEventsAdd::Write(std::ofstream &OutFile)
OutFile.seekp(PosStart, std::ios::beg); OutFile.seekp(PosStart, std::ios::beg);
WriteValue<uint32_t>(OutFile, Total); WriteValue<uint32_t>(OutFile, Total);
OutFile.seekp(PosEnd, std::ios::beg); OutFile.seekp(PosEnd, std::ios::beg);
} }