Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fail gltf/gltf2 export whenever invalid / incomplete JSON is generated

Browse Source 
This can happen currently for example if NaNs are introduced in accessor bounds as rapidjson cannot write NaN/inf floats (see subsequent commit for fix there) and will halt writing to buffer at this point.  Fix here ensures that whenever anything like this happens we throw an exception so this ends up as a registered export failure case, rather than silently exporting the incomplete JSON
This commit is contained in:
Jeremy Cytryn
2020-05-06 23:41:05 -07:00
parent 578dc09810
commit aef4ecada5
4 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/models/glTF2/BoxWithInfinites-glTF-Binary/BoxWithInfinites.glb Normal file
View File

Binary file not shown.

10
test/unit/utglTF2ImportExport.cpp
View File

@@ -436,6 +436,16 @@ TEST_F(utglTF2ImportExport, error_string_preserved) {
ASSERT_NE(error.find("BoxTextured0.bin"), std::string::npos) << "Error string should contain an error about missing .bin file";
}
TEST_F(utglTF2ImportExport, export_bad_accessor_bounds) {
Assimp::Importer importer;
Assimp::Exporter exporter;
const aiScene* scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/glTF2/BoxWithInfinites-glTF-Binary/BoxWithInfinites.glb", aiProcess_ValidateDataStructure);
ASSERT_NE(scene, nullptr);
EXPECT_EQ(aiReturn_FAILURE, exporter.Export(scene, "glb2", ASSIMP_TEST_MODELS_DIR "/glTF2/BoxWithInfinites-glTF-Binary/BoxWithInfinites_out.glb"));
EXPECT_EQ(aiReturn_FAILURE, exporter.Export(scene, "gltf2", ASSIMP_TEST_MODELS_DIR "/glTF2/BoxWithInfinites-glTF-Binary/BoxWithInfinites_out.gltf"));
}
#endif // ASSIMP_BUILD_NO_EXPORT
TEST_F(utglTF2ImportExport, sceneMetadata) {