diff --git a/src/Magnum/SceneTools/Test/SceneConverterTest.cpp b/src/Magnum/SceneTools/Test/SceneConverterTest.cpp index 23f76b651..119a0e2bb 100644 --- a/src/Magnum/SceneTools/Test/SceneConverterTest.cpp +++ b/src/Magnum/SceneTools/Test/SceneConverterTest.cpp @@ -733,10 +733,7 @@ const struct { "UfbxImporter", "PngImporter", "GltfSceneConverter", {"PngImageConverter", nullptr}, nullptr, /* The file should contain also material names and everything */ "materials-pbr.gltf", nullptr, - "MaterialTools::phongToPbrMetallicRoughness(): unconvertable Trade::MaterialAttribute::AmbientColor attribute, skipping\n" - /** @todo remove this once GltfSceneConverter supports bit fields */ - "Trade::GltfSceneConverter::add(): custom scene field visibility has unsupported type Trade::SceneFieldType::Bit, skipping\n" - "Trade::GltfSceneConverter::add(): custom scene field geometryTransformHelper has unsupported type Trade::SceneFieldType::Bit, skipping\n"}, + "MaterialTools::phongToPbrMetallicRoughness(): unconvertable Trade::MaterialAttribute::AmbientColor attribute, skipping\n"}, {"Phong to PBR, verbose", {InPlaceInit, { /* Same as above, just with -v added */ "-I", "UfbxImporter", "-C", "GltfSceneConverter", "--phong-to-pbr", @@ -756,10 +753,7 @@ const struct { "Trade::AbstractSceneConverter::addImporterContents(): adding texture 1 out of 2\n" "Trade::AbstractSceneConverter::addImporterContents(): adding mesh 0 out of 2\n" "Trade::AbstractSceneConverter::addImporterContents(): adding mesh 1 out of 2\n" - "Trade::AbstractSceneConverter::addImporterContents(): adding scene 0 out of 1\n" - /** @todo remove this once GltfSceneConverter supports bit fields */ - "Trade::GltfSceneConverter::add(): custom scene field visibility has unsupported type Trade::SceneFieldType::Bit, skipping\n" - "Trade::GltfSceneConverter::add(): custom scene field geometryTransformHelper has unsupported type Trade::SceneFieldType::Bit, skipping\n"}, + "Trade::AbstractSceneConverter::addImporterContents(): adding scene 0 out of 1\n"}, {"data unsupported by the converter", {InPlaceInit, { "-I", "GltfImporter", "-i", "experimentalKhrTextureKtx", "-C", "StanfordSceneConverter", diff --git a/src/Magnum/SceneTools/Test/SceneConverterTestFiles/materials-pbr.gltf b/src/Magnum/SceneTools/Test/SceneConverterTestFiles/materials-pbr.gltf index 1bfc99080..8ce1f88c3 100644 --- a/src/Magnum/SceneTools/Test/SceneConverterTestFiles/materials-pbr.gltf +++ b/src/Magnum/SceneTools/Test/SceneConverterTestFiles/materials-pbr.gltf @@ -106,10 +106,18 @@ "nodes": [ { "mesh": 0, + "extras": { + "visibility": true, + "geometryTransformHelper": false + }, "name": "First" }, { "mesh": 1, + "extras": { + "visibility": true, + "geometryTransformHelper": false + }, "name": "Second" } ],