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

Fix finding heightmap blend textures #1055

Merged
merged 2 commits into from
Sep 27, 2021
Merged

Fix finding heightmap blend textures #1055

merged 2 commits into from
Sep 27, 2021

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Sep 25, 2021

Signed-off-by: Ian Chen [email protected]

🦟 Bug fix

When heightmap models are placed in a custom IGN_GAZEBO_RESOURCE_PATH but their textures are specified using relative paths, ign-rendering / ogre complains about these files not found. This is because they are not located in the standard ogre resource search directories so we need to use common::findFile to get their full paths.

Summary

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

@iche033 iche033 added the 🏯 fortress Ignition Fortress label Sep 25, 2021
@codecov
Copy link

codecov bot commented Sep 25, 2021

Codecov Report

Merging #1055 (e1cd402) into heightmap_pos (7e97577) will increase coverage by 0.91%.
The diff coverage is 5.71%.

❗ Current head e1cd402 differs from pull request most recent head 4c21e44. Consider uploading reports for the commit 4c21e44 to get more accurate results
Impacted file tree graph

@@                Coverage Diff                @@
##           heightmap_pos    #1055      +/-   ##
=================================================
+ Coverage          63.09%   64.01%   +0.91%     
=================================================
  Files                257      255       -2     
  Lines              20331    19917     -414     
=================================================
- Hits               12828    12750      -78     
+ Misses              7503     7167     -336     
Impacted Files Coverage Δ
...ins/entity_context_menu/EntityContextMenuPlugin.cc 41.17% <0.00%> (-4.54%) ⬇️
src/gui/plugins/select_entities/SelectEntities.cc 10.04% <0.00%> (-4.42%) ⬇️
src/gui/plugins/spawn/Spawn.cc 10.25% <0.00%> (-0.90%) ⬇️
.../gui/plugins/transform_control/TransformControl.cc 6.97% <0.00%> (+1.50%) ⬆️
...lization_capabilities/VisualizationCapabilities.cc 7.96% <0.00%> (ø)
src/rendering/SceneManager.cc 28.74% <0.00%> (ø)
src/ServerConfig.cc 90.33% <100.00%> (ø)
src/gui/Gui.cc 64.34% <100.00%> (ø)
... and 5 more

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 7e97577...4c21e44. Read the comment docs.

@chapulina chapulina added beta Targeting beta release of upcoming collection bug Something isn't working labels Sep 27, 2021
Base automatically changed from heightmap_pos to main September 27, 2021 16:40
@chapulina chapulina merged commit 57f672d into main Sep 27, 2021
@chapulina chapulina deleted the heightmap_tex_path branch September 27, 2021 16:41
WilliamLewww pushed a commit to WilliamLewww/ign-gazebo that referenced this pull request Dec 7, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta Targeting beta release of upcoming collection bug Something isn't working 🏯 fortress Ignition Fortress
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants