Fix objects using shaders when there is a lidar in the scene (ogre2) #575
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
Signed-off-by: Ian Chen <[email protected]>
Merged
Codecov Report
@@ Coverage Diff @@
## ign-rendering6 #575 +/- ##
==================================================
- Coverage 54.36% 54.35% -0.01%
==================================================
Files 198 198
Lines 20157 20170 +13
==================================================
+ Hits 10958 10964 +6
- Misses 9199 9206 +7
Continue to review full report at Codecov.
|
ahcorde
approved these changes
Mar 4, 2022
ogre2/src/Ogre2GpuRays.cc
Outdated
| @@ -324,12 +337,24 @@ void Ogre2LaserRetroMaterialSwitcher::cameraPostRenderScene( | |||
| subItem->setDatablock(it.second); | |||
| } | |||
|
|
|||
| auto lIt = laserRetroMaterialMap.find(this); | |||
There was a problem hiding this comment.
use a variable name more descriptive
ogre2/src/Ogre2MaterialSwitcher.cc
Outdated
Comment on lines
115
to
119
| if (technique && !technique->isDepthWriteEnabled() && | ||
| !technique->isDepthCheckEnabled()) | ||
| subItem->setMaterial(this->plainOverlayMaterial); | ||
| else | ||
| subItem->setMaterial(this->plainMaterial); |
There was a problem hiding this comment.
Suggested change
| if (technique && !technique->isDepthWriteEnabled() && | |
| !technique->isDepthCheckEnabled()) | |
| subItem->setMaterial(this->plainOverlayMaterial); | |
| else | |
| subItem->setMaterial(this->plainMaterial); | |
| if (technique && !technique->isDepthWriteEnabled() && | |
| !technique->isDepthCheckEnabled()) | |
| { | |
| subItem->setMaterial(this->plainOverlayMaterial); | |
| } | |
| else | |
| { | |
| subItem->setMaterial(this->plainMaterial); | |
| } |
Signed-off-by: Ian Chen <[email protected]>
7 tasks
Merged
Merged
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.
Signed-off-by: Ian Chen [email protected]
🦟 Bug fix
Summary
The gpu ray sensor sets up generates retro values by switching materials. The probably is that it incorrectly restores shader materials causing objects using custom shaders to render incorrectly after first update.
Applied a similar fix as as #533. Updated integration test should which fail without this fix.
On way to reproduce the issue is to run this shader_param_gpu_lidar.sdf world with ign-gazebo:
Without this fix, the red sphere and waves (which use custom shaders) will appear black in the
Image Displayplugin.Checklist
codecheckpassed (See contributing)Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining
Signed-off-bymessages.