Merge branch 'master' into kimkulling_dev

2020-02-16 13:10:41 +01:00
parent b3d894ee73 a0000e5be4
commit ada4f51d5b
791 changed files with 3896 additions and 3616 deletions
--- a/code/FBX/FBXAnimation.cpp
+++ b/code/FBX/FBXAnimation.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
--- a/code/FBX/FBXBinaryTokenizer.cpp
+++ b/code/FBX/FBXBinaryTokenizer.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
--- a/code/FBX/FBXCommon.h
+++ b/code/FBX/FBXCommon.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team

 All rights reserved.

--- a/code/FBX/FBXCompileConfig.h
+++ b/code/FBX/FBXCompileConfig.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
--- a/code/FBX/FBXConverter.cpp
+++ b/code/FBX/FBXConverter.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
@@ -1565,9 +1565,8 @@ namespace Assimp {
                bone_map.clear();
            }
            catch (std::exception &e) {
-				FBXImporter::LogError(e.what());
+				        FBXImporter::LogError(e.what());
                std::for_each(bones.begin(), bones.end(), Util::delete_fun<aiBone>());
-
                throw;
            }

--- a/code/FBX/FBXConverter.h
+++ b/code/FBX/FBXConverter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
--- a/code/FBX/FBXDeformer.cpp
+++ b/code/FBX/FBXDeformer.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
--- a/code/FBX/FBXDocument.cpp
+++ b/code/FBX/FBXDocument.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
--- a/code/FBX/FBXDocument.h
+++ b/code/FBX/FBXDocument.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
--- a/code/FBX/FBXDocumentUtil.cpp
+++ b/code/FBX/FBXDocumentUtil.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
--- a/code/FBX/FBXDocumentUtil.h
+++ b/code/FBX/FBXDocumentUtil.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2012, assimp team
+Copyright (c) 2006-2020, assimp team
 All rights reserved.

 Redistribution and use of this software in source and binary forms,
--- a/code/FBX/FBXExportNode.cpp
+++ b/code/FBX/FBXExportNode.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team

 All rights reserved.

--- a/code/FBX/FBXExportNode.h
+++ b/code/FBX/FBXExportNode.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team

 All rights reserved.

--- a/code/FBX/FBXExportProperty.cpp
+++ b/code/FBX/FBXExportProperty.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team

 All rights reserved.

--- a/code/FBX/FBXExportProperty.h
+++ b/code/FBX/FBXExportProperty.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team

 All rights reserved.

--- a/code/FBX/FBXExporter.cpp
+++ b/code/FBX/FBXExporter.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team

 All rights reserved.

--- a/code/FBX/FBXExporter.h
+++ b/code/FBX/FBXExporter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team

 All rights reserved.

--- a/code/FBX/FBXImportSettings.h
+++ b/code/FBX/FBXImportSettings.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
--- a/code/FBX/FBXImporter.cpp
+++ b/code/FBX/FBXImporter.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
--- a/code/FBX/FBXImporter.h
+++ b/code/FBX/FBXImporter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
--- a/code/FBX/FBXMaterial.cpp
+++ b/code/FBX/FBXMaterial.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
--- a/code/FBX/FBXMeshGeometry.cpp
+++ b/code/FBX/FBXMeshGeometry.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
@@ -446,14 +446,19 @@ void ResolveVertexDataArray(std::vector<T>& data_out, const Scope& source,
            return;
        }
        std::vector<T> tempData;
-		ParseVectorDataArray(tempData, GetRequiredElement(source, dataElementName));
+        ParseVectorDataArray(tempData, GetRequiredElement(source, dataElementName));
+
+        if (tempData.size() != mapping_offsets.size()) {
+            FBXImporter::LogError(Formatter::format("length of input data unexpected for ByVertice mapping: ")
+                                  << tempData.size() << ", expected " << mapping_offsets.size());
+            return;
+        }

        data_out.resize(vertex_count);
-		for (size_t i = 0, e = tempData.size(); i < e; ++i) {
-
+        for (size_t i = 0, e = tempData.size(); i < e; ++i) {
            const unsigned int istart = mapping_offsets[i], iend = istart + mapping_counts[i];
            for (unsigned int j = istart; j < iend; ++j) {
-				data_out[mappings[j]] = tempData[i];
+                data_out[mappings[j]] = tempData[i];
            }
        }
    }
@@ -461,10 +466,17 @@ void ResolveVertexDataArray(std::vector<T>& data_out, const Scope& source,
 		std::vector<T> tempData;
 		ParseVectorDataArray(tempData, GetRequiredElement(source, dataElementName));

-        data_out.resize(vertex_count);
-
        std::vector<int> uvIndices;
        ParseVectorDataArray(uvIndices,GetRequiredElement(source,indexDataElementName));
+
+        if (uvIndices.size() != vertex_count) {
+            FBXImporter::LogError(Formatter::format("length of input data unexpected for ByVertice mapping: ")
+                                  << uvIndices.size() << ", expected " << vertex_count);
+            return;
+        }
+
+        data_out.resize(vertex_count);
+
        for (size_t i = 0, e = uvIndices.size(); i < e; ++i) {

            const unsigned int istart = mapping_offsets[i], iend = istart + mapping_counts[i];
@@ -493,16 +505,17 @@ void ResolveVertexDataArray(std::vector<T>& data_out, const Scope& source,
 		std::vector<T> tempData;
 		ParseVectorDataArray(tempData, GetRequiredElement(source, dataElementName));

-        data_out.resize(vertex_count);
-
        std::vector<int> uvIndices;
        ParseVectorDataArray(uvIndices,GetRequiredElement(source,indexDataElementName));

        if (uvIndices.size() != vertex_count) {
-            FBXImporter::LogError("length of input data unexpected for ByPolygonVertex mapping");
+            FBXImporter::LogError(Formatter::format("length of input data unexpected for ByPolygonVertex mapping: ")
+                                  << uvIndices.size() << ", expected " << vertex_count);
            return;
        }

+        data_out.resize(vertex_count);
+
        const T empty;
        unsigned int next = 0;
        for(int i : uvIndices) {
--- a/code/FBX/FBXMeshGeometry.h
+++ b/code/FBX/FBXMeshGeometry.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
--- a/code/FBX/FBXModel.cpp
+++ b/code/FBX/FBXModel.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
--- a/code/FBX/FBXNodeAttribute.cpp
+++ b/code/FBX/FBXNodeAttribute.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
--- a/code/FBX/FBXParser.cpp
+++ b/code/FBX/FBXParser.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
@@ -367,9 +367,13 @@ float ParseTokenAsFloat(const Token& t, const char*& err_out)
    // first - next in the fbx token stream comes ',',
    // which fast_atof could interpret as decimal point.
 #define MAX_FLOAT_LENGTH 31
-    char temp[MAX_FLOAT_LENGTH + 1];
    const size_t length = static_cast<size_t>(t.end()-t.begin());
-    std::copy(t.begin(),t.end(),temp);
+    if (length > MAX_FLOAT_LENGTH) {
+        return 0.f;
+    }
+
+    char temp[MAX_FLOAT_LENGTH + 1];
+    std::copy(t.begin(), t.end(), temp);
    temp[std::min(static_cast<size_t>(MAX_FLOAT_LENGTH),length)] = '\0';

    return fast_atof(temp);
--- a/code/FBX/FBXParser.h
+++ b/code/FBX/FBXParser.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
--- a/code/FBX/FBXProperties.cpp
+++ b/code/FBX/FBXProperties.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
--- a/code/FBX/FBXProperties.h
+++ b/code/FBX/FBXProperties.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
--- a/code/FBX/FBXTokenizer.cpp
+++ b/code/FBX/FBXTokenizer.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
--- a/code/FBX/FBXTokenizer.h
+++ b/code/FBX/FBXTokenizer.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
--- a/code/FBX/FBXUtil.cpp
+++ b/code/FBX/FBXUtil.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
--- a/code/FBX/FBXUtil.h
+++ b/code/FBX/FBXUtil.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.