Generate a more unique texture name for glb embedded textures #606
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 <ichen@openrobotics.org>
Signed-off-by: Ian Chen <ichen@openrobotics.org>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## gz-common5 #606 +/- ##
==============================================
- Coverage 83.65% 80.51% -3.15%
==============================================
Files 90 93 +3
Lines 10273 13594 +3321
==============================================
+ Hits 8594 10945 +2351
- Misses 1679 2649 +970 ☔ View full report in Codecov by Sentry. |
ahcorde
requested changes
May 8, 2024
| unsigned _matIdx, | ||
| const std::string& _path) const; | ||
| const std::string &_path, | ||
| const std::string &_fileBaseName) const; |
There was a problem hiding this comment.
This is breaking API in gz-common5, you should target main, isn't it ?
There was a problem hiding this comment.
this function is in the private AssimpLoader::Implementation class and not exposed in header. So should be fine?
ahcorde
requested changes
May 8, 2024
| _filename.size()); | ||
| auto fileBaseName = common::basename(_filename); | ||
| std::string extension; | ||
| std::size_t extIdx = _filename.rfind("."); |
There was a problem hiding this comment.
include <cstddef> and <string>
Signed-off-by: Ian Chen <ichen@openrobotics.org>
ahcorde
approved these changes
May 8, 2024
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
For glb meshes, our assimp loader generates a unique texture name for each embedded texture by prepending the 'scene' or 'root node' name of the glb mesh. However, the generated name may not always be unique. It's possible that different glb files have the same scene and root name. This PR adds the file base name of the mesh to the generated texture name string to make it more unique.
I think this change is similar to the intention in #565 where it's also trying to make texture names unique.
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.