Lens flare cleanup and colorization #2927
Conversation
…hods to expose scale and color to derived plugins.
| float f0 = 1.0/(length(uv-pos)*16.0/scale+1.0); | ||
|
|
||
| f0 = f0+f0*(sin((ang+time/18.0 + noise(abs(ang)+n/2.0)*2.0)*12.0)*.1+dist*.1+.8); | ||
| float f0 = 2.0/(length(uv-pos)*16.0/scale+1.0); |
There was a problem hiding this comment.
Changed 1.0 to 2.0 here. After removing the legacy animated effect (which was causing ugly visual artifacts) and cc() (which had almost no effect on color), I boosted this number to restore the LensFlare's original appearance.
In my opinion, we should not do this because it makes the LensFlare look washed out and maintains a very big hotspot over the light source. Those features would never have been there if the broken animated effect had never been included.
There was a problem hiding this comment.
so do you recommend 1.0 or 2.0 here?
There was a problem hiding this comment.
I prefer 1.0 because the legacy animation effect made the whole lens flare look overdone. I think a more realistic lens flare effect would have excluded it. The only reason to keep 2.0 is so that appearance does not change significantly.
|
|
||
| texture_unit RT | ||
| { | ||
| tex_coord_set 0 | ||
| tex_address_mode border | ||
| filtering linear linear linear | ||
| } | ||
| texture_unit noiseRGBA | ||
| { | ||
| texture noise_rgba.png |
There was a problem hiding this comment.
we can remove this png file as I don't think it's used else where:
https://github.com/osrf/gazebo/blob/9fba67cafb9838752c29f7a91a12c5e18e9f3dd7/media/materials/textures/noise_rgba.png
gazebo/rendering/LensFlare.cc
Outdated
| @@ -71,6 +70,13 @@ namespace gazebo | |||
| this->scale = _scale; | |||
| } | |||
|
|
|||
| /// \brief Set the color of lens flare. | |||
| /// \param[in] _color Color of lens flare | |||
| public: void SetColor(const ignition::math::Vector3d _color) | |||
There was a problem hiding this comment.
pass by const ref here as well. For consistency with gazebo coding style, can you put & next to variable name, i.e. &_color?
| @@ -3,7 +3,7 @@ compositor CameraLensFlare/Default | |||
| technique | |||
| { | |||
| // Temporary textures | |||
| texture rt0 target_width target_height PF_A8R8G8B8 | |||
| texture rt0 target_width target_height PF_FLOAT32_RGB | |||
There was a problem hiding this comment.
Both issues would benefit from an sdf param because most cases can work with a smaller, integer texture. Always using a FLOAT32 texture should work for every case but often waste graphics memory.
There was a problem hiding this comment.
I'm working on a custom SDFormat parameter in scpeters@8e88380, just need to finish writing the test
There was a problem hiding this comment.
I'm ready to approve all parts of this pull request except for this line. Can we revert it and come back to it later, perhaps in the context of #2928?
There was a problem hiding this comment.
Agreed. Reverted to PF_A8R8G8B8
…is means there will be no compensation for the removal of the legacy animation effect and the lens flares will look less intense.
This reverts commit 1238d34.
plugins/LensFlareSensorPlugin.hh
Outdated
| /// <scale> Scale of lens flare. Must be greater than 0 | ||
| /// <scale> Scale of lens flare. Must be greater than 0 | ||
| /// <color> Color of lens flare. | ||
| /// \todo A potentially useful feature would be an option for contantly |
* 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.
|
cherry-picking forward to gazebo11 in #2954 |
* 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.
* 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.
No description provided.