Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flip heightmap's Y position on Ogre 2 and add sanity checks for NaN #585

Merged
merged 5 commits into from
Apr 6, 2022

Conversation

chapulina
Copy link
Contributor

@chapulina chapulina commented Mar 15, 2022

🦟 Bug fix

Summary

Added sanity checks for NaNs. Without gazebosim/gz-common#321 ign-common may let some slip in, causing both Ogres to crash.

Also flipped the Y position of the heightmap for Ogre 2. As it can be visible on the example, now Ogre 1 and 2 match, and the coordinates follow the right-hand-rule:

Ogre 1 Ogre 2
y_pos_ogre y_pos_ogre2

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸

@codecov
Copy link

codecov bot commented Mar 15, 2022

Codecov Report

Merging #585 (6a3465e) into ign-rendering6 (3b0426e) will decrease coverage by 0.00%.
The diff coverage is 37.50%.

@@                Coverage Diff                 @@
##           ign-rendering6     #585      +/-   ##
==================================================
- Coverage           54.34%   54.34%   -0.01%     
==================================================
  Files                 198      198              
  Lines               20220    20225       +5     
==================================================
+ Hits                10989    10991       +2     
- Misses               9231     9234       +3     
Impacted Files Coverage Δ
ogre2/src/Ogre2Heightmap.cc 0.00% <0.00%> (ø)
ogre/src/OgreHeightmap.cc 72.68% <75.00%> (-0.02%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3b0426e...6a3465e. Read the comment docs.

@chapulina chapulina added the MBARI-LRAUV Sponsored by MBARI-LRAUV project: https:/osrf/lrauv label Mar 16, 2022
@chapulina chapulina changed the title Various DEM tweaks Flip heightmap's Y position on Ogre 2 and add sanity checks for NaN Mar 30, 2022
@chapulina chapulina marked this pull request as ready for review March 30, 2022 04:29
@chapulina chapulina requested a review from iche033 as a code owner March 30, 2022 04:29
@chapulina chapulina changed the base branch from main to ign-rendering6 April 6, 2022 01:07
Signed-off-by: Louise Poubel <[email protected]>
@chapulina chapulina added 🏯 fortress Ignition Fortress and removed 🌱 garden Ignition Garden labels Apr 6, 2022
@chapulina
Copy link
Contributor Author

Retargeted to Fortress and added a note to the migration guide.

ogre2/src/Ogre2Heightmap.cc Outdated Show resolved Hide resolved
@chapulina chapulina requested a review from iche033 April 6, 2022 16:04
Copy link
Contributor

@iche033 iche033 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me.

@chapulina chapulina merged commit f177b30 into ign-rendering6 Apr 6, 2022
@chapulina chapulina deleted the chapulina/dem branch April 6, 2022 18:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏯 fortress Ignition Fortress MBARI-LRAUV Sponsored by MBARI-LRAUV project: https:/osrf/lrauv ogre1.x ogre2.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants