Commit Graph

441 Commits

Author SHA1 Message Date
bernatx 5f1b5e18e0 Fix import on windows, and rename imported assets 2019-12-11 15:17:51 +01:00
German Ros ebbf2748b9 Update: New Dockerfile to support OpenGL and Vulkan in headless mode
* Support for OpenGL and Vulkan in headless mode
2019-12-11 14:56:29 +01:00
bernatx 960fac7e47 Last version of Recast 2019-12-11 12:07:59 +01:00
Marc Garcia Puig 6161c54b01 Added gitignore file in DockerUtils 2019-12-11 12:07:59 +01:00
bernatx 5fc36879ed Updating Recast last version 2019-12-11 12:07:59 +01:00
Marc Garcia Puig afea285a93 Fixed Setup.sh permissions and other files 2019-12-11 12:07:59 +01:00
bernatx ad0488006a Walkers check vehicles in the direction to go 2019-12-11 12:07:59 +01:00
bernatx a41815f54c Fixing pedestrians collision with vehicles 2019-12-11 12:07:59 +01:00
bernatx f12e63890f Finetunning pedestrians collision 2019-12-11 12:07:59 +01:00
bernatx e2bb97bbaa Update Recast version 2019-12-11 12:07:59 +01:00
bernatx 780f0b0b75 Fixes from PR. Added distance to check for vehicles. 2019-12-11 12:07:59 +01:00
bernatx f1b48b88ea Add hash to the Recast folder to identify latest version 2019-12-11 12:07:59 +01:00
bernatx a0317960d3 Update new Recast version 2019-12-11 12:07:59 +01:00
bernatx 18a89f410c Update new Recast version to use 2019-12-11 12:07:59 +01:00
bernatx 1c4b8c4bea Pedestrians check if a vehicle is near before crossing 2019-12-11 12:07:59 +01:00
bernatx b6cfcbe92c Using last version of Recast 2019-12-11 12:07:59 +01:00
bernatx 21f0bcf2e1 Use last version of Recast fork 2019-12-11 12:07:59 +01:00
bernatx 2060558da7 Pedestrians now can try to avoid vehicles 2019-12-11 12:07:59 +01:00
Xavi 927a3091fb Update content version 2019-12-11 05:07:04 +01:00
Johannes Quast fe83f1ab3b Add Responsibility Sensitive Safety (RSS) to CARLA Client library
- Add build variant with RSS sensor
 - Add RSS result visualization
 - Add RSS Restrictor implementation
 - Add RSS manual control example
2019-12-09 16:37:32 +01:00
Marc Garcia Puig 535cb7681e Small fixes in gnss and in automatic BP doc gen 2019-11-19 16:10:39 +01:00
Praveen Kumar 42af9614a0 Updated TrafficManager (#2112)
* Initial commit

This commit imports files from scenario_runner repository

* WIP TrafficDistributor
Set horizontal integral component to 0
Fixed startup concurrency issue

* TrafficDistributor first crude version

* Code asthetics, Uncrustified.

* Code clean up

* Fixed more concurrency bugs

* Reduced number of vehicles per core
Fixed some unhandled exceptions

* EOD commit 29AUG2018

* Re-organizing directory structure

* WIP code re-organization

* Redesigned PipelineStage
Implemented Messenger to communicate between stages
Implemented LocalizationStage
Added StageEnum
Removed unecessary files

* WIP Testing LocalizationStage

* Implemented and benchmarked LocalizationStage
Achieved single stage throughput of 600,000,000

* Implemented CopyBufferList() in LocalizationStage

* Fixed stage stalling and corrected benchmark

* Setting worker thread count to 1

* Code re-organization for porting MotionPlannerStage

* WIP - porting MotionPlanner

* Moved thread management logic into PipelineStage base class

* Implemented output data frame switching
Moved relavent structures and types from MotionPlannerStage.h to PIDController.h

* Re-organized directory structure to be consistent with rest of the project
Initialized frame_selector in constructor

* WIP - EOD commit 02SEP209

* WIP - managed to break deadlock between sender and receiver

* Implemented common mutex sharing for thread management in PipelineStage
Added small timeout for thread locking in PipelineStage
Finally broke deadlocks in stage integration

* Porting BatchControlStage to new design

* Ported BatchControlStage to new design
Fixed array indexing bug
Messaging actor_id instead of actor pointer to BatchControlStage
Improved thread co-ordination logic in PipelineStage

* Fixed array exetreme indexing issue

* Fixed thread co-ordination logic for multiple worker thread case

* Ported PID state map to dynamically allocated vector
Changed thread co-ordination time out to 1ms

* WIP - EOD 03092019

* Ported CollisionStage to new design
Added debug helper parameter
Added directionality pre-condition to check polygon overlap
Streamlined boundary functions
Fixed actor id to array index map
Passing individual buffers from localization
Using unsigned int keys in VicinityGrid

* WIP - fixing localization conflict on frame switching

* Fixed localization frame switching bug

* Ported TrafficLightStage to new design (#2078)

* Implemented TrafficLightStage with new architecture

* Implemented slowdown on approaching junction

* Integrated all stages into Pipeline class

* Ported PipelineExecutable.cpp to work with new Pipeline

* WIP - Fixing TrafficDistributor

* Switching to single thread stage actions
Added release options to CMakeLists.txt
Changed vicinity grid keys to string

* Changed TrafficDistributor to TrafficDistribution
This class only meant to keep track of vehicles acrros different road positions

* Changed TrafficDistributor declaration in LocalizationStage

* WIP - Lane changes

* Streamlined traffic distribution implementation

* Implemented a working lane change policy

* Fixed const correctness for ActionThreadManager and Action methods
Chaned varialbe++ to ++variable wherever suitable

* Using STL's numeric_limits instead of arbitrary high values for infinity
Made suitable constants static
Camelcase starting with uppercase for InMemoryMap methods
Fixed comment notions in all files

* Streamlined boolean return values from methods in CollisionStage.cpp
Using short hand for boost::geometry
More comments on boundary calculation logic
Camelcasing for methods

* Fixed TrafficDistribution vehicle tracking logic
Removed distance limit for lane change

* Moved lane change logic to TrafficDistributor.cpp

* Implemented logic to avoid collisions with unregistered actors

* Implemented graceful stop functionality for traffic manager

* Code aesthetics

* Added debug support for TrafficDistributor.cpp
Fixed Test.cpp

* Defined constants in TrafficDistributor.cpp
Code aesthetic changes

* Update README.md

* Aphabetical ordering of header include statements

* Code streamlining and aesthetic changes

* Review comment changes (#2116)

Review comment changes
Removed frame_map from TrafficLightStage

* Made changes  for review comments (#2117)

* Fixed implicit private inheritence for LocalizationStage
Removed unecessary using <method> statements in concrete stage classes

* Removed break logic from all loops

* Added detailed comments to all header files

* Minor review comment changes to collision stage

* Detailed comments for all .cpp files

* Implemented batch spawn and delete

* Added minimum distance check for lane change
Increased wait time after sending batch spawn command

* Simplified geodesic boundary creation in collision stage

* Changing to unsigned integers when appropriate
Shorter name aliasing

* Changes for code reveiw comments

* Removed white spaces

* Code review changes
Using carla::geom::Math::DistanceSquared whenever possible
Better name aliasing
Function signature checks

* Code aesthetics, text formatting

* Changes for appropriate auto keyword usage

* Grammar check

* Grammatical correction

* Distance based check points and boundary generation
instead of index based checks

* Using explicit typing wherever possible instead of auto

* Review comment changes

* Review comment changes

* Added time margin for approaching vehicles for lane change
Increased minimum collision boundary
Streamlined InMemoryMap::StructuredWaypoints
Implemented gradual braking in PIDController
Added left right checks in SimpleWaypoint
Removed redundant method in SimpleWaypoint

* Initial implementation for reproducibility

* Fixed radomization during path selection

* Added Vicinity grid-key checker for grid to actor_id map

* WIP: junction negotiation enhancement

* Polygon to polygon distance based collision negotiation

* Update Linux.mk

* Update CMakeLists.txt

* Update Vars.mk

* Update README.md

* Update getting_started.md

* Review comment changes
Namespace aliasing checks
Redundant function call checks
Default constants defined in motion planner stage
Removed hard braking to slow down near junctions
Lane change approaching vehicle check time margin
Added -h option to get help on traffic manager

* Reverting to carla::client::Vehicle::GetTrafficlightState non-signalised junctions

* Added communication timeout and implemented stopping when carla stops
Removed throughtput measurement logic from PipelineExecutable

* Updated gitignore

* updated CHANGELOG.md

* updated CHANGELOG.md

* WIP: negotiating non-signalised junction

* Time duration ticketing system for non-signalised junctions
Changed from pre-randomised to run time randomised decisions at junctions

* Removing debug draw statements

* Fixed make and cmake, more work required

* Added traffic manager build to jenkins

* updated docs
2019-10-07 16:30:51 +02:00
manishthani 89e329b738
Fixed bugs of importing assets (#2068)
* Refactor Commandlet + made small fix

* fixed scale of assets when importing them

* Fixed bug of adding assets automatically, but semantic segmentation to be fixed

* small fix + hiding movemeshes call until its stable

* Meshes are moved to semantic segmentation folders

* Retagging semantic segmentation

* Redefined tags, refactor and added comments

* Updated Changelog

* created a move assets commandlet

* Removing RoadRunnerFiles folder

* readded flag of only prepare maps in import script

* Removing ContentBrowser module

* Added Import folder

* updated readme

* Apply zero rotation

* updated doc link

* updated readme

* refactoring

* Adding more comments and refactoring

* Removed unnecesary include header files

* Remove unnecessary includes in source files
2019-09-17 14:57:22 +02:00
nsubiron e2c4dc1312 Increase version 2019-07-12 19:39:27 +02:00
nsubiron 1fb8c65b35 Add build config as argument to the package command 2019-07-12 19:03:04 +02:00
nsubiron c9af8a71b8 Update content link 2019-07-11 11:42:38 +02:00
Manish 0ce908dbf2 fix pylint 2019-07-10 01:35:47 +02:00
nsubiron 73ad9b5fd2 Update content link 2019-07-10 01:35:47 +02:00
nsubiron fb5ccf3f4e Update "make deploy" to new import/export system 2019-07-10 01:35:47 +02:00
nsubiron 2b04e1c217 Improve "make deploy" dry run 2019-07-10 01:35:47 +02:00
Marc Garcia Puig 78b16319a1 Correctly copying xodr and package.json 2019-07-10 01:35:47 +02:00
Manish edc27f7add Modified pipeline, now make import prepares maps for cooking 2019-07-10 01:35:47 +02:00
Manish 621120ad80 Changing pipeline and changin make package for town06 and town07 2019-07-10 01:35:47 +02:00
Marc Garcia Puig 7ba7587c78 Few fixes 2019-07-10 01:35:47 +02:00
Marc Garcia Puig 070aae5a9c Re-added dockerfiles 2019-07-10 01:35:47 +02:00
Marc Garcia Puig 0afdfbbeea Correctly preparing assets for cooking on package 2019-07-10 01:35:47 +02:00
Manish db88de61c6 Updating documentation and refactoring 2019-07-10 01:35:47 +02:00
Manish 91d815e115 Updated doc and renamed commandlet 2019-07-10 01:35:47 +02:00
Manish c036bc75d9 Fixed bugs
- All actors from all maps where spawned in each map
- World was completely dark when playing imported map
2019-07-10 01:35:47 +02:00
Manish 6f22259c29 deleting useless files 2019-07-10 01:35:47 +02:00
Marc Garcia Puig bcffa78f9d OpenDRIVE files correctly copied to package 2019-07-10 01:35:47 +02:00
Manish b7c670f638 Solved importing for more that 1 package and avoid propmap creation if no props found 2019-07-10 01:35:47 +02:00
Marc Garcia Puig 85c8fd88d4 Disabling rendering in commandlet 2019-07-10 01:35:47 +02:00
Manish b988b597ee Check if xodr file exists + refactor 2019-07-10 01:35:47 +02:00
Marc Garcia Puig d4a419b2b1 Remove unnecessary files before packaging 2019-07-10 01:35:47 +02:00
Marc Garcia Puig 987a257800 Now 'make package' works with standalone packages 2019-07-10 01:35:47 +02:00
nsubiron 07a2083078 Upgrade Package.sh to be able to create content packages too 2019-07-10 01:35:47 +02:00
Marc Garcia Puig b3537a5df1 Ignoring OpenDrive in 'PropsMap' & fixed MapPaths 2019-07-10 01:35:47 +02:00
Marc Garcia Puig 7f2ad73d02 Correctly moving OpenDrive files 2019-07-10 01:35:47 +02:00
Manish 60a45199ea Now we can import multiple maps and props! :D 2019-07-10 01:35:47 +02:00
Manish b96ea36d6f Import maps working, simplified commandlet code and process 2019-07-10 01:35:47 +02:00
Marc Garcia Puig fd5a793814 Added XODR automatic copying in asset import 2019-07-10 01:35:47 +02:00
Manish 8a2a86bb32 Working on new commandlet that unifies importing of props and maps 2019-07-10 01:35:47 +02:00
Manish 808e2c2e12 Working on making import assets and maps in only one script 2019-07-10 01:35:47 +02:00
Marc Garcia Puig da4e9ec152 Big improvement in Carla Docker build time 2019-07-10 01:35:47 +02:00
Marc Garcia Puig daa82986cc Compiling Carla in a Docker 2019-07-10 01:35:47 +02:00
Xavi e52bdaeea3 Update ContentVersions.txt (#1867) 2019-07-09 22:12:01 +02:00
Marc Garcia Puig 1d46aadcd2 Make option for API Docs + added class Docs in MD 2019-07-09 19:18:46 +02:00
nsubiron cfc6ee6fa1 Package the project in shipping mode 2019-07-09 18:46:09 +02:00
nsubiron 1f0ca9dec5 Upgrade rpclib to fix race condition 2019-07-08 18:42:45 +02:00
bernatx 593d5d615b Fix Linux build removing the need of installing SL2 for Recast 2019-07-08 18:42:45 +02:00
bernatx 0be4b79c10 Fix windows build 2019-07-08 18:42:45 +02:00
bernatx 3521fe42c3 Moving recast headers out of project 2019-07-08 18:42:45 +02:00
bernatx 8e4f7a7248 More fixing for windows 2019-07-08 18:42:45 +02:00
bernat 036baa1488 Fixing Recast library for Windows 2019-07-08 18:42:45 +02:00
bernatx 8b92cc95b5 Added Recast&Detour to Carla project 2019-07-08 18:42:45 +02:00
nsubiron a856c1d44e Add server-side dummy WalkerAIController and its factory 2019-07-08 18:42:45 +02:00
Marc Garcia Puig f8d306b556 Compiling Carla in Docker (#1841)
* Compiling Carla in a Docker

* Big improvement in Carla Docker build time

* Fixed Docker dependencies & added docker_importer

* Fixed Docker package exporting pipeline

* Fixed docs issues

* Fixed few issues from revision

* Merge branch 'master' into marcgpuig/docker
2019-07-08 07:43:45 -07:00
Xavi 27d6829995 Update ContentVersions.txt 2019-07-03 13:05:10 +02:00
Xavi 6e14e4b13b Update ContentVersions.txt 2019-07-03 13:05:10 +02:00
nsubiron 53bf72712b Fix Docker pushing without tag 2019-06-26 08:53:53 +02:00
nsubiron 9694ba482d Update content link 2019-06-21 18:36:08 +02:00
nsubiron 9802c366a3 Update XODR test files 2019-06-19 14:34:26 +02:00
nsubiron 31834188b5 Deploy docker image of nightly build automatically 2019-06-18 19:03:40 +02:00
Néstor Subirón 5d71e556f4
New weather defaults (#1753)
* Add default weather preset
* Update content link
2019-06-17 18:07:32 +02:00
Daniel Novillo 978019be32 Fix prop loading on packaged builds (#1717) 2019-06-11 17:07:45 +02:00
Aidan Clear 0faffe2a38 Set Vulkan as default graphics API for Linux (#1639) 2019-06-04 18:48:11 +02:00
nsubiron 29483c4918 Upgrade uncrustify 2019-06-04 16:56:21 +02:00
manishthani 0f96b05715 Update content link and Windows fixes (#1698)
* Updated Content link
* Fixes windows compilation
* Prepend static keyword for friction trigger in bp library
2019-06-03 16:26:43 +02:00
Néstor Subirón fee126dfa7
Include debug info in packaged version (#1659) 2019-05-24 17:24:12 +02:00
nsubiron a063c2ded7 Update content link to allow importing external props 2019-05-23 20:01:15 +02:00
manishthani 4dbb94763b
Merge branch 'master' into manishthani/load_props_definition 2019-05-23 11:02:19 +02:00
Daniel da597f92c9 Fixed code conventions, static methods and format 2019-05-23 10:39:24 +02:00
Manish d26eee9f80 Tempmap is deleted after importing assets 2019-05-22 10:57:10 +02:00
nsubiron 67cfd574af Deploy maps too 2019-05-16 14:54:29 +02:00
manishthani 4a41672e85
Merge branch 'master' into manishthani/load_props_definition 2019-05-14 16:37:28 +02:00
nsubiron ab7a16687a Update content link 2019-05-08 18:50:29 +02:00
Daniel 0dde4e91d4 Updated log. Fixed map not being removed 2019-05-08 12:22:08 +02:00
nsubiron 661bc87a0c Update content link 2019-05-08 10:36:14 +02:00
Manish ca7299e504 Removing prints 2019-05-06 10:54:38 +02:00
manishthani bfec4390a0
Merge branch 'master' into manishthani/load_props_definition 2019-05-03 18:40:31 +02:00
Manish 2950e8aca4 Changed registry file format + made importing more automatic 2019-05-03 16:15:06 +02:00
nsubiron e6bd4ac70f Upgrade to GTest 1.8.1 2019-05-03 12:53:43 +02:00
nsubiron 32d9715ef8 Upgrade to Unreal Engine 4.22 and clang 7 2019-05-03 12:53:43 +02:00
Marc Garcia Puig e52f6c7853 Deleted Protobuf Windows installer script 2019-05-03 11:31:19 +02:00
nsubiron 5fa06e0de0 Replace game mode 2019-05-03 11:31:19 +02:00
nsubiron 294f95926e Remove ImageConverter 2019-05-03 11:31:19 +02:00
nsubiron 474205b4aa Remove old CarlaServer 2019-05-03 11:31:19 +02:00
nsubiron b6549adda8 Automate nightly build deployment 2019-05-03 10:13:10 +02:00
Manish 644e30c0f0 changed emptymap & tempmap paths + tempmap removed after exporting + minor changes 2019-05-02 15:42:32 +02:00