Commit Graph

44 Commits

Author SHA1 Message Date
MarcelPiNacy-CVC 7b491bc104
Fix Streetmap error (+ update gitignore) (#8145) 2024-09-16 17:13:36 +02:00
Marcel Pi c00d44d2dc Multiple minor fixes related to build and docs. 2024-09-12 16:58:37 +02:00
MarcelPiNacy-CVC 9f4c8422a8
Add functions and macros to aid in documentation and general usability. (#7639)
* Introduce the macros carla_add_executable, carla_add_library, carla_add_custom_target and introduce help dialog and help file generation.

* Remove semicolon on output.

* Switch from using configure time logic to a target "carla-help".

* Remove GCC_COMPILER option.

* Check PACKAGE_CONFIGURATION for empty.

* Revert to add_library for carla-ros2-native ExternalProject.

* Add function carla_add_target_docs and document "clean".

* Minor fix (missing names).

---------

Co-authored-by: Marcel Pi <25649656+MarcelPiNacy@users.noreply.github.com>
Co-authored-by: Marcel Pi <marcelpi97@gmail.com>
2024-05-15 17:50:06 +02:00
Xavier Solé Nogués 08c06a01df
Revert "Introduce several helper macros and utilities for improved usability.…" (#7635)
This reverts commit 321082ed0b.

Co-authored-by: Marcel Pi <marcelpi97@gmail.com>
2024-05-13 11:45:53 +02:00
MarcelPiNacy-CVC 321082ed0b
Introduce several helper macros and utilities for improved usability. (#7609)
* Introduce the macros carla_add_executable, carla_add_library, carla_add_custom_target and introduce help dialog and help file generation.

* Remove semicolon on output.

* Switch from using configure time logic to a target "carla-help".

* Remove GCC_COMPILER option.

* Check PACKAGE_CONFIGURATION for empty.

---------

Co-authored-by: Marcel Pi <25649656+MarcelPiNacy@users.noreply.github.com>
Co-authored-by: Marcel Pi <marcelpi97@gmail.com>
2024-05-13 09:47:15 +02:00
Marcel Pi 131723a9d1 Update gitignore for CMakeSettings.json. 2024-03-08 19:41:59 +01:00
Marcel Pi 01852e6a6e - Update gitignore.
- Add launch and launch-only CMake custom targets.
- Temporary workaround for lack of a properly parameterized toolchain file.
- Change all references to CarlaUE4 to CarlaUnreal.
- Separate CMake Options files.
2024-03-08 20:31:22 +01:00
MarcelPiNacy d0dce22ba1 Replace references to CarlaUE4. 2024-03-04 13:33:51 +01:00
Marcel Pi b423fe06e2 Fix CMake PythonAPI build. Disable OSM2ODR and OSM World Renderer. 2024-02-20 16:34:31 +01:00
Marcel Pi b7477dab1d Add .vscode and tasks.json. 2023-12-21 12:24:23 +01:00
Marcel Pi d4d8d683be Fix sqlite build with cl. 2023-11-24 07:52:40 +01:00
Marcel Pi 154cc931f1 Merge branch 'dev' into marcel/exp/configure 2023-11-23 19:06:28 +01:00
Marcel Pi e4130f627a More progress, fix deprecations and modify CMakeLists.txt 2023-11-15 19:36:43 +01:00
Blyron 80d3471171
Digital Twins 0.2 version (#6768)
* Bitmap sent and drawn in widget texture with bugs

* Map bitmap shown on widget

* Concated meshes generated in the same lane to avoid errors during simplification

* Navigation added to widget

* Avoid Simplify to remove border vertices and try to parallel assets creation process

* Road Generation 0.1 version ready

* Removing Engine Association, Formatting CarlaTools Build dependencies

* Change container type of generated procedural mesh componetns to be supported by UPROPERTY

* Fixed indices jumping by two

* Added in separate thread junctions generation

* Started dynamic database creation

* Dynamic database creation temporally removed

* First step of merge. Coords of bottom left corner and top right corner

* Libraries added to build system

* Git ignore for osmrenderer to avoid ThirdParties directory to be tracked

* Lat and Lon coords for corners sent from server to client

* Transformed to local coords meshes' vertices' coords

* Coords format error fixed

* Saving xodr and osm files inside of OpenDrive folder

* Widget fixed

* UI design improved

* WIP Windows build system for osm-world-renderer

* Socket implementation replaced by boost asio framework in osmrenderer

* Added multithreaded simplification of meshes

* Build system adapted to wndows

* Headers fixed to avoid windows specific heraders compilation

* Remove warnings

* Added widget to import building from houdini

* Added origin latitude and longituda to OSM to OpenDRIVE conversion functions. Fixed Houdini importer widgets.

* Add Houdini plugin download to the build system

* Moved houdini blueprint. Houdini plugin now dowloads by default

* Added houdini download for windows

* OpenDriveToMap Now is a UOBject instead of widget

* Added Lane mark generation.

* Roads materials and distance field scale set to 0

* M_PI macro fixed for windows osm-renderer build system

* Added Lane Marking generation

* Fixed compilation issue related with std pair non copyable lane

* Fix bug where different lanes were concating. Fix bug where end of roadmark was creating an artifact

* Lanes Marks material assignation

* Fix compilation issue and reading from not valid memory crash

* Middle Lane mark duplication bug fixed - temp solution

* Added bumps along road

* Adding marchingcubes library and added to create junctions

* Added junctions generations using marching cube and smoothed

* Fixed linux compilation and removed couple warnings

* Using previous algorithim for two road connections

* Code cleanup

* Remove debug state

* Format Files

* Format third parties files

* Spaces removal

* Fix code format

* Added spawnning for trees

* New branch to don`t loose modifications in code

* Removing unnecesary spaces

* Set trees for designer

* Tag static mesh actor from road type

* One tile with landscape and road cut

* Changed format of For

* WidgetCreated

* Widget progress

* LevelCreator Update

* Folder for basicParameters in father map

* Father map from template

* Terrain mesh generated from noise and road mask

Road mask not applied

* Assign SubLevel by position

* Changed to static functions

* StrigUpdate

* Added missing UFUNCTIONS

* Trying to move Houdini actors to tiles

* Meshes from Houdini to Tiles

* Number of X and Y tiles exposed

* Modify to new functions

* Modifying code to create a new variable-offset and table to ingest blueprints

* Update assignTile Function

* Updating widget and cpp file to relocate meshes

* Update Widget and create local copy of OpenDriveToMap

* Added planes as landscape

* RoadImported fixed

* Simplification done in UE side

* Update Houdini pipeline

* Fixed osmrenderer compilation for windows

* Generate landscape and set materials

* Generate UVs for lane meshes. Generate Normals and Tangets for lane meshes

* Delete unnecesary files

* Widget updated

* Exposing different variables to BPs

* Update Assets

* Asset path names fixed

* Fixed height for misc objects, set default landscape

* Rotate Light boxes

* Adding OSM Importer plugin

* Fixed normals on sidewalks

* Update adding buildings plugin

* Adding missing BP

* Update

* Fix BP_Instanced

* Update OSMImporter

* Creating BP_BuildingCreator

* LevelCreator Fixed

* Update building asset creation

* If def add for osm renderer

* Building block variation and styles

* Updated values and generation for demo3

* Fix Widget

* Changed unreal FSocket for boost sockets. Fixed road position errors

* Update building creation

* Updated Building Height

* Fixing line colors

* Added Planes in missing stuff

* Update for meshes

* Update deformation, avoid creation of individual buildings and add check for deformation

* Deleted unnecesary files

* New branch to work on building generation

* Added shorts walls and roofs

* Improve triangulation of polygons using UE

* Fixing pipeline

* Disabling shadows for roads and terrain

* Updated default values for BP_Opendrivetomap

* Updated OpenDriveToMap

* Use Editor world instead of GetWorld

* Added HTTP module

* Change customfiledownloader API

* Adding debuginformation

* Using OpenDriveToMapObject

* Adding Debug stuff

* Expose Buildings names in ue4

* Remove from root when generation finished

* Adding Slopes to building generation

* Table update

* Set pivot point at centre of building and Set use of material instances

* Updating Buildings plane stuff

* Fixing walls for building generator

* Update data table

* Updated road generation

* Update DT

* Update Origin of map and set moving for large map

* Remove logs prepare blueprints for getting new info

* Update slope fix and material for slopes

* Updated Digital Twins for 12/06

* Added direct URL support

* Avoid some crashes and improve QoL

* Height fix

* Tried to expose largemap in tick

* New vegetation scatter tool

* Added Full largemap support

* Edit building levels in some type of levels

* Updated static meshes instead of procedural meshes

* Updated building generation and reduced logs

* Vegetation tool into landscape pipeline

* Demo ready for digital twins

* Automated download of plugin

* Update linux build script for UE4 Plugins

* Disable sidewalks in junctions

* Re enable sidewalksin crossing lanes

* Removed asserts added checks to avoid generation of sidewalks on road

* Optimizations for VRAM

* Move actors slowly to sub levels

* Added optimizations and support for smaller or bigger maps in tiles, modified TileSize

* Garage and shed styles

* Update generation stages

* Update garage and shed parameters

* Changed method generation to tile by tile

* Fixed memory leak and UOpenDriveToMap is a uobject now

* Fixed tile by tile generation

* Added Heightmap support to map gen

* last update

* Commandlet generation working

* Merge finished

* Update DefaultEngine.ini to rever default rhi

* Clean up HoudiniImporterWidget.cpp

* Add with editor and make editor only code

* Setup dependencies for CarlaTools plugin

* Update StreetMap plugin commit and gitignore

* Update Content version

* Update next content version

* Changed based type of OpenDrivetomap

* Remove intermediate files if need similar to BuildCarlaUE4.sh

* Update order of execution of donwload

* Try to run download plugins everytime is used

* Update packages sh avoid to delete anything

* Fixing setup in windows

* Add UE Constructor to Commandlet

* More fixes

* content version

* Update package sh and update

* Update Streetmap version

* Update dependencies

* Update StreetMap commit

* Fix typo in gitignore

* Update STMap plugin commit

* Revert latest changes in windows package script

* Update comments

---------

Co-authored-by: aollero <aollero@cvc.uab.cat>
Co-authored-by: aollero <adriollero@gmail.com>
Co-authored-by: Axel <axellopez92@outlook.com>
Co-authored-by: marionzki <mnoriegazamora@gmail.com>
Co-authored-by: bernatx <bernatx@gmail.com>
2023-10-31 11:24:22 +01:00
bernatx 827508fcea CarlaExporter tool now exports the box collider and convex collider of the object if it has one, otherwise the mesh (fixed problem with big meshes) 2023-10-19 10:37:06 +02:00
Axel1092 003e74fc91
Raycasting (#3483)
* Added raycasting and point projection capabilities to python api.

* Added documentation of new functions.

* Fixed missing .f on floats

Co-authored-by: doterop <daniel.oterop@gmail.com>
2020-10-26 11:13:35 +01:00
bernat 5ac2ba712c
Adding make commands to retrieve the Plugins (#3017)
Co-authored-by: Marc Garcia Puig <marcgpuig@gmail.com>
2020-07-17 12:36:49 +02:00
Marc Garcia Puig 09b9821fdc Fixed Import folder in gitignore 2019-12-13 15:29:38 +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 2d692dc319 Update gitignore 2019-07-10 01:35:47 +02:00
nsubiron 07b1bfa0ee Use aria2 to download Content when available 2019-03-19 18:58:41 +01:00
nsubiron 18c60fbac0 Add .idea to gitignore 2019-03-12 14:33:26 +01:00
Daniel f48ceacecb Git ignored changed 2019-03-01 15:31:21 +01:00
nsubiron 4e075ca1f1 Merge branch 'master' into com 2018-10-26 17:29:59 +02:00
nsubiron 8b858209d4 Move PythonClient inside deprecated folder 2018-10-26 17:04:59 +02:00
nsubiron 6ea34785c8 Add support for .gtest file 2018-10-21 15:12:43 +02:00
nsubiron 0b90c448bf Replace Linux build system 2018-07-04 19:08:42 +02:00
nsubiron c3b3d3322f Add travis-ci job for testing the documentation 2018-04-17 15:45:07 +02:00
Néstor Subirón 66af651711
Merge branch 'sensor-interface#200' into pointCloud 2018-02-03 14:26:19 +01:00
nsubiron ae8c6c4177 Merge branch 'master' into issue2 2018-01-23 12:35:26 +01:00
nsubiron b1589f5fdd Add repeatability test 2018-01-11 14:56:43 +01:00
nsubiron ada138c039 Some improvements to setup.py 2017-12-22 19:14:16 +01:00
nsubiron fa34e359d0 Some fixes for Python 3 2017-12-19 15:31:28 +01:00
Marc Garcia Puig cc8969b48d Added point cloud client example and some fixes 2017-12-01 16:41:18 +01:00
nsubiron cebbb4bcbe Add pb2 compiled protobuf file to git 2017-11-20 16:59:33 +01:00
nsubiron 0f28adb9f9 #32 Clean up carla_manual_control, make API more robust, add image converter 2017-11-18 17:51:05 +01:00
nsubiron 361ba17a40 Adapt Linux build system 2017-10-25 17:26:31 +02:00
nsubiron 13359f1e52 Include Unreal project and reorganise folders 2017-10-24 19:46:58 +02:00
nsubiron 25a4f0411c Add image parser to client 2017-09-19 14:42:37 +02:00
nsubiron 7d582e4b6e Set up build system 2017-07-26 18:16:30 +02:00
nsubiron a7777aff67 Fix issues when running on Linux 2017-03-10 15:13:29 +00:00
nsubiron a79a62a354 Add Doxygen support 2017-03-03 17:46:51 +00:00
nsubiron 328b1c2af0 Update .gitignore 2017-03-03 15:49:19 +00:00