Browse Source

sceneconverter: adapt test to GltfSceneConverter changes.

pull/620/head
Vladimír Vondruš 3 years ago
parent
commit
05f42fb446
  1. 10
      src/Magnum/SceneTools/Test/SceneConverterTest.cpp
  2. 8
      src/Magnum/SceneTools/Test/SceneConverterTestFiles/materials-pbr.gltf

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

@ -733,10 +733,7 @@ const struct {
"UfbxImporter", "PngImporter", "GltfSceneConverter", {"PngImageConverter", nullptr}, nullptr, "UfbxImporter", "PngImporter", "GltfSceneConverter", {"PngImageConverter", nullptr}, nullptr,
/* 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 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"},
{"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",
@ -756,10 +753,7 @@ const struct {
"Trade::AbstractSceneConverter::addImporterContents(): adding texture 1 out of 2\n" "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 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 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"},
{"data unsupported by the converter", {InPlaceInit, { {"data unsupported by the converter", {InPlaceInit, {
"-I", "GltfImporter", "-i", "experimentalKhrTextureKtx", "-I", "GltfImporter", "-i", "experimentalKhrTextureKtx",
"-C", "StanfordSceneConverter", "-C", "StanfordSceneConverter",

8
src/Magnum/SceneTools/Test/SceneConverterTestFiles/materials-pbr.gltf

@ -106,10 +106,18 @@
"nodes": [ "nodes": [
{ {
"mesh": 0, "mesh": 0,
"extras": {
"visibility": true,
"geometryTransformHelper": false
},
"name": "First" "name": "First"
}, },
{ {
"mesh": 1, "mesh": 1,
"extras": {
"visibility": true,
"geometryTransformHelper": false
},
"name": "Second" "name": "Second"
} }
], ],

Loading…
Cancel
Save