Commit Graph

702 Commits

Author SHA1 Message Date
Marc Garcia Puig 5c9e317f04 Merge remote-tracking branch 'origin/opendrive_testing' into jenkins/opendrive 2019-03-25 18:12:33 +01:00
bernatx 448bbfc65f Exposing lane section id to client API 2019-03-25 17:56:02 +01:00
Marc Garcia Puig d8c72c1c18 Removed unnecessary function 2019-03-25 17:48:16 +01:00
Marc Garcia Puig 565d753505 Fixed Topology positive lanes 2019-03-25 17:39:18 +01:00
Marc Garcia Puig 9eebcefb3e Merge remote-tracking branch 'origin/opendrive_testing' into jenkins/opendrive 2019-03-25 14:57:51 +01:00
bernatx 0ccd3c5fbb Fixed the next section lane to go 2019-03-25 14:56:24 +01:00
Marc Garcia Puig 6cd3da7919 Fixed floating comparasion in assert 2019-03-25 13:44:04 +01:00
nsubiron 00d61d6a89 Add get waypoint test 2019-03-24 10:37:02 +01:00
Marc Garcia Puig 6c0f2a3405 Fixed tests 2019-03-23 22:30:01 +01:00
Marc Garcia Puig cc96c4b81b Fixed lane_id assert 2019-03-23 21:32:18 +01:00
Marc Garcia Puig a9c10f76c0 Debug commit 2019-03-23 16:47:38 +01:00
Marc Garcia Puig 4e1275ef4c backup with doubles 2019-03-22 23:50:45 +01:00
Marc Garcia Puig 9e3f69a00e backup 2019-03-22 20:54:30 +01:00
Marc Garcia Puig fa9828aced Merge remote-tracking branch 'origin/opendrive_testing' into marcgpuig/opendrive 2019-03-22 16:54:09 +01:00
Marc Garcia Puig a42ea2d8bf Now GetClosestWaypointOnRoad returns a valid s 2019-03-22 15:32:42 +01:00
bernatx 7f62ce5af8 Now road has vector of next and previous roads 2019-03-22 15:32:40 +01:00
Marc Garcia Puig 5599d78892 Fixed the tangents again 2019-03-22 15:14:33 +01:00
Marc Garcia Puig 61234b731f Merge remote-tracking branch 'origin/nsubiron/opendrive' into jenkins/opendrive 2019-03-22 13:21:37 +01:00
nsubiron b8f9772022 Refactor to use section id and return by ref when possible 2019-03-22 13:08:42 +01:00
nsubiron 6c0371e4a1 Add section_id to waypoints 2019-03-22 13:08:42 +01:00
nsubiron 7dcbdbefbe Add LaneSectionMap 2019-03-22 13:08:42 +01:00
nsubiron 5b9d6abc2a Add Lane::GetLength 2019-03-22 13:08:42 +01:00
Marc Garcia Puig 120a62ad0b Fixed an issue with DirectedPoint tangents 2019-03-22 13:08:37 +01:00
bernatx b8856d658b Add section.id to internal file 2019-03-22 12:50:22 +01:00
bernatx 122fc14470 Fixed previous lane pointers 2019-03-22 12:25:05 +01:00
Marc Garcia Puig f53d218e85 Merge branch 'marcgpuig/opendrive' into jenkins/opendrive 2019-03-22 12:13:22 +01:00
Marc Garcia Puig 76b9a606d2 GetNearestPoint & ComputeTransform work 2019-03-22 12:10:39 +01:00
nsubiron efa0bf632d Merge branch 'opendrive_testing' into jenkins/opendrive 2019-03-22 11:09:38 +01:00
Marc Garcia Puig 7d3dea5cbc Fixed inversed waypoints 2019-03-21 21:49:51 +01:00
Marc Garcia Puig f9dbee7ba6 Waypoints fixes, but still inverted for now 2019-03-21 21:13:00 +01:00
bernatx 17b3317bab Added Id to LaneSections 2019-03-21 19:58:17 +01:00
Marc Garcia Puig e9bd864426 Unreal's Y axis hack 2019-03-21 18:39:58 +01:00
bernatx 1d7250eed9 Minor changes 2019-03-21 18:30:02 +01:00
Manish 4d3698dcfa remove old junctions test function 2019-03-21 14:14:47 +01:00
bernatx f1c0e06593 Added road link test 2019-03-21 13:13:51 +01:00
Manish afd1d99cbb adding elevation and road mark parsing test 2019-03-21 12:52:11 +01:00
nsubiron 6de2406f3b Better output on test failure 2019-03-21 12:48:47 +01:00
Marc Garcia Puig 0d9f201702 Fixed few assert errors 2019-03-21 12:42:58 +01:00
Marc Garcia Puig ba04f0b9d7 Merge remote-tracking branch 'origin/marcgpuig/opendrive' into jenkins/opendrive 2019-03-21 12:11:54 +01:00
Marc Garcia Puig 8160d06b1e Added GetLaneWidth() and GetMarkRecord() 2019-03-21 12:08:53 +01:00
nsubiron 4b6e1ce8b3 Try fix GetLaneSectionsAt 2019-03-21 12:03:58 +01:00
nsubiron af436ef260 Increase version of test content 2019-03-21 12:03:58 +01:00
nsubiron 3ca71ec7d6 Add IsValid function for waypoints 2019-03-21 12:00:10 +01:00
nsubiron 47d8396d30 Making MapData only public in testing 2019-03-21 10:50:08 +01:00
nsubiron 547cb45e9c Add iterate waypoints test 2019-03-21 10:49:16 +01:00
Manish a8d6fb4b01 renamed file to test_opendrive 2019-03-21 10:12:44 +01:00
Marc Garcia Puig 22c26aed15 Merge remote-tracking branch 'origin/nsubiron/opendrive' into jenkins/opendrive 2019-03-20 21:37:32 +01:00
Marc Garcia Puig e75c3750dd Added informations to final data and fixed tests 2019-03-20 21:14:01 +01:00
Marc Garcia Puig 4ded71e4f3 Merge remote-tracking branch 'origin/opendrive_testing' into jenkins/opendrive 2019-03-20 20:29:32 +01:00
bernatx f407e2ca5a Add center lane 0 in parser 2019-03-20 20:27:43 +01:00
nsubiron 5f0c9c8ed2 Refactor RoadInfo classes 2019-03-20 19:09:11 +01:00
Marc Garcia Puig f21f7830f1 Merge remote-tracking branch 'origin/opendrive_testing' into jenkins/opendrive 2019-03-20 19:03:00 +01:00
Manish 4a5096699e Added Map getter for tests 2019-03-20 19:02:02 +01:00
Manish 38244345aa adding tests 2019-03-20 18:51:22 +01:00
bernatx 4e194a5a44 Fixes and Tests 2019-03-20 18:38:37 +01:00
Marc Garcia Puig feec92823c Added GaeWaypoint 2019-03-20 18:35:40 +01:00
Marc Garcia Puig 8eae0ae652 Merge branch 'marcgpuig/opendrive' into jenkins/opendrive 2019-03-20 12:58:00 +01:00
Marc Garcia Puig a4a53e7bd6 Added waypoint transform functions 2019-03-20 12:56:26 +01:00
nsubiron 424441d72c Add unit tests for xodr files 2019-03-19 22:41:42 +01:00
nsubiron 56fc5f97de Merge branch 'bernatx/opendrive2' into jenkins/opendrive 2019-03-19 20:49:28 +01:00
bernatx 650231707d Creating tests for opendrive 2019-03-19 20:48:55 +01:00
Marc Garcia Puig 16ebb59248 Merge remote-tracking branch 'origin/nsubiron/opendrive' into marcgpuig/opendrive 2019-03-19 18:52:31 +01:00
Marc Garcia Puig 02fc027647 Added GetNearestLane 2019-03-19 18:52:24 +01:00
nsubiron e7a4415394 Reorganize road::Map and implement some more functions 2019-03-19 17:56:11 +01:00
nsubiron dfe25de701 Implement CalculateCrossedLanes 2019-03-19 17:21:04 +01:00
nsubiron 5aa5161f40 Implement GetRight and GetLeft 2019-03-19 17:07:02 +01:00
nsubiron 72a8f84552 Pass Waypoints by value 2019-03-19 17:01:08 +01:00
bernatx dce1c9940f Half Fix merge 2019-03-19 16:26:07 +01:00
bernatx 96d4af98b2 Merge 2019-03-19 16:25:39 +01:00
nsubiron 633f7d7348 road::Map, throw exceptions instead of asserts 2019-03-19 16:19:02 +01:00
bernatx d27b6e8e3b Change doubles by float 2019-03-19 16:18:42 +01:00
Manish 27f274b9cd adding road elevation funcs in map builder and changed double to float 2019-03-19 16:11:19 +01:00
nsubiron 0b119a5186 Fix functor not perfect forwarded 2019-03-19 16:05:03 +01:00
bernatx cb2c16bdf2 Fix the merge 2019-03-19 15:47:35 +01:00
Marc Garcia Puig ec7101d9fb Added GetLanesAt 2019-03-19 15:46:21 +01:00
bernatx 0a17bc2ffa Merge 2019-03-19 15:23:47 +01:00
bernatx 882cb218c3 Compiling state, before testing 2019-03-19 14:32:36 +01:00
Marc Garcia Puig e3987ca546 Few code refactoring 2019-03-19 12:15:01 +01:00
nsubiron 35545f224a Merge branch 'master' into marcgpuig/opendrive 2019-03-19 11:42:02 +01:00
Aidan Clear 0c7a89552e Updating map builder add road mark type lane to parent list and making Road InfoIterator use unique pointers 2019-03-19 11:38:55 +01:00
Manish 516e4cb16a Added line and arc geometry to temporal road info 2019-03-19 11:30:41 +01:00
Marc Garcia Puig e88dc61779 Implemented more functions 2019-03-19 11:30:20 +01:00
nsubiron c6fe68e94b Comment out for now unused functions 2019-03-18 19:06:21 +01:00
nsubiron 39ccefddfa Implement GetNext 2019-03-18 18:57:42 +01:00
nsubiron 1cc4a7ed01 Implement GetSuccessors 2019-03-18 18:47:14 +01:00
nsubiron 171de59730 Implement GenerateWaypoints 2019-03-18 18:13:11 +01:00
nsubiron 6447d5dc1a Implement GetTopology with new API 2019-03-18 18:13:11 +01:00
nsubiron 9368891bb0 Add const versions of the methods at Iterator.h 2019-03-18 18:12:55 +01:00
Marc Garcia Puig 32d86e685d Added GetLanesOfType() 2019-03-18 17:14:49 +01:00
Marc Garcia Puig ecd5fb4b42 Added RoadInfoGeometry 2019-03-18 17:13:59 +01:00
Manish 9e4a638117 filling temporal map with lane information 2019-03-18 16:06:39 +01:00
bernatx 1bb4e11699 Mixing all 2019-03-18 15:39:03 +01:00
Marc Garcia Puig 15637e2748 Added more queries to MapData 2019-03-18 13:18:42 +01:00
Manish 68920485be some more small fixes 2019-03-18 13:12:41 +01:00
Manish ae672bbfc7 small refactor 2019-03-18 12:51:27 +01:00
Daniel 0302b44bf5 Fixed getters for signals 2019-03-18 11:15:12 +01:00
nsubiron f9b2b10b02 Avoid inlining logging functions 2019-03-18 10:33:33 +01:00
nsubiron 6cc90cea77 Use noexcept when possible 2019-03-18 10:33:04 +01:00
bernatx 1f896656c5 Functions to get address of a Lane 2019-03-18 09:53:56 +01:00
Marc Garcia Puig 58254c3ba1 Merge remote-tracking branch 'origin/nsubiron/opendrive' into marcgpuig/opendrive 2019-03-15 21:09:01 +01:00
Marc Garcia Puig ca3b7e3c22 GetLane with multiple LaneSection per 's' support 2019-03-15 21:05:33 +01:00
Daniel 9025b7fa00 Signal parser 2019-03-15 19:44:27 +01:00
nsubiron 3709152989 Use StringUtil::ToLower 2019-03-15 19:28:50 +01:00
Aidan Clear 5f82b80b2a Updating and adding new lane record classes. Updating map builder to create instances of these classes for the parser 2019-03-15 19:09:06 +01:00
Manish cab00065d2 Added lane parser and map builder functions 2019-03-15 18:44:34 +01:00
Marc Garcia Puig 08a27ced6a Fixed build 2019-03-15 18:42:35 +01:00
nsubiron d8e0ce15ff Remove road::WaypointGenerator, move its functionality into road::Map 2019-03-15 18:32:36 +01:00
nsubiron e0b472f262 Use std::hash<Waypoint> to build topology 2019-03-15 18:32:36 +01:00
nsubiron a25629f1d5 Replace WaypointHash with std::hash<Waypoint> 2019-03-15 18:32:36 +01:00
Marc Garcia Puig 34b9ada5bb Merge remote-tracking branch 'origin/manishthani/junction_parser' into marcgpuig/opendrive 2019-03-15 18:32:01 +01:00
bernatx 5f10196739 Version that compiles with Road, LaneSections and Lanes 2019-03-15 18:04:26 +01:00
Manish cd1c29c42e junction data structure filled inside map builder 2019-03-15 14:59:04 +01:00
nsubiron db1addc378 Fix #1381, make sensors use timestamp from UCarlaEpisode 2019-03-15 14:39:23 +01:00
Daniel e69b95c60a ObjectParser 2019-03-15 13:01:46 +01:00
nsubiron f0d3fd78f1 Pass buffers by r-value reference whenever possible 2019-03-15 12:55:57 +01:00
Manish 7643544e37 added junction name in map builder 2019-03-15 12:51:44 +01:00
Marc Garcia Puig 6de4a139d6 Added getter func for roads and lanes 2019-03-15 12:51:13 +01:00
Manish c6542d2c64 Added junction parser and map builder functions 2019-03-15 12:28:00 +01:00
Marc Garcia Puig 4710c2d05f Removed unnecessary consts 2019-03-15 10:53:36 +01:00
Marc Garcia Puig a8c04c0ec8 Now compiles 2019-03-14 20:18:22 +01:00
Marc Garcia Puig ff9762736c Merge remote-tracking branch 'origin/dnovillo/signal-parser' into marcgpuig/opendrive 2019-03-14 20:05:43 +01:00
bernatx 836bf7e9ac Geometry and Profile parsers 2019-03-14 19:38:28 +01:00
Daniel ff253089fa Added AddValidity method 2019-03-14 19:30:29 +01:00
Daniel c22867ab56 ObjectParser first version 2019-03-14 19:30:17 +01:00
Daniel 67a2abceff Improved code 2019-03-14 19:30:09 +01:00
Daniel ccb529ef97 SignalParser and TrafficGroupParser 2019-03-14 19:30:01 +01:00
bernatx 1b6f00c733 RoadLinkParser done 2019-03-14 19:23:20 +01:00
Marc Garcia Puig 4719435069 Data structure added 2019-03-14 19:18:43 +01:00
Marc Garcia Puig b8140fe1d2 Merge remote-tracking branch 'origin/nsubiron/opendrive' into marcgpuig/opendrive 2019-03-13 22:14:28 +01:00
nsubiron 13d7d72ec7 Proposal for interface of road::Map and road::element::Waypoint 2019-03-13 20:29:45 +01:00
Aidan Clear d6f7ff2241 Just removing id as an arg from constructor. Forgot to remove it 2019-03-13 19:52:26 +01:00
Aidan Clear bad72db260 Adding and modifying structs for lane and road parsing 2019-03-13 18:41:19 +01:00
Marc Garcia Puig 575e3886cf Changed location of pugi library 2019-03-13 18:38:15 +01:00
Marc Garcia Puig 5949f2b9e2 Restructured code 2019-03-13 18:37:45 +01:00
nsubiron 04ccec5c45 Fix LibCarla recompiles after each commit 2019-03-13 16:51:31 +01:00
Pasch, Frederik 3d2e08611e Add time to SensorData 2019-03-13 16:07:31 +01:00
nsubiron 84b801c4f3 Add missing include 2019-03-12 20:45:13 +01:00
nsubiron c680ee9246 Fix missing include 2019-03-12 14:02:17 +01:00
nsubiron c7a38e1c77 Pass buffers by r-value reference whenever possible 2019-03-11 23:50:25 +01:00
nsubiron 77ee0382e5 Fix narrowing conversion in Buffer 2019-03-11 23:48:42 +01:00
Néstor Subirón cff355e1c3
Merge branch 'master' into localhost 2019-03-11 19:03:50 +01:00
nsubiron 89161775a4 Add s property to waypoints 2019-03-11 17:33:11 +01:00
nsubiron 6a6254fd5e Add unique ID for waypoints based on their position on the road 2019-03-11 17:33:03 +01:00
nsubiron 1a081e8f67 Add method to Map to transform Location to GeoLocation 2019-03-11 14:37:48 +01:00
Johannes Quast 63056910db Fix resolving host "localhost" 2019-03-11 10:33:54 +01:00
Johannes Quast 2cfe7ad136 Resolve hostname for streaming client
- Allows usage of hostnames instead of IP addresses only
   with carla::Client
