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

Merge pull request #1737 from elect86/master 

Inserted a space + renaming nested looping variable
pull/1741/head^2
Kim Kulling 2018-01-25 10:26:17 +01:00 committed by GitHub
parent 39ce3e1309 25c5384208
commit 71549084c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/FBXConverter.cpp
View File

@ -1129,14 +1129,14 @@ unsigned int Converter::ConvertMeshMultiMaterial( const MeshGeometry& mesh, cons
out_mesh->mBitangents[ cursor ] = ( *binormals )[ in_cursor ];
}
for ( unsigned int i = 0; i < num_uvs; ++i ) {
const std::vector<aiVector2D>& uvs = mesh.GetTextureCoords( i );
out_mesh->mTextureCoords[ i ][ cursor ] = aiVector3D( uvs[ in_cursor ].x, uvs[ in_cursor ].y, 0.0f );
for ( unsigned int j = 0; j < num_uvs; ++j ) {
const std::vector<aiVector2D>& uvs = mesh.GetTextureCoords( j );
out_mesh->mTextureCoords[ j ][ cursor ] = aiVector3D( uvs[ in_cursor ].x, uvs[ in_cursor ].y, 0.0f );
}
for ( unsigned int i = 0; i < num_vcs; ++i ) {
const std::vector<aiColor4D>& cols = mesh.GetVertexColors( i );
out_mesh->mColors[ i ][ cursor ] = cols[ in_cursor ];
for ( unsigned int j = 0; j < num_vcs; ++j ) {
const std::vector<aiColor4D>& cols = mesh.GetVertexColors( j );
out_mesh->mColors[ j ][ cursor ] = cols[ in_cursor ];
}
}
}

2
code/FBXDocumentUtil.h
View File

@ -105,7 +105,7 @@ inline const T* ProcessSimpleConnection(const Connection& con,
const Object* const ob = con.SourceObject();
if(!ob) {
DOMWarning("failed to read source object for incoming" + std::string(name) +
DOMWarning("failed to read source object for incoming " + std::string(name) +
" link, ignoring",
&element);
return NULL;