v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update utglTF2ImportExport.cpp 

Needed some change of scenery and optimized this a little bit.
pull/4742/head
Kim Kulling 2022-09-29 16:48:15 +02:00 committed by GitHub
parent 789168ba31
commit 816b8e6156
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
test/unit/utglTF2ImportExport.cpp
View File

@ -754,20 +754,17 @@ TEST_F(utglTF2ImportExport, wrongTypes) {
using tup_T = std::tuple<std::string, std::string, std::string, std::string>; using tup_T = std::tuple<std::string, std::string, std::string, std::string>;
std::vector<tup_T> wrongTypes = { std::vector<tup_T> wrongTypes = {
#ifdef __cpp_lib_constexpr_tuple #ifdef __cpp_lib_constexpr_tuple
{ "/glTF2/wrongTypes/badArray.gltf", "array", "primitives", "meshes[0]" }, #define TUPLE(x) {x}
{ "/glTF2/wrongTypes/badString.gltf", "string", "name", "scenes[0]" },
{ "/glTF2/wrongTypes/badUint.gltf", "uint", "index", "materials[0]" },
{ "/glTF2/wrongTypes/badNumber.gltf", "number", "scale", "materials[0]" },
{ "/glTF2/wrongTypes/badObject.gltf", "object", "pbrMetallicRoughness", "materials[0]" },
{ "/glTF2/wrongTypes/badExtension.gltf", "object", "KHR_texture_transform", "materials[0]" }
#else #else
tup_T( "/glTF2/wrongTypes/badArray.gltf", "array", "primitives", "meshes[0]" ), #define TUPLE(x) tup_T(x)
tup_T( "/glTF2/wrongTypes/badString.gltf", "string", "name", "scenes[0]" ),
tup_T( "/glTF2/wrongTypes/badUint.gltf", "uint", "index", "materials[0]" ),
tup_T( "/glTF2/wrongTypes/badNumber.gltf", "number", "scale", "materials[0]" ),
tup_T( "/glTF2/wrongTypes/badObject.gltf", "object", "pbrMetallicRoughness", "materials[0]" ),
tup_T( "/glTF2/wrongTypes/badExtension.gltf", "object", "KHR_texture_transform", "materials[0]" )
#endif #endif
TUPLE("/glTF2/wrongTypes/badArray.gltf", "array", "primitives", "meshes[0]"),
TUPLE("/glTF2/wrongTypes/badString.gltf", "string", "name", "scenes[0]"),
TUPLE("/glTF2/wrongTypes/badUint.gltf", "uint", "index", "materials[0]"),
TUPLE("/glTF2/wrongTypes/badNumber.gltf", "number", "scale", "materials[0]"),
TUPLE("/glTF2/wrongTypes/badObject.gltf", "object", "pbrMetallicRoughness", "materials[0]"),
TUPLE("/glTF2/wrongTypes/badExtension.gltf", "object", "KHR_texture_transform", "materials[0]")
#undef TUPLE
}; };
for (const auto& tuple : wrongTypes) for (const auto& tuple : wrongTypes)
{ {