Merge 10 -> 11 #2923
Merged
Merge 10 -> 11 #2923
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
…ers (gazebosim#2809) Signed-off-by: Alejandro Hernández <ahcorde@gmail.com> Co-authored-by: Jose Luis Rivero <jrivero@osrfoundation.org> Co-authored-by: Louise Poubel <louise@openrobotics.org> Co-authored-by: Steve Peters <scpeters@openrobotics.org>
The heightmap_valley.png used in the heightmap tests for ODE and DART is symmetric, which obscures the fact that DART is not treating asymmetric heightmaps properly. This adds a test using worlds/heightmap.world and heightmap_bowl.png to illustrate the bug. * DARTHeightmapShape: set flipY = false This variable was uninitialized and was causing problems with asymmetric heightmaps. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
They are currently being set in DARTLink; set them in DARTCollision instead if dart 6.10 is in use. Also set the DART friction direction and enable corresponding tests, including the DirectionNaN test. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
|
CI looks ok to me, merging forward |
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.
Merge forward #2781 and #2818 from
gazebo10. The #2809 commit is listed also, but it was already merged forward in #2816, so there are no changes in the diff.