v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some fixes for build with MinGW 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@49 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
DarkGuru 2008-05-30 19:29:26 +00:00
parent 3dbd8c1619
commit 7e257677dd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/ASELoader.cpp
View File

@ -553,10 +553,10 @@ void ASEImporter::ConvertMeshes(ASE::Mesh& mesh, aiScene* pcScene)
p_pcOut->mNumFaces = aiSplit[p].size(); p_pcOut->mNumFaces = aiSplit[p].size();
// receive output vertex weights // receive output vertex weights
std::vector<std::pair<unsigned int, float>>* avOutputBones; std::vector<std::pair<unsigned int, float> >* avOutputBones;
if (!mesh.mBones.empty()) if (!mesh.mBones.empty())
{ {
avOutputBones = new std::vector<std::pair<unsigned int, float>>[mesh.mBones.size()]; avOutputBones = new std::vector<std::pair<unsigned int, float> >[mesh.mBones.size()];
} }
// allocate enough storage for faces // allocate enough storage for faces
@ -589,7 +589,7 @@ void ASEImporter::ConvertMeshes(ASE::Mesh& mesh, aiScene* pcScene)
// this vertex index ... // this vertex index ...
if (iIndex2 < mesh.mBoneVertices.size()) if (iIndex2 < mesh.mBoneVertices.size())
{ {
for (std::vector<std::pair<int,float>>::const_iterator for (std::vector<std::pair<int,float> >::const_iterator
blubb = mesh.mBoneVertices[iIndex2].mBoneWeights.begin(); blubb = mesh.mBoneVertices[iIndex2].mBoneWeights.begin();
blubb != mesh.mBoneVertices[iIndex2].mBoneWeights.end();++blubb) blubb != mesh.mBoneVertices[iIndex2].mBoneWeights.end();++blubb)
{ {
@ -755,7 +755,7 @@ void ASEImporter::ConvertMeshes(ASE::Mesh& mesh, aiScene* pcScene)
harrypotter = mesh.mBoneVertices.begin(); harrypotter = mesh.mBoneVertices.begin();
harrypotter != mesh.mBoneVertices.end();++harrypotter,++quak) harrypotter != mesh.mBoneVertices.end();++harrypotter,++quak)
{ {
for (std::vector<std::pair<int,float>>::const_iterator for (std::vector<std::pair<int,float> >::const_iterator
ronaldweasley = (*harrypotter).mBoneWeights.begin(); ronaldweasley = (*harrypotter).mBoneWeights.begin();
ronaldweasley != (*harrypotter).mBoneWeights.end();++ronaldweasley) ronaldweasley != (*harrypotter).mBoneWeights.end();++ronaldweasley)
{ {