LensFlare: initialize OGRE compositors during plugin initialization #2764
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Initialize OGRE compositors in SetCamera() instead of Update() so the compositor order can be better controlled. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
iche033
approved these changes
Jun 25, 2020
gazebo/rendering/LensFlare.cc
Outdated
| @@ -97,6 +97,12 @@ namespace gazebo | |||
| Ogre::Vector3(static_cast<double>(this->camera->ViewportWidth()), | |||
| static_cast<double>(this->camera->ViewportHeight()), 1.0)); | |||
|
|
|||
| if (!this->light) | |||
There was a problem hiding this comment.
I think you should be able move this check to the top of the function as we don't need to set the params anymore
gazebo/rendering/LensFlare.cc
Outdated
| this->dataPtr->lensFlareInstance->addListener( | ||
| this->dataPtr->lensFlareCompositorListener.get()); | ||
| } | ||
| else | ||
| { |
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There are several
SensorPlugins that create Ogre compositors (such as LensFlareSensorPlugin). It was reported by @mogumbo that the order in which compositors are applied affects the rendered output, but theLensFlareSensorPluginalways seems to be applied last, regardless of the order in which plugins are specified in an SDFormat file. @iche033 suggested moving the code for initializing agazebo::rendering::LensFlarecompositor fromLensFlare::UpdatetoLensflare::SetCamera, so that the compositor would be added during plugin initialization.The initialization code expects a pointer to a
DirectionalLight, which is not available until the first render update. It seems to work to initialize with anullptrfor theDirectionalLightsince the light ptr is being set every update. I also added logic to exitnotifyMaterialRenderearly if the light pointer isnullptr.