Raise a warning when encountering emissiveFactor with array length

of 4 instead of aborting the model loading Submitted upstream as syoyo/tinygltf#445
nyalldawson · Aug 24, 2023 · ed4889d · ed4889d
1 parent 95f0ace
commit ed4889d
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/external/tinygltf/tiny_gltf.h b/external/tinygltf/tiny_gltf.h
@@ -5192,15 +5192,23 @@ static bool ParsePbrMetallicRoughness(
   return true;
 }
 
-static bool ParseMaterial(Material *material, std::string *err,
+static bool ParseMaterial(Material *material, std::string *err, std::string *warn,
                           const detail::json &o,
                           bool store_original_json_for_extras_and_extensions) {
   ParseStringProperty(&material->name, err, o, "name", /* required */ false);
 
   if (ParseNumberArrayProperty(&material->emissiveFactor, err, o,
                                "emissiveFactor",
                                /* required */ false)) {
-    if (material->emissiveFactor.size() != 3) {
+    if (material->emissiveFactor.size() == 4) {
+      if (warn) {
+        (*warn) +=
+            "Array length of `emissiveFactor` parameter in "
+            "material must be 3, but got 4\n";
+      }
+      material->emissiveFactor.resize(3);
+    }
+    else if (material->emissiveFactor.size() != 3) {
       if (err) {
         (*err) +=
             "Array length of `emissiveFactor` parameter in "
@@ -6198,7 +6206,7 @@ bool TinyGLTF::LoadFromString(Model *model, std::string *err, std::string *warn,
       Material material;
       ParseStringProperty(&material.name, err, o, "name", false);
 
-      if (!ParseMaterial(&material, err, o,
+      if (!ParseMaterial(&material, err, warn, o,
                          store_original_json_for_extras_and_extensions_)) {
         return false;
       }