Add alternative aliases for displacement maps during mtl parsing (#343)

Trider12 · web-flow · commit be02c9cb978b · 2022-10-06T17:25:55.000+09:00
diff --git a/tiny_obj_loader.h b/tiny_obj_loader.h
@@ -2203,15 +2203,8 @@ void LoadMtl(std::map<std::string, int> *material_map,
     }
 
     // bump texture
-    if ((0 == strncmp(token, "map_bump", 8)) && IS_SPACE(token[8])) {
-      token += 9;
-      ParseTextureNameAndOption(&(material.bump_texname),
-                                &(material.bump_texopt), token);
-      continue;
-    }
-
-    // bump texture
-    if ((0 == strncmp(token, "map_Bump", 8)) && IS_SPACE(token[8])) {
+    if ((0 == strncmp(token, "map_bump", 8)) && IS_SPACE(token[8]) || 
+        (0 == strncmp(token, "map_Bump", 8)) && IS_SPACE(token[8])) {
       token += 9;
       ParseTextureNameAndOption(&(material.bump_texname),
                                 &(material.bump_texopt), token);
@@ -2235,6 +2228,15 @@ void LoadMtl(std::map<std::string, int> *material_map,
       continue;
     }
 
+    // displacement texture
+    if ((0 == strncmp(token, "map_disp", 8)) && IS_SPACE(token[8]) ||
+        (0 == strncmp(token, "map_Disp", 8)) && IS_SPACE(token[8])) {
+      token += 9;
+      ParseTextureNameAndOption(&(material.displacement_texname),
+                                &(material.displacement_texopt), token);
+      continue;
+    }
+
     // displacement texture
     if ((0 == strncmp(token, "disp", 4)) && IS_SPACE(token[4])) {
       token += 5;
