Fix selection buffer crash after resizing window #446
Merged
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
Codecov Report
@@ Coverage Diff @@
## ign-rendering6 #446 +/- ##
==================================================
+ Coverage 53.55% 55.53% +1.97%
==================================================
Files 195 195
Lines 19698 19697 -1
==================================================
+ Hits 10550 10938 +388
+ Misses 9148 8759 -389
Continue to review full report at Codecov.
|
azeey
reviewed
Oct 1, 2021
chapulina
added
beta
|
Selection doesn't seem to be working for me with this branch on Bionic 😕 |
#447 switches back to the old cpu based method. We can get that in first while we debug the issue here. |
|
I'm testing this in a focal docker container which I was able to reproduce the issue in but the issues went away with these changes so I'll need more info to help debug this.
|
|
Ah sorry I merged with diff --git a/ogre2/src/Ogre2RayQuery.cc b/ogre2/src/Ogre2RayQuery.cc
index 0ceaee80..81c63178 100644
--- a/ogre2/src/Ogre2RayQuery.cc
+++ b/ogre2/src/Ogre2RayQuery.cc
@@ -98,7 +98,7 @@ RayQueryResult Ogre2RayQuery::ClosestPoint()
// ray query using selection buffer does not seem to work on some machines
// using cpu based ray-triangle intersection method
// \todo remove this line if selection buffer is working again
- return this->ClosestPointByIntersection();
+ //return this->ClosestPointByIntersection();
#ifdef __APPLE__
return this->ClosestPointByIntersection();
I don't seem to have an offset, I've clicked all over
No
No
I don't see anything added to the Ogre log while I'm hovering / clicking the scene I added these debug statements: diff --git a/ogre2/src/Ogre2SelectionBuffer.cc b/ogre2/src/Ogre2SelectionBuffer.cc
index 0082f0ad..e76730bc 100644
--- a/ogre2/src/Ogre2SelectionBuffer.cc
+++ b/ogre2/src/Ogre2SelectionBuffer.cc
@@ -495,6 +495,7 @@ bool Ogre2SelectionBuffer::ExecuteQuery(const int _x, const int _y,
const std::string &entName =
this->dataPtr->materialSwitcher->EntityName(cv);
+ignerr << "ExecuteQuery : " << entName << std::endl;
if (entName.empty())
{
return false;
@@ -507,6 +508,7 @@ bool Ogre2SelectionBuffer::ExecuteQuery(const int _x, const int _y,
return false;
else
{
+ignerr << "ExecuteQuery" << std::endl;
_item = dynamic_cast<Ogre::Item *>(collection[0]);
_point = point;
return true;And I only see empty |
|
Here's my ogre2.log
|
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
|
I think the cause of the issue is this line in ogre2.log: I made some fixes in #450. I enabled the camera |
Signed-off-by: Ian Chen <[email protected]>
…n-rendering into fix_selection_resize
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
chapulina
approved these changes
Nov 9, 2021
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
srmainwaring
added a commit
to srmainwaring/gz-rendering
that referenced
this pull request
Dec 1, 2021
…ebosim#446 - Add new param colorTexResolution to the selection buffer shader - Implement the Metal equivalent of texelFetch in the shaders Signed-off-by: Rhys Mainwaring <[email protected]>
srmainwaring
added a commit
to srmainwaring/gz-rendering
that referenced
this pull request
Dec 1, 2021
…ebosim#446 - Add new param colorTexResolution to the selection buffer shader - Implement the Metal equivalent of texelFetch in the shaders Signed-off-by: Rhys Mainwaring <[email protected]>
7 tasks
iche033
pushed a commit
that referenced
this pull request
Dec 1, 2021
#498) - Add new param colorTexResolution to the selection buffer shader - Implement the Metal equivalent of texelFetch in the shaders Signed-off-by: Rhys Mainwaring <[email protected]>
chapulina
added a commit
that referenced
this pull request
Dec 6, 2021
* fix selection buffer crash due to resize and incorrect selections Signed-off-by: Ian Chen <[email protected]> * test updating full selection buffer texture Signed-off-by: Ian Chen <[email protected]> * reenable visual at test Signed-off-by: Ian Chen <[email protected]> * fix codecheck Signed-off-by: Ian Chen <[email protected]> * testing rgb no depth, full buffer Signed-off-by: Ian Chen <[email protected]> * use 1x1 buffer, still no depth data Signed-off-by: Ian Chen <[email protected]> * prnt scaling factor Signed-off-by: Ian Chen <[email protected]> * disable device ratio Signed-off-by: Ian Chen <[email protected]> * reenable depth and utils test Signed-off-by: Ian Chen <[email protected]> * disable utils test, add visual at test after resize Signed-off-by: Ian Chen <[email protected]> * test texelfetch Signed-off-by: Ian Chen <[email protected]> * back to full buffer Signed-off-by: Ian Chen <[email protected]> * print ogre log Signed-off-by: Ian Chen <[email protected]> * codecheck Signed-off-by: Ian Chen <[email protected]> * fixing selection buffer mat script Signed-off-by: Ian Chen <[email protected]> * try 1x1 buffer again Signed-off-by: Ian Chen <[email protected]> * revert some test changes Signed-off-by: Ian Chen <[email protected]> * uncomment tests Signed-off-by: Ian Chen <[email protected]> * update scaling factor Signed-off-by: Ian Chen <[email protected]> * fix removing selection mat Signed-off-by: Ian Chen <[email protected]> * update screenScalingFactor Signed-off-by: Ian Chen <[email protected]> * minor tweak Signed-off-by: Ian Chen <[email protected]> Co-authored-by: Louise Poubel <[email protected]>
7 tasks
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
Summary
Fix crash when resizing ign-gazebo window. The problem was due to invalid camera projection matrix after a resize.
This PR makes sure all selection buffer resources are deleted and recreated after the window size is changed.
To test
launch ign gazebo and drag the corners to resize the window. The application would crash without this fix.
Checklist
codecheckpassed (See contributing)Note to maintainers: Remember to use Squash-Merge