From b60d68c7149487e5d824ee9ffd0705df6401c3a5 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 7 Sep 2017 14:00:09 -0700
Subject: [PATCH] Replace FBX SDK loading of file in FBXBaker with FBXReader

---
 libraries/baking/CMakeLists.txt      |  2 +-
 libraries/baking/src/FBXBaker.cpp    | 28 +++++++++-------------------
 libraries/baking/src/FBXBaker.h      |  6 +++++-
 tools/oven/CMakeLists.txt            |  2 +-
 tools/oven/src/ui/BakeWidget.h       |  2 +-
 tools/oven/src/ui/ModelBakeWidget.h  |  2 +-
 tools/oven/src/ui/SkyboxBakeWidget.h |  2 +-
 7 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/libraries/baking/CMakeLists.txt b/libraries/baking/CMakeLists.txt
index 806220ec30..da3389c862 100644
--- a/libraries/baking/CMakeLists.txt
+++ b/libraries/baking/CMakeLists.txt
@@ -15,5 +15,5 @@ if (FBX_FOUND)
   endif (UNIX)
 endif ()
 
-link_hifi_libraries(shared model networking ktx image)
+link_hifi_libraries(shared model networking ktx image fbx)
 include_hifi_library_headers(gpu)
diff --git a/libraries/baking/src/FBXBaker.cpp b/libraries/baking/src/FBXBaker.cpp
index 81b5de7546..9a28e6a788 100644
--- a/libraries/baking/src/FBXBaker.cpp
+++ b/libraries/baking/src/FBXBaker.cpp
@@ -1,6 +1,6 @@
 //
 //  FBXBaker.cpp
-//  tools/oven/src
+//  tools/baking/src
 //
 //  Created by Stephen Birarda on 3/30/17.
 //  Copyright 2017 High Fidelity, Inc.
@@ -27,6 +27,9 @@
 
 #include <PathUtils.h>
 
+#include <FBXReader.h>
+#include <FBXWriter.h>
+
 #include "ModelBakingLoggingCategory.h"
 #include "TextureBaker.h"
 
@@ -205,29 +208,16 @@ void FBXBaker::handleFBXNetworkReply() {
 }
 
 void FBXBaker::importScene() {
-    // create an FBX SDK importer
-    FbxImporter* importer = FbxImporter::Create(_sdkManager.get(), "");
-
     qDebug() << "file path: " << _originalFBXFilePath.toLocal8Bit().data() << QDir(_originalFBXFilePath).exists();
-    // import the copy of the original FBX file
-    bool importStatus = importer->Initialize(_originalFBXFilePath.toLocal8Bit().data());
 
-    if (!importStatus) {
-        // failed to initialize importer, print an error and return
-        handleError("Failed to import " + _fbxURL.toString() + " - " + importer->GetStatus().GetErrorString());
+    QFile fbxFile(_originalFBXFilePath);
+    if (!fbxFile.open(QIODevice::ReadOnly)) {
+        handleError("Error opening " + _originalFBXFilePath);
         return;
-    } else {
-        qCDebug(model_baking) << "Imported" << _fbxURL << "to FbxScene";
     }
 
-    // setup a new scene to hold the imported file
-    _scene = FbxScene::Create(_sdkManager.get(), "bakeScene");
-
-    // import the file to the created scene
-    importer->Import(_scene);
-
-    // destroy the importer that is no longer needed
-    importer->Destroy();
+    qCDebug(model_baking) << "Imported" << _fbxURL << "to FbxScene";
+    _rootNode = FBXReader::parseFBX(&fbxFile);
 }
 
 QString texturePathRelativeToFBX(QUrl fbxURL, QUrl textureURL) {
diff --git a/libraries/baking/src/FBXBaker.h b/libraries/baking/src/FBXBaker.h
index 00e7987422..0eb25f510b 100644
--- a/libraries/baking/src/FBXBaker.h
+++ b/libraries/baking/src/FBXBaker.h
@@ -1,6 +1,6 @@
 //
 //  FBXBaker.h
-//  tools/oven/src
+//  tools/baking/src
 //
 //  Created by Stephen Birarda on 3/30/17.
 //  Copyright 2017 High Fidelity, Inc.
@@ -24,6 +24,8 @@
 
 #include <gpu/Texture.h> 
 
+#include <FBX.h>
+
 namespace fbxsdk {
     class FbxManager;
     class FbxProperty;
@@ -76,6 +78,8 @@ private:
     void bakeTexture(const QUrl& textureURL, image::TextureUsage::Type textureType, const QDir& outputDir);
 
     QUrl _fbxURL;
+
+    FBXNode _rootNode;
     
     QString _bakedFBXFilePath;
 
diff --git a/tools/oven/CMakeLists.txt b/tools/oven/CMakeLists.txt
index 0d692b5465..010b1c25b1 100644
--- a/tools/oven/CMakeLists.txt
+++ b/tools/oven/CMakeLists.txt
@@ -2,7 +2,7 @@ set(TARGET_NAME oven)
 
 setup_hifi_project(Widgets Gui Concurrent)
 
-link_hifi_libraries(networking shared image gpu ktx fbx baking)
+link_hifi_libraries(networking shared image gpu ktx fbx baking model)
 
 setup_memory_debugger()
 
diff --git a/tools/oven/src/ui/BakeWidget.h b/tools/oven/src/ui/BakeWidget.h
index e7ab8d1840..00996128ed 100644
--- a/tools/oven/src/ui/BakeWidget.h
+++ b/tools/oven/src/ui/BakeWidget.h
@@ -14,7 +14,7 @@
 
 #include <QtWidgets/QWidget>
 
-#include "../Baker.h"
+#include <Baker.h>
 
 class BakeWidget : public QWidget {
     Q_OBJECT
diff --git a/tools/oven/src/ui/ModelBakeWidget.h b/tools/oven/src/ui/ModelBakeWidget.h
index ed08990ba5..b42b8725f6 100644
--- a/tools/oven/src/ui/ModelBakeWidget.h
+++ b/tools/oven/src/ui/ModelBakeWidget.h
@@ -16,7 +16,7 @@
 
 #include <SettingHandle.h>
 
-#include "../FBXBaker.h"
+#include <FBXBaker.h>
 
 #include "BakeWidget.h"
 
diff --git a/tools/oven/src/ui/SkyboxBakeWidget.h b/tools/oven/src/ui/SkyboxBakeWidget.h
index 4063a5459b..f00ab07f33 100644
--- a/tools/oven/src/ui/SkyboxBakeWidget.h
+++ b/tools/oven/src/ui/SkyboxBakeWidget.h
@@ -16,7 +16,7 @@
 
 #include <SettingHandle.h>
 
-#include "../TextureBaker.h"
+#include <TextureBaker.h>
 
 #include "BakeWidget.h"