Commit Graph

796 Commits

Author SHA1 Message Date
Marc Garcia Puig d9b216c474 Added basic support for pedestrian crosswalks 2020-03-27 12:51:34 +01:00
Axel1092 2c6483d194 Fixed warning in GenerateTriggerBox function. 2020-03-23 13:36:12 +01:00
Axel1092 892cab9dab Removed debug code. 2020-03-23 13:36:12 +01:00
Axel1092 7497ff5e3a Comented debug code. 2020-03-23 13:36:12 +01:00
Axel1092 6acecb2579 Added spawn of traffic signals. 2020-03-23 13:36:12 +01:00
Axel1092 8891fcb881 Added spawn of trigger boxes for traffic lights. 2020-03-23 13:36:12 +01:00
Axel1092 ad4fea3604 Updated Engine version in uproject file. 2020-03-20 12:01:30 +01:00
Axel 79ebb51a22 Fixed deprecated warnings. 2020-03-20 12:01:30 +01:00
Axel 6ba4d68a48 UE4.22 to UE4.24 upgrade. 2020-03-20 12:01:30 +01:00
doterop 346a513099 Fixed merge issues 2020-03-18 20:49:37 +01:00
doterop f34b884fc1 Fixed missed actor's pointers 2020-03-18 20:49:37 +01:00
dotero ed9f2bda51 WIP! Update on GetGroupTrafficLights, still not working properly 2020-03-18 20:49:37 +01:00
dotero 40dc7bd7c5 Rollback component serialization and updated querries to use the new components if possible 2020-03-18 20:49:37 +01:00
doterop cbb0b711db Fixed server serialization 2020-03-18 20:49:37 +01:00
doterop 38d4c8d551 TrafficLights spawned now are added to the episode 2020-03-18 20:49:37 +01:00
doterop 1fb733c085 Fixed buffer resize when parsing components 2020-03-18 20:49:37 +01:00
dotero 783643f051 Updated traffic light serialization on server side 2020-03-18 20:49:37 +01:00
Axel c7114e436b Review fixes. 2020-03-11 12:09:02 +01:00
Axel 020d38a963 Small fix. 2020-03-11 12:09:02 +01:00
Axel b10ee61808 Review fixes. 2020-03-11 12:09:02 +01:00
Axel ad2f05673c Style fixes. 2020-03-11 12:09:02 +01:00
Axel 1336640d2b Added default traffic light. 2020-03-11 12:09:02 +01:00
Axel e2f9fa605f Implementing signal spawn from OpenDRIVE. 2020-03-11 12:09:02 +01:00
Axel d533e359b6 Added Traffic Lights from OpenDRIVE. 2020-03-11 12:09:02 +01:00
dotero 0b9084495b Adding Controllers to the parser 2020-03-11 12:09:02 +01:00
dotero 8c08df6423 WIP!! Adding OpenDrive parsing to Server 2020-03-11 12:09:02 +01:00
dotero 853317b594 Creation of TrafficLight and Sign Components on UE 2020-03-11 12:09:02 +01:00
bernatx 7509e9d8de Changing version to 0.9.8 2020-03-06 16:11:51 +01:00
Marc Garcia Puig 1fa0400d9c Fixed package RecastBuilder call path 2020-03-06 09:49:38 +01:00
Marc Garcia Puig ee343dbe9b Added support for recast build from server-side 2020-03-06 09:49:38 +01:00
doterop 85b192530d
Doterop/traffic manager (#2468)
* Initial implementation of t.m. performance script

* Remove redundant getLocation() calls

* Demo for inter-client communication via Carla server

* WIP: To do: For client usage needed to be changed.

* Instead or client instance episodeProxy is passed to TM

* Instead or client instance episodeProxy is passed to TM

* parmeter improvements (walkers,cars,signs,lights)

* adding section id to map setup

* fix manual_control to reload car with autopilot on

* Instead of client instance episodeProxy is passed to TM.

* WIP: Only added vehicle register via RPC server / client call in TM to
local instance from remote instance. Similarly other APIs we need to
added.

* Added all TM APIs

* carla client now can provide TM instance if required.

* While getting TM instance if server given data is not valid new TM
instace is created. Need to decide what to do with earlier registed
vehicle with previous TM.

* Updated with HealthCheckRemoteTM() function to check TM server status
instead of ResetAllTrafficLights() for any new user client.

* Dynamic port selection added to TM server instace (in case of multiple
TM serve run, it required).

* Fixed change map error

* If registered TM at carla server is not present then remote TM should be
freed and new local TM instance is created.

* Created Process for Local TM.
It cheaks with total registered vehicles in it, if no register vehicles
for 5 sec, it closes it self.

In python spawn_npc.py Client Timeout set to 10 sec. as creating Process
is system dependent call and takes time.

User has to unregister vehicle before destroying it (if activated with
TM). Also neet to check TM unregister function to remove vehicles from
register list.

* Fix for collision ignore bug

* Update TM exit function check to compare registered vehicles with world
actors that if any valid vehicle present cointinue to run the TM else
stop.

* Print removal

* Splited work of main for loop in ApplyBatchCommandsSync

* WIP! Trying to get client directly

* WIP! Trying to access episode properly without getting it from TM ctr

* Changes to BatchControlStage for Sync Mode
Changes to Parameters for Synch Mode

* Added port support for TM. Multiclient MultiTM

* Added additions for RPC Synchronous Tick to TM.
Error handeling and code organization.

* Exposed API for Sync Mode

* TMServer notifies Server that it is gonna be destroyed

* Exposed Python API for Sync Mode

* Add TM as separate process and synchronous tick calls

* SetSynchronousModeTimeOutInMiliSecond method added

* TM shutsdown and informs to the connected clients

* WIP! Map change issues again

* Updated Traffic Manager for:
1) Multi-client, Multi-TM (as required) can be reistered to server.
2) TM is not a PROCESS separated from the user-client.
3) TM will exit if user-client exit.
4) If server closed, TM also get closed by catching runtime err.

