From dee06e72f6c627da15e97dc1c67ac8873b5cab94 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Thu, 28 Dec 2017 16:08:53 -0800
Subject: [PATCH] ke is the new ka

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

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 51e7c3cafb..07d445fb3e 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -277,9 +277,9 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
             #ifdef WANT_DEBUG
             qCDebug(modelformat) << "OBJ Reader Starting new material definition " << matName;
             #endif
-            //currentMaterial.emissiveTextureFilename = "";
             currentMaterial.diffuseTextureFilename = "";
-            //currentMaterial.specularTextureFilename = "";
+            currentMaterial.emissiveTextureFilename = "";
+            currentMaterial.specularTextureFilename = "";
         } else if (token == "Ns") {
             currentMaterial.shininess = tokenizer.getFloat();
         } else if (token == "d") {
@@ -287,12 +287,16 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
         } else if (token == "Tr") {
             currentMaterial.opacity = 1.0f - tokenizer.getFloat();
         } else if (token == "Ka") {
-            currentMaterial.emissiveColor = tokenizer.getVec3();
+            #ifdef WANT_DEBUG
+            qCDebug(modelformat) << "OBJ Reader Ignoring material Ka " << tokenizer.getVec3();
+            #endif
         } else if (token == "Kd") {
             currentMaterial.diffuseColor = tokenizer.getVec3();
+        } else if (token == "Ke") {
+            currentMaterial.emissiveColor = tokenizer.getVec3();
         } else if (token == "Ks") {
             currentMaterial.specularColor = tokenizer.getVec3();
-        } else if ((token == "map_Ka") || (token == "map_Kd") || (token == "map_Ks")) {
+        } else if ((token == "map_Kd") || (token == "map_Ke") || (token == "map_Ks")) {
             QByteArray filename = QUrl(tokenizer.getLineAsDatum()).fileName().toUtf8();
             if (filename.endsWith(".tga")) {
                 #ifdef WANT_DEBUG
@@ -300,10 +304,10 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
                 #endif
                 break;
             }
-            if (token == "map_Ka") {
-                currentMaterial.emissiveTextureFilename = filename;
-            } else if (token == "map_Kd") {
+            if (token == "map_Kd") {
                 currentMaterial.diffuseTextureFilename = filename;
+            } else if (token == "map_Ke") {
+                currentMaterial.emissiveTextureFilename = filename;
             } else if( token == "map_Ks" ) {
                 currentMaterial.specularTextureFilename = filename;
             }
diff --git a/libraries/fbx/src/OBJReader.h b/libraries/fbx/src/OBJReader.h
index e25cd7c5e9..f0852c9c22 100644
--- a/libraries/fbx/src/OBJReader.h
+++ b/libraries/fbx/src/OBJReader.h
@@ -62,7 +62,7 @@ public:
     QByteArray emissiveTextureFilename;
     bool used { false };
     bool userSpecifiesUV { false };
-    OBJMaterial() : shininess(0.0f), opacity(1.0f), diffuseColor(0.9f), specularColor(0.9f), emissiveColor(0.9f) {}
+    OBJMaterial() : shininess(0.0f), opacity(1.0f), diffuseColor(0.9f), specularColor(0.9f), emissiveColor(0.0f) {}
 };
 
 class OBJReader: public QObject { // QObject so we can make network requests.