Merge gz-sim7 ➡️ gz-sim8 #2411
Merged
Merge gz-sim7 ➡️ gz-sim8 #2411
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
* test script tag Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * add dark grey before creating component Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * material parser Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * linters Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * Update src/rendering/MaterialParser/MaterialParser.cc Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com> Signed-off-by: Dharini Dutia <dharinidutia@gmail.com> Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * fix configLoader, material struct and feedback Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * default color and todos Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * install/load one file, range based loop, hardcode dependent solid colors Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * fix install_dir property Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * credits, initializing cleanup Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * eof Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * reformat Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * add integration test Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * migration note Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * intends, default case, invalid color Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * optional materialValues, typo Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * feedback Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * size check Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * get color values Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * migration doc update Signed-off-by: Dharini Dutia <dharini@openrobotics.org> --------- Signed-off-by: Dharini Dutia <dharini@openrobotics.org> Signed-off-by: Dharini Dutia <dharinidutia@gmail.com> Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Edited gazebo.material file to remove multiple passes in solid colors. Refactored the parser based on Gazebo's style guide. Signed-off-by: Dharini Dutia <dharini@openrobotics.org> Signed-off-by: Dharini Dutia <dharinidutia@gmail.com> Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Signed-off-by: Dharini Dutia <dharini@openrobotics.org>
The failures are caused by a change in the DART physics engine (dartsim/dart#1774) which causes joints to recover after reaching or exceeding their position limits. It seems like the model used in this plugin starts off with joint limits violated and recovers after a few iterations. This causes a small movement of the robot. Since the test works by comparing images taken of the robot at the start of simulation and after a few iterations, the small movement causes a discrepancy in the images. The solution here is to run the whole test while simulation is paused. This also cleans up some TestFixture warnings. Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Merge ign-gazebo6 ➡️ gz-sim7
This adds the dynamics to simulate a lighter-than-air vehicle such as blimps/airships. The modelling is based on [1] and [2]. Previously we added an airship-dynamics-plugin to Gazebo-Classic for [PX4 Gazebo SITL](PX4/PX4-SITL_gazebo-classic#490) , but we suffered simulation instability similar to that of the underwater-vehicles since Gazebo-Classic could not simulate the Added Mass dynamics. This PR brings that airship-dynamics-plugin to Gazebo which supports the Added Mass dynamics. Furthermore, I have extended, the Link class to provide access to the AddedMassMatrix, to allow the lighter-than-air system to easily access this matrix. The code is somewhat based of the Hydrodynamics system. I have an STL file which I can contribute, which is an envelope from [Wind Reiter](https://www.windreiter.com/shop/sb-324-300/), and the coefficients in the integrations test is for this envelope model. ### Citations [1] Li, Y., & Nahon, M. (2007). Modeling and simulation of airship dynamics. Journal of Guidance, Control, and Dynamics, 30(6), 1691–1700. [2] Li, Y., Nahon, M., & Sharf, I. (2011). Airship dynamics modeling: A literature review. Progress in Aerospace Sciences, 47(3), 217–239. Signed-off-by: henrykotze <henry@flycloudline.com>
This adds some comments and uses structured bindings in range-based for loops to improve readability. It also adds const to unmodified variables in a loop. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
azeey
approved these changes
May 22, 2024
mjcarroll
approved these changes
May 22, 2024
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.
➡️ Forward port
Port
gz-sim7➡️gz-sim8Branch comparison: gz-sim8...gz-sim7
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)