* Server side changes ...

* Fixed possible stall on TM destruction

* fixing collision stage + cybertruck not safe

* Merge branch 'master' into 'soumyadeep/traffic_manager'

* WIP! Disconnection of server has to be properly handled by clients

* format update

* Fix bug unsignalized junctions

* # WARNING: head commit changed in the meantime

Merge branch 'doterop/traffic_manager' into soumyadeep/traffic_manager
Updates for Syncronized Tick.

* Updated runtime exception in Episode for smooth exit if TN server closed
for any other user client.

* Better Exception handeling

* Merged with jackbart94/tm_reduce_getloc_calls

* Merged soumyadeep/traffic_manager.
Removed World getter and recovered Episode as a parameter of TM ctr.
Fixed syntax errors.

* Initial implementation of t.m. performance script

* Remove redundant getLocation() calls

* Demo for inter-client communication via Carla server

* WIP: To do: For client usage needed to be changed.

* Instead or client instance episodeProxy is passed to TM

* Instead or client instance episodeProxy is passed to TM

* parmeter improvements (walkers,cars,signs,lights)

* fix manual_control to reload car with autopilot on

* Instead of client instance episodeProxy is passed to TM.

* WIP: Only added vehicle register via RPC server / client call in TM to
local instance from remote instance. Similarly other APIs we need to
added.

* Added all TM APIs

* carla client now can provide TM instance if required.

* While getting TM instance if server given data is not valid new TM
instace is created. Need to decide what to do with earlier registed
vehicle with previous TM.

* Updated with HealthCheckRemoteTM() function to check TM server status
instead of ResetAllTrafficLights() for any new user client.

* Dynamic port selection added to TM server instace (in case of multiple
TM serve run, it required).

* Fixed change map error

* If registered TM at carla server is not present then remote TM should be
freed and new local TM instance is created.

* Created Process for Local TM.
It cheaks with total registered vehicles in it, if no register vehicles
for 5 sec, it closes it self.

In python spawn_npc.py Client Timeout set to 10 sec. as creating Process
is system dependent call and takes time.

User has to unregister vehicle before destroying it (if activated with
TM). Also neet to check TM unregister function to remove vehicles from
register list.

* Fix for collision ignore bug

* Update TM exit function check to compare registered vehicles with world
actors that if any valid vehicle present cointinue to run the TM else
stop.

* Splited work of main for loop in ApplyBatchCommandsSync

* WIP! Trying to get client directly

* WIP! Trying to access episode properly without getting it from TM ctr

* Changes to BatchControlStage for Sync Mode
Changes to Parameters for Synch Mode

* Added port support for TM. Multiclient MultiTM

* Added additions for RPC Synchronous Tick to TM.
Error handeling and code organization.

* Exposed API for Sync Mode

* TMServer notifies Server that it is gonna be destroyed

* Exposed Python API for Sync Mode

* Add TM as separate process and synchronous tick calls

* SetSynchronousModeTimeOutInMiliSecond method added

* TM shutsdown and informs to the connected clients

* WIP! Map change issues again

* Updated Traffic Manager for:
1) Multi-client, Multi-TM (as required) can be reistered to server.
2) TM is not a PROCESS separated from the user-client.
3) TM will exit if user-client exit.
4) If server closed, TM also get closed by catching runtime err.

* Fixed possible stall on TM destruction

* fixing collision stage + cybertruck not safe

* Merge branch 'master' into 'soumyadeep/traffic_manager'

* WIP! Disconnection of server has to be properly handled by clients

* format update

* Fix bug unsignalized junctions

* # WARNING: head commit changed in the meantime

Merge branch 'doterop/traffic_manager' into soumyadeep/traffic_manager
Updates for Syncronized Tick.

