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 gazebo scene viewer build #289

Merged
merged 3 commits into from
Apr 5, 2021
Merged

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Mar 30, 2021

Summary

Fixes compile errors:

  • xlib and protobuf have conflicting Status definition
  • there is gazebo::msgs::Capsule msg type so commented out code for creating capsules.

Note The demo segfaults at run time. This does not happen in ign-rendering4. Ticketed #290

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

Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
@github-actions github-actions bot added the 🏢 edifice Ignition Edifice label Mar 30, 2021
@codecov
Copy link

codecov bot commented Mar 30, 2021

Codecov Report

Merging #289 (f25dc58) into main (8c21e50) will not change coverage.
The diff coverage is n/a.

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

@@           Coverage Diff           @@
##             main     #289   +/-   ##
=======================================
  Coverage   57.54%   57.54%           
=======================================
  Files         159      159           
  Lines       15590    15590           
=======================================
  Hits         8971     8971           
  Misses       6619     6619           

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 8c21e50...01b1e81. Read the comment docs.

double z = capsuleMsg.length();
_parent->SetLocalScale(x, y, z);
_parent->AddGeometry(capsule);
// \todo(anyone) needs gazebo capsule msg
Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

the errors are actually related to gazebo::msgs (we have these msgs in ignition but not in gazebo). I think we would need to add the cone and capsule msgs in gazebo: https://github.com/osrf/gazebo/tree/gazebo11/gazebo/msgs

Copy link
Contributor

Choose a reason for hiding this comment

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

I created an issue #293

@@ -1833,12 +1835,13 @@ void SubSceneManager::CreateGeometryFunctionMap()
this->geomFunctions[gazebo::msgs::Geometry::BOX] =
&SubSceneManager::ProcessBox;

// TODO(anyone): enable when cone protobuf msg created
// todo(anyone): enable when cone protobuf msg is created
Copy link
Contributor

Choose a reason for hiding this comment

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

@chapulina chapulina changed the base branch from main to ign-rendering5 April 1, 2021 20:39
@chapulina chapulina merged commit d6957d0 into ign-rendering5 Apr 5, 2021
@chapulina chapulina deleted the gazebo_scene_viewer_fix branch April 5, 2021 22:35
iche033 added a commit that referenced this pull request Apr 27, 2021
Signed-off-by: Ian Chen <[email protected]>

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏢 edifice Ignition Edifice
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants