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

LensFlare - allow inheritance #2965

Merged
merged 4 commits into from
Apr 16, 2021

Conversation

kjeppesen1
Copy link
Contributor

Added LensFlarePrivate setter methods and moved LensFlareCompositor definition to header

@kjeppesen1
Copy link
Contributor Author

@scpeters @iche033

Copy link
Member

@scpeters scpeters left a comment

Choose a reason for hiding this comment

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

the ABI checker job failed; I'll see if I can get it running again

gazebo/rendering/LensFlare.cc Outdated Show resolved Hide resolved
gazebo/rendering/LensFlare.hh Outdated Show resolved Hide resolved
@scpeters
Copy link
Member

kbjeppes and others added 2 commits April 14, 2021 11:36
@scpeters
Copy link
Member

our jenkins builds are not properly reporting style errors (gazebo-tooling/release-tools#446), so I took the liberty of shortening some line lengths to 80 characters and cleaning up some whitespace in 48837d1

@scpeters scpeters merged commit 0c8d93b into gazebosim:gazebo9 Apr 16, 2021
scpeters added a commit to scpeters/gazebo that referenced this pull request Apr 17, 2021
* Add LensFlarePrivate setter methods and move
  LensFlareCompositorListener defintion to header

* Modified LensFlareCompositorListener members to follow PIMPL

* Reduce line length and fix whitespace

Signed-off-by: Steve Peters <scpeters@openrobotics.org>

Co-authored-by: kbjeppes <kaden.b.jeppesen@nasa.gov>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
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.

A little late. Changes look good. Just a minor comment about function name


/// \brief Set camera stored in LensFlarePrivate
/// \param[in] _camera Camera to use in sensor.
protected: void SetCameraSensor(CameraPtr _camera);
Copy link
Contributor

Choose a reason for hiding this comment

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

note that _camera can be either a camera sensor or a user camera but this name suggests that it needs to be a camera sensor.

Maybe something like SetCameraImp? We've used the the *Imp suffix in other places for internal functions.

Copy link
Member

Choose a reason for hiding this comment

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

nice catch! updating to LensFlare::SetCameraImpl in #2975

scpeters added a commit to scpeters/gazebo that referenced this pull request Apr 19, 2021
This is an adjustment to API added in gazebosim#2965, which is allowed
because the API has not yet been released.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
scpeters added a commit that referenced this pull request Apr 19, 2021
This is an adjustment to API added in #2965, which is allowed
because the API has not yet been released.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
scpeters added a commit to scpeters/gazebo that referenced this pull request Apr 19, 2021
* Add LensFlarePrivate setter methods and move
  LensFlareCompositorListener defintion to header

* Modified LensFlareCompositorListener members to follow PIMPL

* Reduce line length and fix whitespace

Signed-off-by: Steve Peters <scpeters@openrobotics.org>

Co-authored-by: kbjeppes <kaden.b.jeppesen@nasa.gov>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
scpeters added a commit to scpeters/gazebo that referenced this pull request Apr 19, 2021
This is an adjustment to API added in gazebosim#2965, which is allowed
because the API has not yet been released.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
scpeters added a commit that referenced this pull request Apr 20, 2021
* Add LensFlarePrivate setter methods and move
  LensFlareCompositorListener defintion to header

* Modified LensFlareCompositorListener members to follow PIMPL

* Reduce line length and fix whitespace

Signed-off-by: Steve Peters <scpeters@openrobotics.org>

Co-authored-by: kbjeppes <kaden.b.jeppesen@nasa.gov>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
scpeters added a commit that referenced this pull request Apr 20, 2021
This is an adjustment to API added in #2965, which is allowed
because the API has not yet been released.

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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants