Browse Source

sceneconverter: adapt the test to (upcoming) UfbxImporter changes.

pull/601/head
Vladimír Vondruš 3 years ago
parent
commit
3c51914bdf
  1. 14
      src/Magnum/SceneTools/Test/SceneConverterTest.cpp

14
src/Magnum/SceneTools/Test/SceneConverterTest.cpp

@ -678,10 +678,9 @@ const struct {
/* The file should contain also material names and everything */ /* The file should contain also material names and everything */
"materials-pbr.gltf", nullptr, "materials-pbr.gltf", nullptr,
"MaterialTools::phongToPbrMetallicRoughness(): unconvertable Trade::MaterialAttribute::AmbientColor attribute, skipping\n" "MaterialTools::phongToPbrMetallicRoughness(): unconvertable Trade::MaterialAttribute::AmbientColor attribute, skipping\n"
/** @todo remove this once StridedBitArray exists and SceneData + /** @todo remove this once GltfSceneConverter supports bit fields */
UfbxImporter uses it for bit values */ "Trade::GltfSceneConverter::add(): custom scene field Visibility has unsupported type Trade::SceneFieldType::Bit, skipping\n"
"Trade::GltfSceneConverter::add(): custom scene field Visibility has unsupported type Trade::SceneFieldType::UnsignedByte, skipping\n" "Trade::GltfSceneConverter::add(): custom scene field GeometryTransformHelper has unsupported type Trade::SceneFieldType::Bit, skipping\n"},
"Trade::GltfSceneConverter::add(): custom scene field GeometryTransformHelper has unsupported type Trade::SceneFieldType::UnsignedByte, skipping\n"},
{"Phong to PBR, verbose", {InPlaceInit, { {"Phong to PBR, verbose", {InPlaceInit, {
/* Same as above, just with -v added */ /* Same as above, just with -v added */
"-I", "UfbxImporter", "-C", "GltfSceneConverter", "--phong-to-pbr", "-I", "UfbxImporter", "-C", "GltfSceneConverter", "--phong-to-pbr",
@ -702,10 +701,9 @@ const struct {
"Trade::AbstractSceneConverter::addImporterContents(): adding mesh 0 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 mesh 1 out of 2\n"
"Trade::AbstractSceneConverter::addImporterContents(): adding scene 0 out of 1\n" "Trade::AbstractSceneConverter::addImporterContents(): adding scene 0 out of 1\n"
/** @todo remove this once StridedBitArray exists and SceneData + /** @todo remove this once GltfSceneConverter supports bit fields */
UfbxImporter uses it for bit values */ "Trade::GltfSceneConverter::add(): custom scene field Visibility has unsupported type Trade::SceneFieldType::Bit, skipping\n"
"Trade::GltfSceneConverter::add(): custom scene field Visibility has unsupported type Trade::SceneFieldType::UnsignedByte, skipping\n" "Trade::GltfSceneConverter::add(): custom scene field GeometryTransformHelper has unsupported type Trade::SceneFieldType::Bit, skipping\n"},
"Trade::GltfSceneConverter::add(): custom scene field GeometryTransformHelper has unsupported type Trade::SceneFieldType::UnsignedByte, skipping\n"},
{"data unsupported by the converter", {InPlaceInit, { {"data unsupported by the converter", {InPlaceInit, {
"-I", "GltfImporter", "-i", "experimentalKhrTextureKtx", "-I", "GltfImporter", "-i", "experimentalKhrTextureKtx",
"-C", "StanfordSceneConverter", "-C", "StanfordSceneConverter",

Loading…
Cancel
Save