Do not overwrite reserved visibility flags in ogre2 (Fortress) #783
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
OgreNext has CompositorPassSceneDef::setVisibilityMask to prevent overwriting reserved flags. If user calls gz::Camera::SetVisibilityMask with the reserved flags set, wrong rendering could happen. Signed-off-by: Matias N. Goldberg <[email protected]>
Signed-off-by: Matias N. Goldberg <[email protected]>
darksylinc
changed the title
8 tasks
Codecov Report
@@ Coverage Diff @@
## ign-rendering6 #783 +/- ##
==================================================
- Coverage 77.85% 77.84% -0.02%
==================================================
Files 146 146
Lines 13404 13409 +5
==================================================
+ Hits 10436 10438 +2
- Misses 2968 2971 +3
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
iche033
approved these changes
Dec 12, 2022
iche033
added a commit
that referenced
this pull request
Dec 12, 2022
This is the same as PR #783 but targeting Garden, which needs additional changes (Ogre2GpuRays) that could be easily missed when merging Fortress into Garden. Signed-off-by: Matias N. Goldberg <[email protected]> Co-authored-by: Ian Chen <[email protected]>
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.
🦟 Bug fix
No particular ticket issued for this bug.
Summary
Calling
Sensor::SetVisibilityMaskin ogre2 with bits 31 or 30 set (which are reserved by OgreNext) would cause wrong rendering.PR #760 already tries to fix this issue on a localized problem: heightmap in lidar.
This is the general solution.
This PR simply uses
PassSceneDef::setVisibilityMaskinstead of directly settingPassSceneDef::mVisibilityMaskto mask out the reserved flags.Ogre2Camera::setVisibilityMaskhas been modified to warn when the reserved flags are set.Other cameras (e.g. Lidar's Ogre2GpuRays) won't warn though, since they don't derive from
Ogre2Camera. I cannot add such warning without breaking the ABI.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.