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

Cherry-pick #2927 to gazebo11: Lens flare cleanup and colorization #2954

Merged
merged 2 commits into from
Apr 1, 2021

Conversation

scpeters
Copy link
Member

This is a cherry-pick forward of #2927 from gazebo9 to gazebo11. Use "rebase and merge".

  • Added color setting to LensFlare and LensFlareSensorPlugin.
    Added methods to expose scale and color to derived plugins.
  • Removed unused animated lens flare effect.
  • Removed noise_rgba.png, which is no longer used.
  • Changed a value in the lens flare shader back to its original 1.0.
    This means there will be no compensation for the removal of the
    legacy animation effect and the lens flares will look less intense.

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.

changes look good to me. Wait for CI to finish

@scpeters
Copy link
Member Author

I pushed a fix for the ogre_log test in a0aafa6

@scpeters
Copy link
Member Author

scpeters commented Apr 1, 2021

I pushed a fix for the ogre_log test in a0aafa6

fixed: https://build.osrfoundation.org/job/gazebo-ci-pr_any-ubuntu_auto-amd64-gpu-nvidia/575/testReport/(root)/OgreLog/

I don't see any other CI problems

mogumbo and others added 2 commits April 1, 2021 13:40
* Added color setting to LensFlare and LensFlareSensorPlugin.
Added methods to expose scale and color to derived plugins.
* Removed unused animated lens flare effect.
* Removed noise_rgba.png, which is no longer used.
* Changed a value in the lens flare shader back to its original 1.0.
This means there will be no compensation for the removal of the
legacy animation effect and the lens flares will look less intense.
* Add debugging output to ogre_log test
* ogre_log test: ignore GLX extension line

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters scpeters force-pushed the pick_lens_flare_color_11 branch from a0aafa6 to e3fa011 Compare April 1, 2021 20:41
@scpeters scpeters merged commit 8a85951 into gazebosim:gazebo11 Apr 1, 2021
@scpeters scpeters deleted the pick_lens_flare_color_11 branch April 1, 2021 20:42
scpeters added a commit to scpeters/gazebo that referenced this pull request Apr 14, 2021
* Add debugging output to ogre_log test
* ogre_log test: ignore GLX extension line

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
scpeters added a commit to scpeters/gazebo that referenced this pull request Apr 16, 2021
* Add debugging output to ogre_log test
* ogre_log test: ignore GLX extension line

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
scpeters added a commit that referenced this pull request Apr 21, 2021
* Add debugging output to ogre_log test
* ogre_log test: ignore GLX extension line

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants