CgltfImporter: import unrecognized material extensions

src/MagnumPlugins/AssimpImporter/AssimpImporter.cpp

@@ -1617,7 +1617,8 @@ Containers::Optional<MaterialData> AssimpImporter::doMaterial(const UnsignedInt
 
                 /* +1 is null byte for the key */
                 if(valueSize + keyString.size() + 1 + sizeof(MaterialAttributeType) > sizeof(MaterialAttributeData)) {
-                    Error{} << "Trade::AssimpImporter::material(): property" << keyString << "is too large with" << valueSize << "bytes, skipping";
+                    Warning{} << "Trade::AssimpImporter::material(): property" << keyString <<
+                        "is too large with" << valueSize + keyString.size() << "bytes, skipping";
                     continue;
                 }
 

src/MagnumPlugins/AssimpImporter/Test/AssimpImporterTest.cpp

@@ -892,7 +892,7 @@ void AssimpImporterTest::animationGltfTicksPerSecondPatching() {
         CORRADE_VERIFY(Containers::StringView{out.str()}.contains(
             " ticks per second is incorrect for glTF, patching to 1000\n"));
     } else
-        CORRADE_VERIFY(out.str().empty());
+        CORRADE_COMPARE(out.str(), "");
 }
 
 void AssimpImporterTest::animationFbxTicksPerSecondPatching() {
@@ -918,7 +918,7 @@ void AssimpImporterTest::animationFbxTicksPerSecondPatching() {
         CORRADE_VERIFY(Containers::StringView{out.str()}.contains(
             " ticks per second is incorrect for FBX, patching to 1000\n"));
     } else
-        CORRADE_VERIFY(out.str().empty());
+        CORRADE_COMPARE(out.str(), "");
 }
 
 void AssimpImporterTest::animationDummyTracksRemovalEnabled() {
@@ -978,7 +978,7 @@ void AssimpImporterTest::animationDummyTracksRemovalEnabled() {
                 "Trade::AssimpImporter::animation(): ignoring dummy rotation track in animation 1, channel {}\n",
                 targets[2].channel, targets[2].channel)));
     } else
-        CORRADE_VERIFY(out.str().empty());
+        CORRADE_COMPARE(out.str(), "");
 }
 
 void AssimpImporterTest::animationDummyTracksRemovalDisabled() {
@@ -2254,7 +2254,13 @@ void AssimpImporterTest::materialRaw() {
     CORRADE_VERIFY(importer->openFile(Utility::Directory::join(ASSIMPIMPORTER_TEST_DIR, "material-raw.fbx")));
     CORRADE_COMPARE(importer->materialCount(), 2);
 
-    Containers::Optional<MaterialData> material = importer->material("Custom_Types");
+    Containers::Optional<MaterialData> material;
+    std::ostringstream out;
+    {
+        Warning redirectWarning{&out};
+        material = importer->material("Custom_Types");
+    }
+
     CORRADE_VERIFY(material);
     CORRADE_COMPARE(material->types(), MaterialType{});
     CORRADE_COMPARE(material->layerCount(), 1);
@@ -2288,22 +2294,26 @@ void AssimpImporterTest::materialRaw() {
         CORRADE_COMPARE(material->attribute<Float>(2), 0.25f);
     }
 
-    if(_assimpVersion < 500)
+    if(_assimpVersion < 500) {
         CORRADE_WARN("This version of Assimp doesn't import raw FBX material properties.");
-    else {
+
+        CORRADE_COMPARE(out.str(), "");
+    } else {
         /* Raw attributes taken directly from the FBX file, prefixed with "$raw.".
            Seems to be the only importer that supports that. */
         {
             CORRADE_COMPARE(material->attributeName(3), "$raw.SomeColor"_s);
             CORRADE_COMPARE(material->attributeType(3), MaterialAttributeType::Vector3);
             CORRADE_COMPARE(material->attribute<Vector3>(3), (Vector3{0.1f, 0.2f, 0.3f}));
         } {
-            CORRADE_EXPECT_FAIL_IF(_assimpVersion < 500,
-                "This version of Assimp doesn't import raw FBX material properties.");
             CORRADE_COMPARE(material->attributeName(4), "$raw.SomeString"_s);
             CORRADE_COMPARE(material->attributeType(4), MaterialAttributeType::String);
             CORRADE_COMPARE(material->attribute<Containers::StringView>(4), "Ministry of Finance (Turkmenistan)");
         }
+
+        CORRADE_COMPARE(out.str(),
+            "Trade::AssimpImporter::material(): property $raw.LongNameLongNameLongNameLongNameLongNameLongNameLongName is too large with 67 bytes, skipping\n"
+            "Trade::AssimpImporter::material(): property $raw.LongValue is too large with 70 bytes, skipping\n");
     }
 
     if(_assimpVersion < 410)
@@ -2735,7 +2745,7 @@ void AssimpImporterTest::meshSkinningAttributes() {
             mesh = importer->mesh(meshName);
         }
         /* No warning about glTF dropping sets of weights */
-        CORRADE_VERIFY(out.str().empty());
+        CORRADE_COMPARE(out.str(), "");
 
         CORRADE_VERIFY(mesh);
         CORRADE_VERIFY(mesh->hasAttribute(jointsAttribute));

src/MagnumPlugins/AssimpImporter/Test/material-raw.fbx

@@ -356,6 +356,8 @@ Objects:  {
 			P: "Opacity", "double", "Number", "",0.25
 			P: "SomeColor", "Vector3D", "", "",0.1,0.2,0.3
 			P: "SomeString", "KString", "", "","Ministry of Finance (Turkmenistan)"
+    		P: "LongNameLongNameLongNameLongNameLongNameLongNameLongName", "KString", "", "","Test"
+    		P: "LongValue", "KString", "", "","LongValueLongValueLongValueLongValueLongValueLongValue"
 		}
 	}
 }