From 88b034aa78ddb3be7c95190bf6bf38742609b616 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Tue, 2 Jan 2018 16:35:43 -0800
Subject: [PATCH] bump multiplier

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

diff --git a/libraries/fbx/src/FBX.h b/libraries/fbx/src/FBX.h
index 7d3328a2dd..70344512ca 100644
--- a/libraries/fbx/src/FBX.h
+++ b/libraries/fbx/src/FBX.h
@@ -178,6 +178,8 @@ public:
     float emissiveIntensity{ 1.0f };
     float ambientFactor{ 1.0f };
 
+    float bumpMultiplier{ 1.0f };
+
     QString materialID;
     QString name;
     QString shadingModel;
diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index d5eeec51d0..6127b454b8 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -302,7 +302,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")) {
+        } else if ((token == "map_Kd") || (token == "map_Ke") || (token == "map_Ks") || (token == "map_bump") || (token == "bump")) {
             const QByteArray textureLine = tokenizer.getLineAsDatum();
             QByteArray filename;
             OBJMaterialTextureOptions textureOptions;
@@ -319,8 +319,9 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
                 currentMaterial.emissiveTextureFilename = filename;
             } else if (token == "map_Ks" ) {
                 currentMaterial.specularTextureFilename = filename;
-            } else if (token == "map_bump") {
+            } else if ((token == "map_bump") || (token == "bump")) {
                 currentMaterial.bumpTextureFilename = filename;
+                currentMaterial.bumpMultiplier = textureOptions.bumpMultiplier;
             }
         }
     }
@@ -338,6 +339,8 @@ void OBJReader::parseTextureLine(const QByteArray& textureLine, QByteArray& file
             QString multiplier = parser.left(multiplierEnd);
             textureOptions.bumpMultiplier = std::stof(multiplier.toStdString());
             parser.remove(0, multiplier.length() + 1);
+        } else if (parser[0] == '-') {
+            // TO DO
         } else {
             int fileEnd = parser.indexOf(' ');
             if (fileEnd < 0) {
@@ -813,6 +816,7 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
         if (!objMaterial.bumpTextureFilename.isEmpty()) {
             fbxMaterial.normalTexture.filename = objMaterial.bumpTextureFilename;
             fbxMaterial.normalTexture.isBumpmap = true;
+            fbxMaterial.bumpMultiplier = objMaterial.bumpMultiplier;
         }
 
         modelMaterial->setEmissive(fbxMaterial.emissiveColor);
diff --git a/libraries/fbx/src/OBJReader.h b/libraries/fbx/src/OBJReader.h
index 2c1db7ccf7..ab2fd2fd78 100644
--- a/libraries/fbx/src/OBJReader.h
+++ b/libraries/fbx/src/OBJReader.h
@@ -61,9 +61,10 @@ public:
     QByteArray specularTextureFilename;
     QByteArray emissiveTextureFilename;
     QByteArray bumpTextureFilename;
+    float bumpMultiplier;
     bool used { false };
     bool userSpecifiesUV { false };
-    OBJMaterial() : shininess(0.0f), opacity(1.0f), diffuseColor(0.9f), specularColor(0.9f), emissiveColor(0.0f) {}
+    OBJMaterial() : shininess(0.0f), opacity(1.0f), diffuseColor(0.9f), specularColor(0.9f), emissiveColor(0.0f), bumpMultiplier(1.0f) {}
 };
 
 class OBJMaterialTextureOptions {