Fix map display #425
Merged
Fix map display #425
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
|
It would be nice if the logging messages were made more self-explanatory: The user doesn't know what a swatch is. Maybe the message should be something like "Preparing to render a 400x400 map as 1 swatch" |
|
@rotu Makes sense, I added it using your suggestion. |
|
This PR is working great for me. Why's it taking so long to get merged in? |
jacobperron
approved these changes
Jul 29, 2019
|
I believe CI is failing because we need a rebase to get e37643f |
The test fails for the current implementation as the map is too big. This should not be the case though.
The API of loadRawData takes an Ogre ushort which is an unsigned short which is guaranteed to be 16 bit. Hence we should static_cast to a uint16_t instead of a uint8_t. This will result in the swatch being creatable for much larger textures
- Explain rationale behind maximum swatch split - Improve const correctness - Log better error if the map cannot be displayed - Move method updateDrawnUnder() to place where it can actually be executed
Martin-Idel
force-pushed
the
bugfix/map_display
branch
from
e8834d8
to
f610629
Compare
|
@jacobperron I think you're right. I did the rebase and now it builds and tests cleanly on my machine. I also took the liberty to retrigger CI (EDIT: new try by replacing
It might be worth considering this also for a backport to dashing. |
jacobperron
pushed a commit
that referenced
this pull request
Jul 30, 2019
* Improve test for large maps The test fails for the current implementation as the map is too big. This should not be the case though. * Fix swatches to store more data The API of loadRawData takes an Ogre ushort which is an unsigned short which is guaranteed to be 16 bit. Hence we should static_cast to a uint16_t instead of a uint8_t. This will result in the swatch being creatable for much larger textures * Minor refactoring of map display - Explain rationale behind maximum swatch split - Improve const correctness - Log better error if the map cannot be displayed - Move method updateDrawnUnder() to place where it can actually be executed * Improve log messages
jacobperron
added a commit
that referenced
this pull request
Jul 31, 2019
* Improve test for large maps The test fails for the current implementation as the map is too big. This should not be the case though. * Fix swatches to store more data The API of loadRawData takes an Ogre ushort which is an unsigned short which is guaranteed to be 16 bit. Hence we should static_cast to a uint16_t instead of a uint8_t. This will result in the swatch being creatable for much larger textures * Minor refactoring of map display - Explain rationale behind maximum swatch split - Improve const correctness - Log better error if the map cannot be displayed - Move method updateDrawnUnder() to place where it can actually be executed * Improve log messages
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.
Fixes #424
Fixes #401
This was a bug introduced during migration:
The Ogre API allows textures of size at most
unsigned shortnumber of bytes height or width. However, the current implementation only creates textures of at most 8 bit height or width. Since the number of swatches was capped at 8 in the original RViz and this limit has been kept, this means that maps of moderate size (e.g. 800 * 800 pixels) crashed.This PR fixes this bug by creating textures of 16 bit size.
I also improved the status quo: