Merge pull request #2348 from assimp/simple_skin_test

Simple skin test
assimp · Feb 25, 2019 · d5a0a21 · d5a0a21
2 parents bc0064d + 262bbc0
commit d5a0a21
Show file tree

Hide file tree

Showing 10 changed files with 252 additions and 103 deletions.
diff --git a/code/FBXConverter.cpp b/code/FBXConverter.cpp
@@ -1160,7 +1160,7 @@ namespace Assimp {
                     }
                 }
             }
-            size_t numAnimMeshes = animMeshes.size();
+            const size_t numAnimMeshes = animMeshes.size();
             if (numAnimMeshes > 0) {
                 out_mesh->mNumAnimMeshes = static_cast<unsigned int>(numAnimMeshes);
                 out_mesh->mAnimMeshes = new aiAnimMesh*[numAnimMeshes];

diff --git a/code/FBXDocument.cpp b/code/FBXDocument.cpp
@@ -69,8 +69,7 @@ LazyObject::LazyObject(uint64_t id, const Element& element, const Document& doc)
 : doc(doc)
 , element(element)
 , id(id)
-, flags()
-{
+, flags() {
     // empty
 }
 
@@ -84,7 +83,7 @@ LazyObject::~LazyObject()
 const Object* LazyObject::Get(bool dieOnError)
 {
     if(IsBeingConstructed() || FailedToConstruct()) {
-        return NULL;
+        return nullptr;
     }
 
     if (object.get()) {
@@ -553,7 +552,7 @@ const std::vector<const AnimationStack*>& Document::AnimationStacks() const
 LazyObject* Document::GetObject(uint64_t id) const
 {
     ObjectMap::const_iterator it = objects.find(id);
-    return it == objects.end() ? NULL : (*it).second;
+    return it == objects.end() ? nullptr : (*it).second;
 }
 
 #define MAX_CLASSNAMES 6
@@ -610,7 +609,7 @@ std::vector<const Connection*> Document::GetConnectionsSequenced(uint64_t id, bo
         for (size_t i = 0; i < c; ++i) {
             ai_assert(classnames[i]);
             if(static_cast<size_t>(std::distance(key.begin(),key.end())) == lengths[i] && !strncmp(classnames[i],obtype,lengths[i])) {
-                obtype = NULL;
+                obtype = nullptr;
                 break;
             }
         }