(Assimp|OpenGex)Importer: support file callbacks.#47
(Assimp|OpenGex)Importer: support file callbacks.#47Squareys wants to merge 3 commits intomosra:masterfrom
Conversation
235bd56 to
be6e4a9
Compare
Codecov Report
@@ Coverage Diff @@
## master #47 +/- ##
==========================================
- Coverage 88.9% 87.57% -1.33%
==========================================
Files 43 43
Lines 4226 3968 -258
==========================================
- Hits 3757 3475 -282
- Misses 469 493 +24
Continue to review full report at Codecov.
|
5379461 to
2f6a80d
Compare
1030801 to
fac2bfb
Compare
|
@Squareys for some reason all the tests fail on Travis, could you look into that, please? :) |
fac2bfb to
d80ce9e
Compare
Signed-off-by: Squareys <squareys@googlemail.com>
Signed-off-by: Squareys <squareys@googlemail.com>
d80ce9e to
71ea50a
Compare
|
|
||
| std::unordered_map<std::string, Containers::Array<char>> files; | ||
| files["not/a/path/something.ogex"] = Utility::Directory::read(Utility::Directory::join(OPENGEXIMPORTER_TEST_DIR, "texture.ogex")); | ||
| files["image.tga"] = Utility::Directory::read(Utility::Directory::join(OPENGEXIMPORTER_TEST_DIR, "image.tga")); |
There was a problem hiding this comment.
Wait... this should have been not/a/path/image.tga, because image.tga is next to something.ogex and referenced as such. The same in the Assimp importer.
Basically, it's needed to save the path even when calling openFile() with a callback, so the image callbacks get a proper path. This is not a proper path.
|
The OpenGexImporter support was merged with a few changes in 57f619b. I had to basically rewrite the AssimpImporter support in ea82966 in order to make it properly use callbacks also for nested data files. Besides that, I came across a few more or less critical issues in the AssimpImporter and fixed these as well. |
Hi @mosra !
As promised, here is support for file callbacks in OpenGexImporter. Assimp
will follow as a separate PRalso.Cheers, Jonathan