Merge recent development to stabilization. #538
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
michalpelka
force-pushed
the
mp/merge_stabilization
branch
from
63707ca to
086220b
Compare
adamdbrw
approved these changes
Sep 26, 2023
jhanca-robotecai
approved these changes
Sep 26, 2023
michalpelka
force-pushed
the
mp/merge_stabilization
branch
2 times, most recently
from
c521592 to
dcfeeac
Compare
Signed-off-by: Mateusz Wasilewski <[email protected]>
… Importer An `SDFAssetBuilderSettings` object is being exposed via the File Select page in the Robot Importer to allow users to alter the preserve URDF fixed joints object. Refactored the `UrdfParser::Parse` functions to support capturing the sdf::Console messages logged during URDF/SDF parsing. Signed-off-by: lumberyard-employee-dm <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
Adding missing include of unique_ptr.h to FileSelectionPage.h to fix non-unity builds. Signed-off-by: lumberyard-employee-dm <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
Signed-off-by: Artur Kamieniecki <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
- Reverted o3de#400, changing way of source asset are processed during URDF/XACRO/SDF import using temp directory - Fixed misleading warning on creating articulation links - Use of GetAssetStatus_FlushIO --------- Signed-off-by: Michał <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
Small changes to ROS2 Manipulation Template. --------- Signed-off-by: Michał Pełka <[email protected]> Co-authored-by: Adam Dąbrowski <[email protected]> Co-authored-by: Jan Hanca <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
Add sensors SDF importer hooks Signed-off-by: Jan Hanca <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
Use PrimitiveAssets Gem to visualize primitives --------- Signed-off-by: Jan Hanca <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
Created the warehouse automation gem, adjusted to review --------- Signed-off-by: Antoni Puch <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
Lidar Refactor --------- Signed-off-by: Antoni Puch <[email protected]> Signed-off-by: Antoni-Robotec <[email protected]> Co-authored-by: Adam Dąbrowski <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
* Added presentation of SDF messages --------- Signed-off-by: Michał Pełka <[email protected]> Co-authored-by: Jan Hanca <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
Signed-off-by: Paweł Budziszewski <[email protected]> Co-authored-by: Michał Pełka <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
…s. (o3de#498) Signed-off-by: Michał Pełka<[email protected]> Signed-off-by: Michał <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
* Fix in memory urdf with errors 2 and 19 * Notify user and added settings * Apply suggestions from code review Co-authored-by: Adam Dąbrowski <[email protected]> Co-authored-by: lumberyard-employee-dm <[email protected]> Co-authored-by: Mike Balfour <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
…3de#507) Signed-off-by: Michał Pełka <[email protected]>
* force add default view * changed name in bookmark * better starting position Signed-off-by: Kacper Lewandowski <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
Universal event management system for sensor components in ROS 2. --------- Signed-off-by: Paweł Liberadzki <[email protected] > Signed-off-by: Michał Pełka <[email protected]>
Signed-off-by: Kacper Lewandowski <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
…o3de#516) * Updating the Robot Importer to support importing .sdf/.world files UI references to "URDF" have been updated to mention "URDF/SDF" Added UnitTest to the SDF ParserTest validate loading SDF files using the ROS2::Utils::Parse API Signed-off-by: lumberyard-employee-dm <[email protected]> * Updated the Intro page for the RobotImporter Wizard to use "an" instead of "a" before the acryromy SDF which makes a sound of "ess" which is a vowel sound. Signed-off-by: lumberyard-employee-dm <[email protected]> * Updating the FilePath extension check functions to only call `GetCapitalizedExtension` once Signed-off-by: lumberyard-employee-dm <[email protected]> * Added a VisitModels utility function that can visit all models within an SDF Updated the GetMeshesFilename function to support gather mesh data from all models within an SDF including nested models and models from world tags Updated the URDFPrefabMaker to visit all the models with an SDF instead of only the first model found within the SDF root or the first model found within the first world tag of an SDF. Fixed the `SdfParserTest.SdfWithModelsOnRootAndWorld_ParsesSuccessfully` test and added validation of the new `ROS2::Utils::VisitModels` function Signed-off-by: lumberyard-employee-dm <[email protected]> * Updated the logic to set the prefab name for an imported URDF/SDF file The initial prefab name is set to the stem of the URDF/SDF filename. Signed-off-by: lumberyard-employee-dm <[email protected]> --------- Signed-off-by: lumberyard-employee-dm <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
…remappings (o3de#505) * First version of adding configurable prefix lookups and substitutions. Signed-off-by: Mike Balfour <[email protected]> * Update Gems/ROS2/Code/Tests/UrdfParserTest.cpp Co-authored-by: lumberyard-employee-dm <[email protected]> Signed-off-by: Mike Balfour <[email protected]> * Update Gems/ROS2/Code/Source/SdfAssetBuilder/SdfAssetBuilderSettings.h Co-authored-by: lumberyard-employee-dm <[email protected]> Signed-off-by: Mike Balfour <[email protected]> * Improved asset path resolution logic and unit tests. Signed-off-by: Mike Balfour <[email protected]> * Add SDFormat importer hooks (o3de#453) Add sensors SDF importer hooks Signed-off-by: Jan Hanca <[email protected]> * use PrimitiveAssets Gem to visualize primitives (o3de#485) Use PrimitiveAssets Gem to visualize primitives --------- Signed-off-by: Jan Hanca <[email protected]> * Warehouse automation gem (o3de#440) Created the warehouse automation gem, adjusted to review --------- Signed-off-by: Antoni Puch <[email protected]> * Lidar component refactor (o3de#463) Lidar Refactor --------- Signed-off-by: Antoni Puch <[email protected]> Signed-off-by: Antoni-Robotec <[email protected]> Co-authored-by: Adam Dąbrowski <[email protected]> * Added presentation of SDF messages (o3de#491) * Added presentation of SDF messages --------- Signed-off-by: Michał Pełka <[email protected]> Co-authored-by: Jan Hanca <[email protected]> * Fix missing include. Signed-off-by: Mike Balfour <[email protected]> * Fix resolution of file:// prefix. Signed-off-by: Mike Balfour <[email protected]> * Change string to Path. Signed-off-by: Mike Balfour <[email protected]> * Changed PathResolver to get read in wholesale from setreg file. Signed-off-by: Mike Balfour <[email protected]> * PR feedback - changed file select dir to default to last-used file. Also changes file select dir to match anything typed into the text box. Signed-off-by: Mike Balfour <[email protected]> * Update Gems/ROS2/Code/Source/RobotImporter/Utils/RobotImporterUtils.h Co-authored-by: lumberyard-employee-dm <[email protected]> Signed-off-by: Mike Balfour <[email protected]> * Update Gems/ROS2/Code/Source/RobotImporter/Utils/RobotImporterUtils.cpp Co-authored-by: lumberyard-employee-dm <[email protected]> Signed-off-by: Mike Balfour <[email protected]> * Update Gems/ROS2/Code/Source/RobotImporter/Utils/RobotImporterUtils.cpp Co-authored-by: lumberyard-employee-dm <[email protected]> Signed-off-by: Mike Balfour <[email protected]> * Update Gems/ROS2/Code/Source/RobotImporter/Utils/RobotImporterUtils.cpp Co-authored-by: lumberyard-employee-dm <[email protected]> Signed-off-by: Mike Balfour <[email protected]> * Update Gems/ROS2/Code/Source/RobotImporter/Utils/RobotImporterUtils.cpp Co-authored-by: lumberyard-employee-dm <[email protected]> Signed-off-by: Mike Balfour <[email protected]> * PR feedback Signed-off-by: Mike Balfour <[email protected]> * PR feedback Signed-off-by: Mike Balfour <[email protected]> * Partial revert from path back to string. Signed-off-by: Mike Balfour <[email protected]> * Second half of path to string revert. Signed-off-by: Mike Balfour <[email protected]> * Added all Path Resolver options to setreg for visibility. Improved SetFindCallback to use the full set of path resolution options. Signed-off-by: Mike Balfour <[email protected]> --------- Signed-off-by: Mike Balfour <[email protected]> Signed-off-by: Jan Hanca <[email protected]> Signed-off-by: Antoni Puch <[email protected]> Signed-off-by: Antoni-Robotec <[email protected]> Co-authored-by: lumberyard-employee-dm <[email protected]> Co-authored-by: Jan Hanca <[email protected]> Co-authored-by: Antoni-Robotec <[email protected]> Co-authored-by: Adam Dąbrowski <[email protected]> Co-authored-by: Michał Pełka <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
* Prevent crash if product asset can't be found. * Add "../models" to the default resolvers. This pattern seems to appear frequently enough that it's worth adding. Signed-off-by: Mike Balfour <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
…tion (o3de#520) Signed-off-by: Michał <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
Signed-off-by: Kacper Lewandowski <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
* * PAL_TRAIT_BUILD_HOST_TOOLS condition around Editor targets
* removed warnings caused by variables not used outside of logging/assert statements
* removed AWSCore from enabled gems
* fixed indent of .Editor target
* applied review: {gem_name}.Builders and .Tools in if(PAL_TRAIT_BUILD_HOST_TOOLS)
Signed-off-by: Kacper Lewandowski <[email protected]>
Signed-off-by: Michał Pełka <[email protected]>
warning when applying default inertial tag warnings about missing mass and inertia inside existing inertial not adding default value of origin, as it is optional check and warning if there is robot tag in urdf file, preventing segfault applied review: simplified code around warnings Signed-off-by: Kacper Lewandowski <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
Signed-off-by: Michał <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
* add SensorsMaker for SDFormat data * publish hooks for processing * revert output filename change * code review: cache list of sensor hooks --------- Signed-off-by: Jan Hanca <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
* clang-format; typos; obsolete variables * find and copy meshes' materials * code fixed for subdirectories * code review: add static const * code review: split GetMeshAssets method * fix line ends * fix includes * code review: rename method --------- Signed-off-by: Jan Hanca <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
Signed-off-by: Michał <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
Signed-off-by: Paweł Liberadzki <[email protected] > Signed-off-by: Michał Pełka <[email protected]>
…#534) Signed-off-by: Kacper Lewandowski <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
Signed-off-by: Mateusz Wasilewski <[email protected]>
* Messages about each kind of modification in separate sections Apply suggestions from code review * more visible descriptions of modifications * Added license; removed unused variable * moved generation of modification description to separate function * not printing headers of unused messages --------- Signed-off-by: Kacper Lewandowski <[email protected]> Co-authored-by: Jan Hanca <[email protected]> Signed-off-by: Michał Pełka <[email protected]>
michalpelka
force-pushed
the
mp/merge_stabilization
branch
from
dcfeeac to
3821f0f
Compare
pawelbudziszewski
approved these changes
Oct 2, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is development branch rebased on top of stabilization/2310 and contains commits that are relevant to this gems:
ROS2, WarehouseAutomation and robotics project templates.
PR that are introduced from development to stabilization/2310:
All PRs regard URDF/SDF importer or are bugfixes to ROS2 Gem (or project templates).