From 379306204530c1afa5e81649ee61ec329c973637 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 13 Sep 2017 09:51:06 -0700
Subject: [PATCH] Add optional FBX 2015 encoding to FBXWriter

---
 libraries/fbx/src/FBX.h         |  1 +
 libraries/fbx/src/FBXWriter.cpp | 26 ++++++++++++++++++++------
 libraries/fbx/src/FBXWriter.h   |  2 ++
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/libraries/fbx/src/FBX.h b/libraries/fbx/src/FBX.h
index 9f5fad7d66..6af23a0151 100644
--- a/libraries/fbx/src/FBX.h
+++ b/libraries/fbx/src/FBX.h
@@ -30,6 +30,7 @@
 
 static const QByteArray FBX_BINARY_PROLOG = "Kaydara FBX Binary  ";
 static const int FBX_HEADER_BYTES_BEFORE_VERSION = 23;
+static const quint32 FBX_VERSION_2015 = 7400;
 static const quint32 FBX_VERSION_2016 = 7500;
 
 
diff --git a/libraries/fbx/src/FBXWriter.cpp b/libraries/fbx/src/FBXWriter.cpp
index 7195d2abb4..764d8df6cf 100644
--- a/libraries/fbx/src/FBXWriter.cpp
+++ b/libraries/fbx/src/FBXWriter.cpp
@@ -13,6 +13,16 @@
 
 #include <QDebug>
 
+#ifdef USE_FBX_2016_FORMAT
+    using FBXEndOffset = int64_t;
+    using FBXPropertyCount = uint64_t;
+    using FBXListLength = uint64_t;
+#else
+    using FBXEndOffset = int32_t;
+    using FBXPropertyCount = uint32_t;
+    using FBXListLength = uint32_t;
+#endif
+
 template <typename T>
 void writeVector(QDataStream& out, char ch,  QVector<T> list) {
     out.device()->write(&ch, 1);
@@ -34,7 +44,11 @@ QByteArray FBXWriter::encodeFBX(const FBXNode& root) {
     auto bytes = QByteArray(FBX_HEADER_BYTES_BEFORE_VERSION - FBX_BINARY_PROLOG.size(), '\0');
     out.writeRawData(bytes, bytes.size());
 
+#ifdef USE_FBX_2016_FORMAT
     out << FBX_VERSION_2016;
+#else
+    out << FBX_VERSION_2015;
+#endif
 
     for (auto& child : root.children) {
         encodeNode(out, child);
@@ -51,13 +65,13 @@ void FBXWriter::encodeNode(QDataStream& out, const FBXNode& node) {
     auto nodeStartPos = device->pos();
 
     // endOffset (temporary, updated later)
-    out << (qint64)0;
+    out << (FBXEndOffset)0;
 
     // Property count
-    out << (quint64)node.properties.size();
+    out << (FBXPropertyCount)node.properties.size();
 
     // Property list length (temporary, updated later)
-    out << (quint64)0;
+    out << (FBXListLength)0;
 
     out << (quint8)node.name.size();
     out.writeRawData(node.name, node.name.size());
@@ -70,8 +84,8 @@ void FBXWriter::encodeNode(QDataStream& out, const FBXNode& node) {
 
     // Go back and write property list length
     auto nodePropertiesEndPos = device->pos();
-    device->seek(nodeStartPos + sizeof(qint64) + sizeof(quint64));
-    out << (quint64)(nodePropertiesEndPos - nodePropertiesStartPos);
+    device->seek(nodeStartPos + sizeof(FBXEndOffset) + sizeof(FBXPropertyCount));
+    out << (FBXListLength)(nodePropertiesEndPos - nodePropertiesStartPos);
 
     device->seek(nodePropertiesEndPos);
 
@@ -86,7 +100,7 @@ void FBXWriter::encodeNode(QDataStream& out, const FBXNode& node) {
     // Go back and write actual endOffset
     auto nodeEndPos = device->pos();
     device->seek(nodeStartPos);
-    out << (qint64)(nodeEndPos);
+    out << (FBXEndOffset)(nodeEndPos);
 
     device->seek(nodeEndPos);
 }
diff --git a/libraries/fbx/src/FBXWriter.h b/libraries/fbx/src/FBXWriter.h
index fa33983345..57c33e0e1c 100644
--- a/libraries/fbx/src/FBXWriter.h
+++ b/libraries/fbx/src/FBXWriter.h
@@ -17,6 +17,8 @@
 #include <QByteArray>
 #include <QDataStream>
 
+#define USE_FBX_2016_FORMAT
+
 class FBXWriter {
 public:
     static QByteArray encodeFBX(const FBXNode& root);