From 53429f459e2c7094239f0abf6ca3e38dfdceb65d Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Fri, 15 Mar 2019 15:32:39 -0700
Subject: [PATCH] Remove some redundancy involving model texture URL resolution

---
 libraries/baking/src/FBXBaker.h     |  1 -
 libraries/baking/src/ModelBaker.cpp | 15 ++++++---------
 libraries/baking/src/ModelBaker.h   |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/libraries/baking/src/FBXBaker.h b/libraries/baking/src/FBXBaker.h
index 257efbe983..59ef5e349d 100644
--- a/libraries/baking/src/FBXBaker.h
+++ b/libraries/baking/src/FBXBaker.h
@@ -43,7 +43,6 @@ private:
     void replaceMeshNodeWithDraco(FBXNode& meshNode, const QByteArray& dracoMeshBytes, const std::vector<hifi::ByteArray>& dracoMaterialList);
 
     hfm::Model::Pointer _hfmModel;
-    QHash<QUrl, QString> _remappedTexturePaths;
 
     bool _pendingErrorEmission { false };
 };
diff --git a/libraries/baking/src/ModelBaker.cpp b/libraries/baking/src/ModelBaker.cpp
index 0a5341cce4..b1f6e1d51b 100644
--- a/libraries/baking/src/ModelBaker.cpp
+++ b/libraries/baking/src/ModelBaker.cpp
@@ -408,7 +408,7 @@ QString ModelBaker::compressTexture(QString modelTextureFileName, image::Texture
         if (!modelTextureFileInfo.filePath().isEmpty()) {
             textureContent = _textureContentMap.value(modelTextureFileName.toLocal8Bit());
         }
-        auto urlToTexture = getTextureURL(modelTextureFileInfo, modelTextureFileName, !textureContent.isNull());
+        auto urlToTexture = getTextureURL(modelTextureFileInfo, !textureContent.isNull());
 
         QString baseTextureFileName;
         if (_remappedTexturePaths.contains(urlToTexture)) {
@@ -559,14 +559,11 @@ void ModelBaker::handleAbortedTexture() {
     checkIfTexturesFinished();
 }
 
-QUrl ModelBaker::getTextureURL(const QFileInfo& textureFileInfo, QString relativeFileName, bool isEmbedded) {
+QUrl ModelBaker::getTextureURL(const QFileInfo& textureFileInfo, bool isEmbedded) {
     QUrl urlToTexture;
 
-    // use QFileInfo to easily split up the existing texture filename into its components
-    auto apparentRelativePath = QFileInfo(relativeFileName.replace("\\", "/"));
-
     if (isEmbedded) {
-        urlToTexture = _modelURL.toString() + "/" + apparentRelativePath.filePath();
+        urlToTexture = _modelURL.toString() + "/" + textureFileInfo.filePath();
     } else {
         if (textureFileInfo.exists() && textureFileInfo.isFile()) {
             // set the texture URL to the local texture that we have confirmed exists
@@ -576,14 +573,14 @@ QUrl ModelBaker::getTextureURL(const QFileInfo& textureFileInfo, QString relativ
 
             // this is a relative file path which will require different handling
             // depending on the location of the original model
-            if (_modelURL.isLocalFile() && apparentRelativePath.exists() && apparentRelativePath.isFile()) {
+            if (_modelURL.isLocalFile() && textureFileInfo.exists() && textureFileInfo.isFile()) {
                 // the absolute path we ran into for the texture in the model exists on this machine
                 // so use that file
-                urlToTexture = QUrl::fromLocalFile(apparentRelativePath.absoluteFilePath());
+                urlToTexture = QUrl::fromLocalFile(textureFileInfo.absoluteFilePath());
             } else {
                 // we didn't find the texture on this machine at the absolute path
                 // so assume that it is right beside the model to match the behaviour of interface
-                urlToTexture = _modelURL.resolved(apparentRelativePath.fileName());
+                urlToTexture = _modelURL.resolved(textureFileInfo.fileName());
             }
         }
     }
diff --git a/libraries/baking/src/ModelBaker.h b/libraries/baking/src/ModelBaker.h
index 17af2604a2..45b0f4c6ca 100644
--- a/libraries/baking/src/ModelBaker.h
+++ b/libraries/baking/src/ModelBaker.h
@@ -98,7 +98,7 @@ private slots:
     void handleAbortedTexture();
 
 private:
-    QUrl getTextureURL(const QFileInfo& textureFileInfo, QString relativeFileName, bool isEmbedded = false);
+    QUrl getTextureURL(const QFileInfo& textureFileInfo, bool isEmbedded = false);
     void bakeTexture(const QUrl & textureURL, image::TextureUsage::Type textureType, const QDir & outputDir, 
                      const QString & bakedFilename, const QByteArray & textureContent);
     QString texturePathRelativeToModel(QUrl modelURL, QUrl textureURL);