Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BasisImageConverter #65

Merged
merged 4 commits into from Oct 10, 2019
Merged

BasisImageConverter #65

merged 4 commits into from Oct 10, 2019

Conversation

@Squareys
Copy link
Contributor

Squareys commented Aug 29, 2019

BasisImporter >BasisImageConverter< AnyImageImporter/Converter

Hey @mosra !

Here's step 2 of Basis support, based on the basis-importer branch, so will need to rebase once #62 is merged :)

TODOs:

  • Fix SEGFAULT on fileData return of doExportData
  • Test
    • RGB
    • RGBA
    • Invalid/Failure
  • Additional config options?
  • [ ] API for config options?
  • Enable on CI
    • Travis
    • AppVeyor
    • CI Green
  • Disable on all packages
  • Documentation
    • License
    • Configuration
    • Add everywhere
@Squareys Squareys mentioned this pull request Aug 30, 2019
2 of 2 tasks complete
@Squareys Squareys force-pushed the Squareys:basis-converter branch from 11e3a5c to 9247d38 Aug 30, 2019
@mosra mosra mentioned this pull request Aug 30, 2019
20 of 20 tasks complete
@Squareys Squareys force-pushed the Squareys:basis-converter branch from 9247d38 to 6fd3a05 Aug 31, 2019
@codecov-io

This comment has been minimized.

Copy link

codecov-io commented Aug 31, 2019

Codecov Report

Merging #65 into master will decrease coverage by 0.37%.
The diff coverage is 92.56%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master      #65      +/-   ##
==========================================
- Coverage   90.99%   90.62%   -0.38%     
==========================================
  Files          51       53       +2     
  Lines        4377     4201     -176     
==========================================
- Hits         3983     3807     -176     
  Misses        394      394
Impacted Files Coverage Δ
...mPlugins/BasisImageConverter/BasisImageConverter.h 100% <100%> (ø)
...lugins/BasisImageConverter/BasisImageConverter.cpp 92.5% <92.5%> (ø)
...rc/MagnumPlugins/AssimpImporter/AssimpImporter.cpp 83.33% <0%> (-3.17%) ⬇️
...agnumPlugins/TinyGltfImporter/TinyGltfImporter.cpp 92.43% <0%> (-0.47%) ⬇️
src/Magnum/OpenDdl/Document.h 88.57% <0%> (-0.32%) ⬇️
...mPlugins/JpegImageConverter/JpegImageConverter.cpp 96.1% <0%> (-0.15%) ⬇️
src/Magnum/OpenDdl/OpenDdl.cpp 90.64% <0%> (-0.12%) ⬇️
src/MagnumPlugins/FreeTypeFont/FreeTypeFont.cpp 98.73% <0%> (-0.07%) ⬇️
src/MagnumPlugins/OpenGexImporter/openGexSpec.hpp 100% <0%> (ø) ⬆️
... and 18 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 66f7357...0f181d8. Read the comment docs.

@Squareys Squareys force-pushed the Squareys:basis-converter branch 14 times, most recently from 6d3ff09 to 7f7938f Aug 31, 2019
@Squareys Squareys changed the title [WIP] BasisImageConverter BasisImageConverter Sep 1, 2019
@Squareys Squareys force-pushed the Squareys:basis-converter branch from 7f7938f to d79157b Sep 23, 2019
@Squareys

This comment has been minimized.

Copy link
Contributor Author

Squareys commented Sep 23, 2019

Rebased onto next :)

@mosra mosra changed the base branch from master to next Sep 24, 2019
Copy link
Owner

mosra left a comment

Thank you!

@mosra mosra mentioned this pull request Sep 28, 2019
@mosra mosra force-pushed the mosra:next branch from b7335cf to 081c9bd Sep 28, 2019
@Squareys Squareys force-pushed the Squareys:basis-converter branch from 4284f45 to d5c0702 Sep 29, 2019
@mosra mosra force-pushed the mosra:next branch 2 times, most recently from 6a3de47 to 987be5d Sep 30, 2019
@Squareys Squareys force-pushed the Squareys:basis-converter branch from d5c0702 to 337f841 Sep 30, 2019
@mosra mosra changed the base branch from next to master Sep 30, 2019
@Squareys Squareys force-pushed the Squareys:basis-converter branch from 337f841 to 930fd27 Sep 30, 2019
@mosra mosra added this to the 2019.0b milestone Oct 1, 2019
@mosra mosra added this to TODO in Asset management via automation Oct 1, 2019
CORRADE_VERIFY(compressedData);

if(_importerManager.loadState("BasisImporterRGBA8") == PluginManager::LoadState::NotFound)
CORRADE_SKIP("BasisImporterRGBA8 plugin not found, cannot test");

This comment has been minimized.

Copy link
@mosra

mosra Oct 1, 2019

Owner

Just check for BasisImporter alone, this error message may be confusing for people who don't know the aliases. Same below.

This comment has been minimized.

Copy link
@Squareys

Squareys Oct 3, 2019

Author Contributor

But I guess I would check for BasisImporterRGBA8, but just change the error message, right?

This comment has been minimized.

Copy link
@mosra

mosra Oct 3, 2019

Owner

If there's BasisImporter and it doesn't provide a BasisImporterRGBA8 alias, then there's something very off and it should blow up (while this would lead to just SKIP) ... so pick the loudest alternative :D

But this is a minor thing, nothing critical.

This comment has been minimized.

Copy link
@Squareys

Squareys Oct 3, 2019

Author Contributor

Well, not necessarily, could just be compiled out or an older version 🤷‍♂

Not sure what your comment means in practice, shall I remove the RGBA8 prefix from both the skip message and the loadState call?

This comment has been minimized.

Copy link
@mosra

mosra Oct 3, 2019

Owner

Yes, remove both.

src/MagnumPlugins/BasisImporter/BasisImporter.cpp Outdated Show resolved Hide resolved
Squareys added 3 commits Aug 31, 2019
Signed-off-by: Squareys <squareys@googlemail.com>
Signed-off-by: Squareys <squareys@googlemail.com>
Signed-off-by: Squareys <squareys@googlemail.com>
@Squareys Squareys force-pushed the Squareys:basis-converter branch from 5fac7a2 to c4172ac Oct 3, 2019
@Squareys

This comment has been minimized.

Copy link
Contributor Author

Squareys commented Oct 3, 2019

@mosra Rebased, let's see what the CIs say!

@Squareys Squareys force-pushed the Squareys:basis-converter branch 4 times, most recently from 46db66f to d31cba5 Oct 3, 2019
Signed-off-by: Squareys <squareys@googlemail.com>
@Squareys Squareys force-pushed the Squareys:basis-converter branch from d31cba5 to 0f181d8 Oct 4, 2019
@mosra mosra merged commit 0f181d8 into mosra:master Oct 10, 2019
4 checks passed
4 checks passed
codecov/patch 92.56% of diff hit (target 90.99%)
Details
codecov/project Absolute coverage decreased by -0.37% but relative coverage increased by +1.56% compared to 66f7357
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Asset management automation moved this from TODO to Done Oct 10, 2019
@mosra

This comment has been minimized.

Copy link
Owner

mosra commented Oct 10, 2019

Merged, thank you! 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
3 participants
You can’t perform that action at this time.