2019-03-04 08:56:58 +01:00
nsubiron cf6e9bbbed Fix Windows build 2019-03-01 17:46:55 +01:00
Marc Garcia Puig c012b48e73 Old GetLaneWidth now using new parsed lane width 2019-03-01 02:36:17 +01:00
Marc Garcia Puig 94dde71c7f Few revision fixes 2019-03-01 02:36:17 +01:00
Marc Garcia Puig 3e6fb728ed Using the old lane positioning for junction waypoints 2019-03-01 02:36:17 +01:00
Marc Garcia Puig a241e133f4 Now the waypoint position is correctly computed 2019-03-01 02:36:17 +01:00
Marc Garcia Puig 5490c2dd68 Added Cubic polinomial helper class 2019-03-01 02:36:17 +01:00
Marc Garcia Puig c4c8ac886d Improved lane changing functions 2019-03-01 02:36:17 +01:00
Marc Garcia Puig 7e0d570e1c Now all the roadmarks are parsed + added lane type to waypoint API. 2019-03-01 02:36:17 +01:00
Marc Garcia Puig 7bbc894ed7 Added material to the lane parser 2019-03-01 02:36:17 +01:00
Marc Garcia Puig 43a9908b73 Searching for lanes now is O(1) and not O(n) 2019-03-01 02:36:17 +01:00
Marc Garcia Puig a66dff8669 Extended waypoint API core to accept lane changes 2019-03-01 02:36:17 +01:00
nsubiron 43ead32787 Increase default time-out 2019-03-01 00:15:58 +01:00
nsubiron 8b3489fc88 Add attribute to vehicles to control whether control is sticky 2019-03-01 00:15:58 +01:00
nsubiron b8ec3e2c1c Allow streaming server connecting to random available port (port 0) 2019-03-01 00:15:58 +01:00
nsubiron 2696c9684e Fix #784, add methods for sending commands in batch 2019-03-01 00:15:58 +01:00
nsubiron fd4d8959f5 Change more rpc bindings to accept rpc::ActorId instead of rpc::Actor 2019-03-01 00:15:58 +01:00
nsubiron 94ce35dd31 Change rpc bindings to accept rpc::ActorId instead of rpc::Actor when only the id is needed 2019-03-01 00:15:58 +01:00
nsubiron 365eecbb7f Rename actor_id_type to ActorId 2019-03-01 00:15:58 +01:00
nsubiron 1378d7c3cf Fix synchronization issues when changing episode 2019-03-01 00:15:58 +01:00
nsubiron 579d93e61f Change episode in client-side if server changed episode by checking world observer message 2019-03-01 00:15:58 +01:00
nsubiron 691fecd15f Improve wait for newly loaded maps, ignore time-outs 2019-03-01 00:15:58 +01:00
nsubiron 8fb6197a79 Add a method for getting the list of available maps in Python API 2019-03-01 00:15:58 +01:00
nsubiron 5210cd71f0 Make load map methods const 2019-03-01 00:15:58 +01:00
nsubiron 3ec2483316 Add acceleration and delta-time to world observer message to make data self contained 2019-03-01 00:15:58 +01:00
nsubiron bcc44c97fb Fix synchronization issues when changing episode 2019-03-01 00:15:58 +01:00
nsubiron d331f6969b Improve checks when the episode changed 2019-03-01 00:15:58 +01:00
nsubiron 6bb2feb9b1 Fix #1272, allow changing the map from client-side 2019-03-01 00:15:58 +01:00
nsubiron 5da183e4c5 Change episode in client-side if server changed episode by checking world observer message 2019-03-01 00:15:58 +01:00
nsubiron 5b7098a67c Remove map_name from world 2019-03-01 00:15:58 +01:00
nsubiron 461bd5b1c6 Fix possible unwanted exception thrown on a thread 2019-03-01 00:15:58 +01:00
nsubiron 036bc22ae4 Include episode id on world observer message 2019-03-01 00:15:58 +01:00
nsubiron aa818cdc67 Make episodes have a random unique id to avoid collisions between runs 2019-03-01 00:15:58 +01:00
nsubiron 532355dbf9 Fix client stuck after requesting map on sync mode 2019-03-01 00:15:58 +01:00
nsubiron fe2ebc527c Allow changing episode settings at runtime (sync mode and no-rendering mode) 2019-03-01 00:15:58 +01:00
nsubiron e90e82cc81 Fix #1244, make simulator wait for client cue each tick if sync mode is enabled 2019-03-01 00:15:58 +01:00
nsubiron 43ed758fb8 Fix #1258, add FCarlaEngine to ensure tick order 2019-03-01 00:15:58 +01:00
Néstor Subirón 1798e57ef9
Merge branch 'master' into autogenerate-map-commandlet 2019-02-28 16:08:48 +01:00
nsubiron 6789783a17 Merge branch 'master' into bernatx/Recorder 2019-02-28 15:17:18 +01:00
bernatx b7be0c67d3 Changes for the Pull Request 2019-02-28 12:37:02 +01:00
Daniel e7a5f870f3 Added Traffic Signs 2019-02-27 20:01:23 +01:00
Daniel 59ea5589e0 Import now work with custom traffic lights and groups 2019-02-27 20:01:23 +01:00
Aidan Clear 5cbde4d5a9 Updating api to allow retrieval of traffic pole index and the other traffic lights in a group from a traffic light 2019-02-27 18:48:40 +01:00
nsubiron 3e93782c98 Expose traffic sign's trigger volumes on Python API 2019-02-27 17:47:36 +01:00
Néstor Subirón 3f80ebcf0a
Merge branch 'master' into feature/fixGeoReferenceParsing 2019-02-27 13:14:29 +01:00
Néstor Subirón 0e7e1b0b91
Merge branch 'master' into new_expose_vehicle_physics 2019-02-27 12:29:58 +01:00
Marc Garcia Puig f0273d5465
Merge branch 'master' into marcgpuig/windows_build 2019-02-27 11:50:57 +01:00
Pasch, Frederik 381f03a9a0 fix parsing of OpenDrive geoReference exported by RoadRunner 2019-02-26 19:34:31 +01:00
manishthani a49e14997e
Merge branch 'master' into new_expose_vehicle_physics 2019-02-26 14:56:05 +01:00
Manish 4cbd6311e6 changed some default params 2019-02-25 21:36:50 +01:00
Manish 5eb4561a38 refactoring code 2019-02-25 20:41:54 +01:00
Manish dcc0cc4f1d Added default params and refactored 2019-02-25 13:16:57 +01:00
bernat 98492c592d
Merge branch 'master' into bernatx/Recorder 2019-02-25 12:16:06 +01:00
Manish 333fe4546d refactored code 2019-02-25 11:17:16 +01:00
Manish 12fd0178e5 Improved test, removed inertia tensor scale, fixed bindings and center of mass 2019-02-24 19:47:35 +01:00