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

Fixed build warnings on MSVC14 x64 in some helpers.

pull/1083/head
Jared Mulconry 2016-11-20 13:18:11 +11:00
parent f81e28f320
commit 98aea657ff
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/ProcessHelper.cpp
View File

@ -308,7 +308,7 @@ aiMesh* MakeSubmesh(const aiMesh *pMesh, const std::vector<unsigned int> &subMes
for(unsigned int j=0;j<f.mNumIndices;j++) { for(unsigned int j=0;j<f.mNumIndices;j++) {
if(vMap[f.mIndices[j]]==UINT_MAX) { if(vMap[f.mIndices[j]]==UINT_MAX) {
vMap[f.mIndices[j]] = numSubVerts++; vMap[f.mIndices[j]] = static_cast<unsigned int>(numSubVerts++);
} }
} }
} }
@ -320,8 +320,8 @@ aiMesh* MakeSubmesh(const aiMesh *pMesh, const std::vector<unsigned int> &subMes
// create all the arrays for this mesh if the old mesh contained them // create all the arrays for this mesh if the old mesh contained them
oMesh->mNumFaces = subMeshFaces.size(); oMesh->mNumFaces = static_cast<unsigned int>(subMeshFaces.size());
oMesh->mNumVertices = numSubVerts; oMesh->mNumVertices = static_cast<unsigned int>(numSubVerts);
oMesh->mVertices = new aiVector3D[numSubVerts]; oMesh->mVertices = new aiVector3D[numSubVerts];
if( pMesh->HasNormals() ) { if( pMesh->HasNormals() ) {
oMesh->mNormals = new aiVector3D[numSubVerts]; oMesh->mNormals = new aiVector3D[numSubVerts];
@ -332,12 +332,12 @@ aiMesh* MakeSubmesh(const aiMesh *pMesh, const std::vector<unsigned int> &subMes
oMesh->mBitangents = new aiVector3D[numSubVerts]; oMesh->mBitangents = new aiVector3D[numSubVerts];
} }
for( size_t a = 0; pMesh->HasTextureCoords( a) ; ++a ) { for( size_t a = 0; pMesh->HasTextureCoords(static_cast<unsigned int>(a)) ; ++a ) {
oMesh->mTextureCoords[a] = new aiVector3D[numSubVerts]; oMesh->mTextureCoords[a] = new aiVector3D[numSubVerts];
oMesh->mNumUVComponents[a] = pMesh->mNumUVComponents[a]; oMesh->mNumUVComponents[a] = pMesh->mNumUVComponents[a];
} }
for( size_t a = 0; pMesh->HasVertexColors( a); ++a ) { for( size_t a = 0; pMesh->HasVertexColors( static_cast<unsigned int>(a)); ++a ) {
oMesh->mColors[a] = new aiColor4D[numSubVerts]; oMesh->mColors[a] = new aiColor4D[numSubVerts];
} }