2
0
Эх сурвалжийг харах

Fix: Collada header updated

Onur Berk Tore 3 жил өмнө
parent
commit
4f06c41802

+ 0 - 3
code/AssetLib/Collada/ColladaLoader.cpp

@@ -804,7 +804,6 @@ aiMesh *ColladaLoader::CreateMesh(const ColladaParser &pParser, const Mesh *pSrc
                 continue;
             }
             ++numRemainingBones;
-
         }
 
         // create bone array and copy bone weights one by one
@@ -832,7 +831,6 @@ aiMesh *ColladaLoader::CreateMesh(const ColladaParser &pParser, const Mesh *pSrc
             bone->mOffsetMatrix.c2 = ReadFloat(jointMatrixAcc, jointMatrices, a, 9);
             bone->mOffsetMatrix.c3 = ReadFloat(jointMatrixAcc, jointMatrices, a, 10);
             bone->mOffsetMatrix.c4 = ReadFloat(jointMatrixAcc, jointMatrices, a, 11);
-
             bone->mNumWeights = static_cast<unsigned int>(dstBones[a].size());
             bone->mWeights = new aiVertexWeight[bone->mNumWeights];
             std::copy(dstBones[a].begin(), dstBones[a].end(), bone->mWeights);
@@ -1831,4 +1829,3 @@ std::string ColladaLoader::FindNameForNode(const Node *pNode) {
 } // Namespace Assimp
 
 #endif // !! ASSIMP_BUILD_NO_DAE_IMPORTER
-

+ 1 - 0
code/AssetLib/Collada/ColladaLoader.h

@@ -237,6 +237,7 @@ protected:
     std::vector<aiAnimation *> mAnims;
 
     bool noSkeletonMesh;
+    bool removeEmptyBones;
     bool ignoreUpDirection;
     bool useColladaName;