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 shininess and add tests #3231

Merged
merged 5 commits into from
Jun 29, 2022
Merged

Fix shininess and add tests #3231

merged 5 commits into from
Jun 29, 2022

Conversation

scpeters
Copy link
Member

The introduction of the Shininess feature in #3213 caused some test failures in CI that I attempted to fix in #3223, but I accidentally broke the shininess feature entirely. Here's I've added a Visual::Shininess() accessor to support testing along with tests and a fix.

  • f68de5a: add Visual::Shininess() accessor method
  • 18aa3a6: add INTEGRATION_visual_shininess test that uses the shapes_shininess demo world to verify that the /*/shininess services are working properly (already passing) and checks that Visual::Shininess() returns the expected values (not passing)
  • 61a7c9e: revert problematic portion of Fix tests related to shininess #3223 (6c4c188), moving service call back to Visual::Load
  • 8d410e1 (best viewed without whitespace): better fix for timeouts when loading PR2 by checking for existence of shininess service call before requesting it. Also prevents returning early from Visual::Load() due to shininess service errors so that other loading may occur.

scpeters added 4 commits June 16, 2022 15:39
This is useful for testing.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Confirm that shininess values are properly
added to Visuals with shapes_shininess
example world.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Reverts a portion of #3223 that broke shininess
functionality.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Check that the shininess service exists before trying
to call it. This fixes issues with loading the PR2
and related tests.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters scpeters requested a review from jennuine June 17, 2022 00:23
Copy link
Collaborator

@jennuine jennuine left a comment

Choose a reason for hiding this comment

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

LTGM, left some minor comments

gazebo/rendering/Visual.cc Outdated Show resolved Hide resolved
test/integration/visual_shininess.cc Outdated Show resolved Hide resolved
test/integration/visual_shininess.cc Outdated Show resolved Hide resolved
test/integration/visual_shininess.cc Show resolved Hide resolved
test/integration/visual_shininess.cc Outdated Show resolved Hide resolved
* Fix whitespace
* Fix copyright year
* Remove unneeded includes, add rendering.hh
* Fix console message
* Add !nullptr asserts

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters scpeters merged commit 9f41863 into gazebo11 Jun 29, 2022
@scpeters scpeters deleted the scpeters/shininess_test branch June 29, 2022 17:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants