From 9efa4282fedfc71a12b72105a0cbc5c2f3c8532e Mon Sep 17 00:00:00 2001
From: Kim Kulling <kim.kulling@googlemail.com>
Date: Thu, 4 Jan 2018 12:37:35 +0100
Subject: [PATCH 1/9] closes https://github.com/assimp/assimp/issues/1460: skip
 uv- and color-components if these are not defined.

---
 code/FBXMeshGeometry.cpp | 9 ++++++++-
 code/FBXParser.cpp       | 8 ++++++++
 code/FBXParser.h         | 2 ++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/code/FBXMeshGeometry.cpp b/code/FBXMeshGeometry.cpp
index 8d43a2436..ad0ffcf55 100644
--- a/code/FBXMeshGeometry.cpp
+++ b/code/FBXMeshGeometry.cpp
@@ -433,7 +433,11 @@ void ResolveVertexDataArray(std::vector<T>& data_out, const Scope& source,
     // deal with this more elegantly and with less redundancy, but right
     // now it seems unavoidable.
     if (MappingInformationType == "ByVertice" && ReferenceInformationType == "Direct") {
-		std::vector<T> tempData;
+        if ( !HasElement( source, indexDataElementName ) ) {
+            return;
+        }
+
+        std::vector<T> tempData;
 		ParseVectorDataArray(tempData, GetRequiredElement(source, dataElementName));
 
         data_out.resize(vertex_count);
@@ -452,6 +456,9 @@ void ResolveVertexDataArray(std::vector<T>& data_out, const Scope& source,
         data_out.resize(vertex_count);
 
         std::vector<int> uvIndices;
+        if ( !HasElement( source, indexDataElementName ) ) {
+            return;
+        }
         ParseVectorDataArray(uvIndices,GetRequiredElement(source,indexDataElementName));
 
         for (size_t i = 0, e = uvIndices.size(); i < e; ++i) {
diff --git a/code/FBXParser.cpp b/code/FBXParser.cpp
index d4d06567b..935fe5b08 100644
--- a/code/FBXParser.cpp
+++ b/code/FBXParser.cpp
@@ -1197,6 +1197,14 @@ std::string ParseTokenAsString(const Token& t)
     return i;
 }
 
+bool HasElement( const Scope& sc, const std::string& index ) {
+    const Element* el = sc[ index ];
+    if ( nullptr == el ) {
+        return false;
+    }
+
+    return true;
+}
 
 // ------------------------------------------------------------------------------------------------
 // extract a required element from a scope, abort if the element cannot be found
diff --git a/code/FBXParser.h b/code/FBXParser.h
index 4d3766d70..736adcea0 100644
--- a/code/FBXParser.h
+++ b/code/FBXParser.h
@@ -218,6 +218,8 @@ void ParseVectorDataArray(std::vector<unsigned int>& out, const Element& el);
 void ParseVectorDataArray(std::vector<uint64_t>& out, const Element& e);
 void ParseVectorDataArray(std::vector<int64_t>& out, const Element& el);
 
+bool HasElement( const Scope& sc, const std::string& index );
+
 // extract a required element from a scope, abort if the element cannot be found
 const Element& GetRequiredElement(const Scope& sc, const std::string& index, const Element* element = NULL);
 

From f376a3e8cde7f01070264e4ae9f3f376788dd5eb Mon Sep 17 00:00:00 2001
From: Kim Kulling <kim.kulling@googlemail.com>
Date: Thu, 4 Jan 2018 13:09:43 +0100
Subject: [PATCH 2/9] move data declaration after test if elements are in
 current scope.

---
 code/FBXMeshGeometry.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/code/FBXMeshGeometry.cpp b/code/FBXMeshGeometry.cpp
index ad0ffcf55..4868b3e72 100644
--- a/code/FBXMeshGeometry.cpp
+++ b/code/FBXMeshGeometry.cpp
@@ -454,13 +454,12 @@ void ResolveVertexDataArray(std::vector<T>& data_out, const Scope& source,
 		ParseVectorDataArray(tempData, GetRequiredElement(source, dataElementName));
 
         data_out.resize(vertex_count);
-
-        std::vector<int> uvIndices;
         if ( !HasElement( source, indexDataElementName ) ) {
             return;
         }
-        ParseVectorDataArray(uvIndices,GetRequiredElement(source,indexDataElementName));
 
+        std::vector<int> uvIndices;
+        ParseVectorDataArray(uvIndices,GetRequiredElement(source,indexDataElementName));
         for (size_t i = 0, e = uvIndices.size(); i < e; ++i) {
 
             const unsigned int istart = mapping_offsets[i], iend = istart + mapping_counts[i];

From a5e2a40d75798d5e0e2d6fbd9286d6b0d7015e72 Mon Sep 17 00:00:00 2001
From: Kim Kulling <kim.kulling@googlemail.com>
Date: Thu, 4 Jan 2018 13:10:13 +0100
Subject: [PATCH 3/9] FBX: add simple unittest with a simple box.

---
 test/unit/utFBXImporterExporter.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/unit/utFBXImporterExporter.cpp b/test/unit/utFBXImporterExporter.cpp
index 2807f801c..975f2acef 100644
--- a/test/unit/utFBXImporterExporter.cpp
+++ b/test/unit/utFBXImporterExporter.cpp
@@ -61,3 +61,9 @@ public:
 TEST_F( utFBXImporterExporter, importXFromFileTest ) {
     EXPECT_TRUE( importerTest() );
 }
+
+TEST_F( utFBXImporterExporter, importBareBoxWithoutColorsAndTextureCoords ) {
+    Assimp::Importer importer;
+    const aiScene *scene = importer.ReadFile( ASSIMP_TEST_MODELS_DIR "/FBX/box.fbx", aiProcess_ValidateDataStructure );
+    EXPECT_NE( nullptr, scene );
+}

From 96b96266016a16723b2df8655a3a246c8b96e67c Mon Sep 17 00:00:00 2001
From: Kim Kulling <kim.kulling@googlemail.com>
Date: Thu, 4 Jan 2018 13:17:42 +0100
Subject: [PATCH 4/9] FBX: add missing test file.

---
 test/models/FBX/box.fbx | Bin 0 -> 17200 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 test/models/FBX/box.fbx

diff --git a/test/models/FBX/box.fbx b/test/models/FBX/box.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..cd60d72dad3222dcc9cdc7278fc0387297d4b4df
GIT binary patch
literal 17200
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
X&8Ln%_tvwYdG+NLFI4Z@xct8Xz5RC<

literal 0
HcmV?d00001


From 988acd00f10e5334ea2903b0ef7b0df2b6529f9b Mon Sep 17 00:00:00 2001
From: Alexis Breust <abreust@wanadev.fr>
Date: Fri, 5 Jan 2018 10:08:17 +0100
Subject: [PATCH 5/9] Using relative buffers URI

---
 code/glTF2AssetWriter.inl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/glTF2AssetWriter.inl b/code/glTF2AssetWriter.inl
index 6b1a50887..2f9b8cb68 100644
--- a/code/glTF2AssetWriter.inl
+++ b/code/glTF2AssetWriter.inl
@@ -156,7 +156,10 @@ namespace glTF2 {
     inline void Write(Value& obj, Buffer& b, AssetWriter& w)
     {
         obj.AddMember("byteLength", static_cast<uint64_t>(b.byteLength), w.mAl);
-        obj.AddMember("uri", Value(b.GetURI(), w.mAl).Move(), w.mAl);
+
+        const auto uri = b.GetURI();
+        const auto relativeUri = uri.substr(uri.find_last_of("/\\") + 1u);
+        obj.AddMember("uri", Value(relativeUri, w.mAl).Move(), w.mAl);
     }
 
     inline void Write(Value& obj, BufferView& bv, AssetWriter& w)

From 9b5df711505886fe6963031c2361c129c6b9b786 Mon Sep 17 00:00:00 2001
From: Alexis Breust <abreust@wanadev.fr>
Date: Fri, 5 Jan 2018 10:28:12 +0100
Subject: [PATCH 6/9] Not using external bin file for glb2

---
 code/glTF2AssetWriter.inl | 75 ++++++++++++++++++++++-----------------
 code/glTF2Exporter.cpp    |  4 +++
 2 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/code/glTF2AssetWriter.inl b/code/glTF2AssetWriter.inl
index 6b1a50887..001fa0f01 100644
--- a/code/glTF2AssetWriter.inl
+++ b/code/glTF2AssetWriter.inl
@@ -167,7 +167,9 @@ namespace glTF2 {
         if (bv.byteStride != 0) {
             obj.AddMember("byteStride", bv.byteStride, w.mAl);
         }
-        obj.AddMember("target", int(bv.target), w.mAl);
+        if (bv.target != 0) {
+            obj.AddMember("target", int(bv.target), w.mAl);
+        }
     }
 
     inline void Write(Value& /*obj*/, Camera& /*c*/, AssetWriter& /*w*/)
@@ -177,17 +179,23 @@ namespace glTF2 {
 
     inline void Write(Value& obj, Image& img, AssetWriter& w)
     {
-        std::string uri;
-        if (img.HasData()) {
-            uri = "data:" + (img.mimeType.empty() ? "application/octet-stream" : img.mimeType);
-            uri += ";base64,";
-            Util::EncodeBase64(img.GetData(), img.GetDataLength(), uri);
+        if (img.bufferView) {
+            obj.AddMember("bufferView", img.bufferView->index, w.mAl);
+            obj.AddMember("mimeType", Value(img.mimeType, w.mAl).Move(), w.mAl);
         }
         else {
-            uri = img.uri;
-        }
+            std::string uri;
+            if (img.HasData()) {
+                uri = "data:" + (img.mimeType.empty() ? "application/octet-stream" : img.mimeType);
+                uri += ";base64,";
+                Util::EncodeBase64(img.GetData(), img.GetDataLength(), uri);
+            }
+            else {
+                uri = img.uri;
+            }
 
-        obj.AddMember("uri", Value(uri, w.mAl).Move(), w.mAl);
+            obj.AddMember("uri", Value(uri, w.mAl).Move(), w.mAl);
+        }
     }
 
     namespace {
@@ -569,13 +577,17 @@ namespace glTF2 {
             throw DeadlyExportError("Could not open output file: " + std::string(path));
         }
 
+        Ref<Buffer> bodyBuffer = mAsset.GetBodyBuffer();
+        if (bodyBuffer->byteLength > 0) {
+            rapidjson::Value glbBodyBuffer;
+            glbBodyBuffer.SetObject();
+            glbBodyBuffer.AddMember("byteLength", bodyBuffer->byteLength, mAl);
+            mDoc["buffers"].PushBack(glbBodyBuffer, mAl);
+        }
+
         // Padding with spaces as required by the spec
         uint32_t padding = 0x20202020;
 
-        // Adapt JSON so that it is not pointing to an external file,
-        // as this is required by the GLB spec'.
-        mDoc["buffers"][0].RemoveMember("uri");
-
         //
         // JSON chunk
         //
@@ -608,28 +620,25 @@ namespace glTF2 {
         //
 
         uint32_t binaryChunkLength = 0;
-        if (mAsset.buffers.Size() > 0) {
-            Ref<Buffer> b = mAsset.buffers.Get(0u);
-            if (b->byteLength > 0) {
-                binaryChunkLength = (b->byteLength + 3) & ~3; // Round up to next multiple of 4
-                auto paddingLength = binaryChunkLength - b->byteLength;
+        if (bodyBuffer->byteLength > 0) {
+            binaryChunkLength = (bodyBuffer->byteLength + 3) & ~3; // Round up to next multiple of 4
+            auto paddingLength = binaryChunkLength - bodyBuffer->byteLength;
 
-                GLB_Chunk binaryChunk;
-                binaryChunk.chunkLength = binaryChunkLength;
-                binaryChunk.chunkType = ChunkType_BIN;
-                AI_SWAP4(binaryChunk.chunkLength);
+            GLB_Chunk binaryChunk;
+            binaryChunk.chunkLength = binaryChunkLength;
+            binaryChunk.chunkType = ChunkType_BIN;
+            AI_SWAP4(binaryChunk.chunkLength);
 
-                size_t bodyOffset = sizeof(GLB_Header) + sizeof(GLB_Chunk) + jsonChunk.chunkLength;
-                outfile->Seek(bodyOffset, aiOrigin_SET);
-                if (outfile->Write(&binaryChunk, 1, sizeof(GLB_Chunk)) != sizeof(GLB_Chunk)) {
-                    throw DeadlyExportError("Failed to write body data header!");
-                }
-                if (outfile->Write(b->GetPointer(), 1, b->byteLength) != b->byteLength) {
-                    throw DeadlyExportError("Failed to write body data!");
-                }
-                if (paddingLength && outfile->Write(&padding, 1, paddingLength) != paddingLength) {
-                    throw DeadlyExportError("Failed to write body data padding!");
-                }
+            size_t bodyOffset = sizeof(GLB_Header) + sizeof(GLB_Chunk) + jsonChunk.chunkLength;
+            outfile->Seek(bodyOffset, aiOrigin_SET);
+            if (outfile->Write(&binaryChunk, 1, sizeof(GLB_Chunk)) != sizeof(GLB_Chunk)) {
+                throw DeadlyExportError("Failed to write body data header!");
+            }
+            if (outfile->Write(bodyBuffer->GetPointer(), 1, bodyBuffer->byteLength) != bodyBuffer->byteLength) {
+                throw DeadlyExportError("Failed to write body data!");
+            }
+            if (paddingLength && outfile->Write(&padding, 1, paddingLength) != paddingLength) {
+                throw DeadlyExportError("Failed to write body data padding!");
             }
         }
 
diff --git a/code/glTF2Exporter.cpp b/code/glTF2Exporter.cpp
index 22ceb57d2..221a3bf9f 100644
--- a/code/glTF2Exporter.cpp
+++ b/code/glTF2Exporter.cpp
@@ -109,6 +109,10 @@ glTF2Exporter::glTF2Exporter(const char* filename, IOSystem* pIOSystem, const ai
 
     mAsset.reset( new Asset( pIOSystem ) );
 
+    if (isBinary) {
+        mAsset->SetAsBinary();
+    }
+
     ExportMetadata();
 
     ExportMaterials();

From ce5b78f6c0d62441d4dca28cc8e53db58088cda3 Mon Sep 17 00:00:00 2001
From: Robert Spencer <robert.spencer94@gmail.com>
Date: Sat, 6 Jan 2018 15:17:03 +0200
Subject: [PATCH 7/9] Remove check for 'assimp' in name of directories to be
 searched for library in python port

---
 port/PyAssimp/pyassimp/helper.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/port/PyAssimp/pyassimp/helper.py b/port/PyAssimp/pyassimp/helper.py
index 85bb53add..7d9282745 100644
--- a/port/PyAssimp/pyassimp/helper.py
+++ b/port/PyAssimp/pyassimp/helper.py
@@ -51,11 +51,8 @@ if os.name=='posix':
 elif os.name=='nt':
     ext_whitelist.append('.dll')
     path_dirs = os.environ['PATH'].split(';')
-    for dir_candidate in path_dirs:
-        if 'assimp' in dir_candidate.lower():
-            additional_dirs.append(dir_candidate)
+    additional_dirs.extend(path_dirs)
 
-#print(additional_dirs)
 def vec2tuple(x):
     """ Converts a VECTOR3D to a Tuple """
     return (x.x, x.y, x.z)

From f149a2641b947ebb4d1b5bb33b9f74904c30215a Mon Sep 17 00:00:00 2001
From: Robert Spencer <robert.spencer94@gmail.com>
Date: Sat, 6 Jan 2018 15:17:56 +0200
Subject: [PATCH 8/9] Add compiled python files to the ignore list

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 12cd76a87..2a3b68a50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,6 +60,7 @@ test/gtest/src/gtest-stamp/Debug/gtest-build
 *.lib
 test/gtest/src/gtest-stamp/Debug/
 tools/assimp_view/assimp_viewer.vcxproj.user
+*.pyc
 
 # Unix editor backups
 *~

From 01081765ad391a26fc129960e5ab7493bcaeb1f9 Mon Sep 17 00:00:00 2001
From: Kim Kulling <kim.kulling@googlemail.com>
Date: Sat, 6 Jan 2018 18:03:27 +0100
Subject: [PATCH 9/9] closes https://github.com/assimp/assimp/issues/1638: use
 memcpy instead of dynamic_cast.

---
 code/FBXBinaryTokenizer.cpp | 35 ++++++++++++++---------------------
 include/assimp/types.h      |  3 +--
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/code/FBXBinaryTokenizer.cpp b/code/FBXBinaryTokenizer.cpp
index cc2e734fc..5884125a2 100644
--- a/code/FBXBinaryTokenizer.cpp
+++ b/code/FBXBinaryTokenizer.cpp
@@ -129,30 +129,26 @@ AI_WONT_RETURN void TokenizeError(const std::string& message, unsigned int offse
 
 
 // ------------------------------------------------------------------------------------------------
-uint32_t Offset(const char* begin, const char* cursor)
-{
+uint32_t Offset(const char* begin, const char* cursor) {
     ai_assert(begin <= cursor);
+
     return static_cast<unsigned int>(cursor - begin);
 }
 
-
 // ------------------------------------------------------------------------------------------------
-void TokenizeError(const std::string& message, const char* begin, const char* cursor)
-{
+void TokenizeError(const std::string& message, const char* begin, const char* cursor) {
     TokenizeError(message, Offset(begin, cursor));
 }
 
-
 // ------------------------------------------------------------------------------------------------
-uint32_t ReadWord(const char* input, const char*& cursor, const char* end)
-{
+uint32_t ReadWord(const char* input, const char*& cursor, const char* end) {
     const size_t k_to_read = sizeof( uint32_t );
     if(Offset(cursor, end) < k_to_read ) {
         TokenizeError("cannot ReadWord, out of bounds",input, cursor);
     }
 
     uint32_t word;
-    memcpy(&word, cursor, 4);
+    ::memcpy(&word, cursor, 4);
     AI_SWAP4(word);
 
     cursor += k_to_read;
@@ -167,7 +163,8 @@ uint64_t ReadDoubleWord(const char* input, const char*& cursor, const char* end)
         TokenizeError("cannot ReadDoubleWord, out of bounds",input, cursor);
     }
 
-    uint64_t dword = *reinterpret_cast<const uint64_t*>(cursor);
+    uint64_t dword /*= *reinterpret_cast<const uint64_t*>(cursor)*/;
+    ::memcpy( &dword, cursor, sizeof( uint64_t ) );
     AI_SWAP8(dword);
 
     cursor += k_to_read;
@@ -176,24 +173,21 @@ uint64_t ReadDoubleWord(const char* input, const char*& cursor, const char* end)
 }
 
 // ------------------------------------------------------------------------------------------------
-uint8_t ReadByte(const char* input, const char*& cursor, const char* end)
-{
+uint8_t ReadByte(const char* input, const char*& cursor, const char* end) {
     if(Offset(cursor, end) < sizeof( uint8_t ) ) {
         TokenizeError("cannot ReadByte, out of bounds",input, cursor);
     }
 
-    uint8_t word = *reinterpret_cast<const uint8_t*>(cursor);
+    uint8_t word;/* = *reinterpret_cast< const uint8_t* >( cursor )*/
+    ::memcpy( &word, cursor, sizeof( uint8_t ) );
     ++cursor;
 
     return word;
 }
 
-
 // ------------------------------------------------------------------------------------------------
-unsigned int ReadString(const char*& sbegin_out, const char*& send_out, const char* input, const char*& cursor, const char* end,
-    bool long_length = false,
-    bool allow_null = false)
-{
+unsigned int ReadString(const char*& sbegin_out, const char*& send_out, const char* input,
+        const char*& cursor, const char* end, bool long_length = false, bool allow_null = false) {
     const uint32_t len_len = long_length ? 4 : 1;
     if(Offset(cursor, end) < len_len) {
         TokenizeError("cannot ReadString, out of bounds reading length",input, cursor);
@@ -222,8 +216,7 @@ unsigned int ReadString(const char*& sbegin_out, const char*& send_out, const ch
 }
 
 // ------------------------------------------------------------------------------------------------
-void ReadData(const char*& sbegin_out, const char*& send_out, const char* input, const char*& cursor, const char* end)
-{
+void ReadData(const char*& sbegin_out, const char*& send_out, const char* input, const char*& cursor, const char* end) {
     if(Offset(cursor, end) < 1) {
         TokenizeError("cannot ReadData, out of bounds reading length",input, cursor);
     }
@@ -422,7 +415,7 @@ bool ReadScope(TokenList& output_tokens, const char* input, const char*& cursor,
     return true;
 }
 
-}
+} // anonymous namespace
 
 // ------------------------------------------------------------------------------------------------
 // TODO: Test FBX Binary files newer than the 7500 version to check if the 64 bits address behaviour is consistent
diff --git a/include/assimp/types.h b/include/assimp/types.h
index 0012a0bba..e7bec2f85 100644
--- a/include/assimp/types.h
+++ b/include/assimp/types.h
@@ -110,8 +110,7 @@ extern "C" {
 
 /** Maximum dimension for strings, ASSIMP strings are zero terminated. */
 #ifdef __cplusplus
-static 
-const size_t MAXLEN = 1024;
+    static const size_t MAXLEN = 1024;
 #else
 #   define MAXLEN 1024
 #endif