10 ➡️ master #432
Closed
10 ➡️ master #432
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
The sdf::Console class logs some messages to a file in `~/.sdformat/sdformat.log` by default. This wraps the code in the constructor of the `sdf::Console` class that opens this file in an `#ifndef` and adds a cmake option `SDFORMAT_DISABLE_CONSOLE_LOGFILE` to easily disable the use of this logfile. Initial approach to gazebosim#334. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org> Co-authored-by: Nate Koenig <nate@openrobotics.org>
…im#245) Signed-off-by: Silvio Traversaro <silvio.traversaro@iit.it>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org> Co-authored-by: Steve Peters <scpeters@openrobotics.org> Signed-off-by: Steve Peters <scpeters@openrobotics.org>
This addresses a change in how whitespace is preserved/collapsed between tinyxml and tinyxml2. The change primarily impacts SDF files that have newlines, which is frequently done for aesthetics with include uris. In this case, we use an alternate constructor for TinyXML2 that will collapse whitespace by default. Note that there is a performance impact of this behavior, which causes the parsing to run essentially twice. More information on the behavior may be found here: https://leethomason.github.io/tinyxml2/ Closes gazebosim#322 Signed-off-by: Michael Carroll <michael@openrobotics.org> Co-authored-by: Steve Peters <scpeters@openrobotics.org>
…azebosim#357) SDFormat has a convention of using -1 to represent positive infinity for symmetric joint limits on velocity and effort. If users of the DOM API are not careful and cognizant of this convention, it can result in confusing bugs that are hard to track down. This PR changes the API behavior so that the API returns positive infinity instead of -1 to represent boundlessly positive values. Hopefully this might save other SDF users from long, confusing debugging sessions. A test is added with an example file with default, finite and infinite joint limit values, using both "inf" and "-1" to specify infinite values of the effort and velocity limit. Signed-off-by: Steve Peters <scpeters@openrobotics.org> Co-authored-by: Michael X. Grey <grey@openrobotics.org>
These methods were deprecated in libsdformat9, so remove them from libsdformat10. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Removed emitted error/warning when encountering a custom element & test for this Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
* add sky dom Signed-off-by: Ian Chen <ichen@osrfoundation.org> * feedback changes Signed-off-by: Ian Chen <ichen@osrfoundation.org> * move sdf element check Signed-off-by: Ian Chen <ichen@osrfoundation.org> Co-authored-by: Louise Poubel <louise@openrobotics.org>
* add double sided materail param Signed-off-by: Ian Chen <ichen@osrfoundation.org> * fix loading param Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org> Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
* update changelog Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Codecov Report
@@ Coverage Diff @@
## master #432 +/- ##
==========================================
+ Coverage 87.52% 87.74% +0.21%
==========================================
Files 62 63 +1
Lines 9542 9667 +125
==========================================
+ Hits 8352 8482 +130
+ Misses 1190 1185 -5
Continue to review full report at Codecov.
|
|
Is this cherry-pick PR still under consideration, or will it be superseded by a merge-forward similar to #445? |
I think we can replace it with a PR using a straight merge, since that will be our approach going forward |
|
I will close this and open a merge forward PR. |
Merged
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.
I'd appreciate some scrutiny on this PR since this is my first time doing a cherry-pick forward port on sdformat. My process was:
10_master_referencesdf10into10_master_referenceand fix any conflictsgit cherry -v master > cherry_list.txtand manually go through the generated text and check if those commits have been added tomaster. If so, remove them from the list.10_to_mastercat cherry_list.txt | cut -d' ' -f2 | xargs git cherry-pickand fix any conflicts10_to_masterand10_master_referenceand verify that the differences left over do not need to be ported.