* Updated runtime exception in Episode for smooth exit if TN server closed
for any other user client.

* Better Exception handeling

* Merged with jackbart94/tm_reduce_getloc_calls

* Merged soumyadeep/traffic_manager.
Removed World getter and recovered Episode as a parameter of TM ctr.
Fixed syntax errors.

* Rebased with master

* Changes after rebase

* Solving tab errors

* Updated Changelog

* Removing Destroyed vehicle's from TM Server

* Fixed uint compatibility with Windows

* Merged soumyadeep/traffic_manager. Discarded destroyed actors

* -Removed unnecessary files

* restoring docs from rebase

* Fix windows compilation

* refactoring stage-related code

* more code refactoring

* When map change the simulation doesn't throw exception anymore

* Fixed incorrect episode

* Fixed map change and TM remote detached thread destruction

* Syntax and comments fixes

* Missed change on previous commit

* Fixed compile minor compile issue

* Cleaned and fixed some issues after merge

* fix to sync localization bugs
modified PID parameters
revamping spawn_npc

* deleted tm_spawn_npc

* fixes spawn error in sync mode

* Redoing TM sync logic

* finished performance benchmark for tm

* deprecated wrapped methods:
register_vehicle
unregister_vehicle

* New TM management

* Fixed sync mode on TM

* Cleaned TM of prints and unussed functions

* collision stage checks for (0,0,0) to ignore.
in memory map has an # between keys to avoid possible mixup.
fixed spawn_npc with new sync mode

* changelog

* added more connection retries

* fixed changelog + comments (see reviewable)

* Moved socket include's to single header

* Added missing line at the end of the file

* Fixed syntax errors

* final commit

* Minor correction in comment

* update copyright year to 2020 + removed break

* restoring unwanted changes

* patch for smoke test error

* Removed "todo" for pylint

Co-authored-by: Jacopo Bartiromo <32928804+jackbart94@users.noreply.github.com>
Co-authored-by: Praveen Kumar <35625166+pravinblaze@users.noreply.github.com>
Co-authored-by: Soumyadeep <soumyadeep.dhar@kpit.com>
Co-authored-by: joel-mb <joel.moriana@gmail.com>
Co-authored-by: Sekhar Barua <58979936+sekhar2912@users.noreply.github.com>
Co-authored-by: bernat <bernatx@gmail.com>
Co-authored-by: Marc Garcia Puig <marcgpuig@gmail.com>
2020-02-28 19:58:13 +01:00
Marc Garcia Puig 790c6e9058 Fixed pedestrian navigation when import command 2020-02-28 16:01:47 +01:00
bernat f41d2a5116 Protect again against replacing package 2020-02-28 16:01:47 +01:00
Michele Bianchi 2094f85009 Removed random runaway newline 2020-02-28 16:01:47 +01:00
Michele Bianchi fdfb18df11 Added comment and removed an empty line 2020-02-28 16:01:47 +01:00
Michele Bianchi 501a643340 Fixed strange deletion and saving order 2020-02-28 16:01:47 +01:00
Michele Bianchi a1a1aa3f01 Change Roadrunned semantic names in the move commandlet 2020-02-28 16:01:47 +01:00
bernatx 878e8123da Fix Road tag and add some sidewalk to semantic segmentation 2020-02-28 16:01:47 +01:00
Michele Bianchi 005aafd2de Removed random runaway newline 2020-02-28 16:01:47 +01:00
Michele Bianchi 6d28e33ab2 Updated RoadRunner tags comment 2020-02-28 16:01:47 +01:00
Michele Bianchi 5d4f08f078 Added comment and removed an empty line 2020-02-28 16:01:47 +01:00
Michele Bianchi dcc299cfb6 Fixed strange deletion and saving order 2020-02-28 16:01:47 +01:00
Michele Bianchi bac38b5339 Updated list of semantic tags for the Move Assets commandlet 2020-02-28 16:01:47 +01:00
Michele Bianchi 3f7c7d2882 Change Roadrunned semantic names in the move commandlet 2020-02-28 16:01:47 +01:00
Marc Garcia Puig c64a2f24ba Removed comments 2020-02-28 11:02:45 +01:00
Marc Garcia Puig f2fcc64a1c Disabled OpenDriveMap from appearing on map list 2020-02-28 11:02:45 +01:00
Marc Garcia Puig 28396910ff Added the map to the default package 2020-02-28 11:02:45 +01:00
Marc Garcia Puig 13432ef578 Extended util/config.py with custom xodr maps 2020-02-28 11:02:45 +01:00
Marc Garcia Puig 955b753b83 Improved standalone OpenDRIVE usability 2020-02-28 11:02:45 +01:00
Marc Garcia Puig a8aa5afa0a Added basic support for the client using custom xodr on server 2020-02-28 11:02:45 +01:00