Support loading glb with compressed jpeg textures #545
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>
Codecov Report
@@ Coverage Diff @@
## gz-common5 #545 +/- ##
==============================================
+ Coverage 82.86% 83.65% +0.79%
==============================================
Files 75 90 +15
Lines 9558 10272 +714
==============================================
+ Hits 7920 8593 +673
- Misses 1638 1679 +41
|
ahcorde
approved these changes
Oct 18, 2023
mjcarroll
reviewed
Oct 20, 2023
graphics/src/AssimpLoader_TEST.cc
Outdated
| EXPECT_EQ(math::Color(0.4f, 0.4f, 0.4f, 1.0f), mat->Ambient()); | ||
| EXPECT_EQ(math::Color(1.0f, 1.0f, 1.0f, 1.0f), mat->Diffuse()); | ||
| EXPECT_EQ(math::Color(0.0f, 0.0f, 0.0f, 1.0f), mat->Specular()); | ||
| EXPECT_EQ(math::Color(0.0f, 0.0f, 0.0f, 1.0f), mat->Specular()); |
There was a problem hiding this comment.
This is a duplicate call.
There was a problem hiding this comment.
removed duplicate call, 76be6e6
Signed-off-by: Ian Chen <ichen@openrobotics.org>
mjcarroll
approved these changes
Oct 25, 2023
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.
🎉 New feature
Summary
Extended the AssimpLoader to support loading glb files with embedded compressed jpeg textures.
Previously if you tried to load one with jpeg texture, you would get a confusing error message about invalid texture settings but no meshes would be loaded.
To Test
Added a test to
AssimpLoader_TESTthat verifies a simple box glb mesh with jpeg can be loaded.Tested with this DamagedHelmet glb mesh:
Note: there are some discrepancies between the rendering in gz and the provided screenshot - that needs to be investigated later.
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.