From 62814deb328201ba6fe3a122514c9fbc5d61a730 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Mon, 27 Aug 2018 08:34:01 -0700
Subject: [PATCH] Added read of map_d from MTL files

---
 libraries/fbx/src/OBJReader.cpp | 31 +++++++++++++++++++++----------
 libraries/fbx/src/OBJReader.h   |  2 ++
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index caac08f777..501fb72130 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -263,15 +263,19 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
             default:
                 materials[matName] = currentMaterial;
                 #ifdef WANT_DEBUG
-                qCDebug(modelformat) << "OBJ Reader Last material illumination model:" << currentMaterial.illuminationModel <<
-                                     " shininess:" << currentMaterial.shininess << " opacity:" << currentMaterial.opacity <<
-                                     " diffuse color:" << currentMaterial.diffuseColor << " specular color:" << 
-                                     currentMaterial.specularColor << " emissive color:" << currentMaterial.emissiveColor << 
-                                     " diffuse texture:" << currentMaterial.diffuseTextureFilename << " specular texture:" <<
-                                     currentMaterial.specularTextureFilename << " emissive texture:" <<
-                                     currentMaterial.emissiveTextureFilename << " bump texture:" <<
-                                     currentMaterial.bumpTextureFilename;
-                #endif
+                qCDebug(modelformat) << 
+                                     "OBJ Reader Last material illumination model:" << currentMaterial.illuminationModel <<
+                                     " shininess:" << currentMaterial.shininess << 
+                                     " opacity:" << currentMaterial.opacity <<
+                                     " diffuse color:" << currentMaterial.diffuseColor << 
+                                     " specular color:" << currentMaterial.specularColor << 
+                                     " emissive color:" << currentMaterial.emissiveColor << 
+                                     " diffuse texture:" << currentMaterial.diffuseTextureFilename << 
+                                     " specular texture:" << currentMaterial.specularTextureFilename << 
+                                     " emissive texture:" << currentMaterial.emissiveTextureFilename << 
+                                     " bump texture:" << currentMaterial.bumpTextureFilename;
+                                     " opacity texture:" << currentMaterial.opacityTextureFilename;
+#endif
                 return;
         }
         QByteArray token = tokenizer.getDatum();
@@ -289,6 +293,8 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
             currentMaterial.emissiveTextureFilename = "";
             currentMaterial.specularTextureFilename = "";
             currentMaterial.bumpTextureFilename = "";
+            currentMaterial.opacityTextureFilename = "";
+
         } else if (token == "Ns") {
             currentMaterial.shininess = tokenizer.getFloat();
         } else if (token == "Ni") {
@@ -321,7 +327,7 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
             currentMaterial.emissiveColor = tokenizer.getVec3();
         } else if (token == "Ks") {
             currentMaterial.specularColor = tokenizer.getVec3();
-        } else if ((token == "map_Kd") || (token == "map_Ke") || (token == "map_Ks") || (token == "map_bump") || (token == "bump")) {
+        } else if ((token == "map_Kd") || (token == "map_Ke") || (token == "map_Ks") || (token == "map_bump") || (token == "bump") || (token == "map_d")) {
             const QByteArray textureLine = tokenizer.getLineAsDatum();
             QByteArray filename;
             OBJMaterialTextureOptions textureOptions;
@@ -341,6 +347,8 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
             } else if ((token == "map_bump") || (token == "bump")) {
                 currentMaterial.bumpTextureFilename = filename;
                 currentMaterial.bumpTextureOptions = textureOptions;
+            } else if (token == "map_d") {
+                currentMaterial.opacityTextureFilename = filename;
             }
         }
     }
@@ -900,6 +908,9 @@ FBXGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& m
             fbxMaterial.normalTexture.isBumpmap = true;
             fbxMaterial.bumpMultiplier = objMaterial.bumpTextureOptions.bumpMultiplier;
         }
+        if (!objMaterial.opacityTextureFilename.isEmpty()) {
+            fbxMaterial.opacityTexture.filename = objMaterial.opacityTextureFilename;
+        }
 
         modelMaterial->setEmissive(fbxMaterial.emissiveColor);
         modelMaterial->setAlbedo(fbxMaterial.diffuseColor);
diff --git a/libraries/fbx/src/OBJReader.h b/libraries/fbx/src/OBJReader.h
index 13ddc6e21c..e432a3ea51 100644
--- a/libraries/fbx/src/OBJReader.h
+++ b/libraries/fbx/src/OBJReader.h
@@ -66,6 +66,8 @@ public:
     QByteArray specularTextureFilename;
     QByteArray emissiveTextureFilename;
     QByteArray bumpTextureFilename;
+    QByteArray opacityTextureFilename;
+
     OBJMaterialTextureOptions bumpTextureOptions;
     int illuminationModel;
     bool used { false };