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

- Fixed compilation for some targets 

- Removed BOOST_FOREACH usage in ColladaParser::ReadPrimitives() because they seem to cause problems in NOBOOST builds

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@726 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
ulfjorensen 2010-05-18 12:20:09 +00:00
parent a44e065f58
commit 6e133a6cd9
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
code/ColladaParser.cpp
View File

@ -1976,8 +1976,9 @@ void ColladaParser::ReadPrimitives( Mesh* pMesh, std::vector<InputChannel>& pPer
ThrowException( "Expected different index count in <p> element."); ThrowException( "Expected different index count in <p> element.");
// find the data for all sources // find the data for all sources
BOOST_FOREACH( InputChannel& input, pMesh->mPerVertexData) for( std::vector<InputChannel>::iterator it = pMesh->mPerVertexData.begin(); it != pMesh->mPerVertexData.end(); ++it)
{ {
InputChannel& input = *it;
if( input.mResolved) if( input.mResolved)
continue; continue;
@ -1989,8 +1990,9 @@ void ColladaParser::ReadPrimitives( Mesh* pMesh, std::vector<InputChannel>& pPer
acc->mData = &ResolveLibraryReference( mDataLibrary, acc->mSource); acc->mData = &ResolveLibraryReference( mDataLibrary, acc->mSource);
} }
// and the same for the per-index channels // and the same for the per-index channels
BOOST_FOREACH( InputChannel& input, pPerIndexChannels) for( std::vector<InputChannel>::iterator it = pPerIndexChannels.begin(); it != pPerIndexChannels.end(); ++it)
{ {
InputChannel& input = *it;
if( input.mResolved) if( input.mResolved)
continue; continue;
@ -2061,11 +2063,11 @@ void ColladaParser::ReadPrimitives( Mesh* pMesh, std::vector<InputChannel>& pPer
vindex[offsets] = *idx++; vindex[offsets] = *idx++;
// extract per-vertex channels using the global per-vertex offset // extract per-vertex channels using the global per-vertex offset
BOOST_FOREACH( const InputChannel& input, pMesh->mPerVertexData) for( std::vector<InputChannel>::iterator it = pMesh->mPerVertexData.begin(); it != pMesh->mPerVertexData.end(); ++it)
ExtractDataObjectFromChannel( input, vindex[perVertexOffset], pMesh); ExtractDataObjectFromChannel( *it, vindex[perVertexOffset], pMesh);
// and extract per-index channels using there specified offset // and extract per-index channels using there specified offset
BOOST_FOREACH( const InputChannel& input, pPerIndexChannels) for( std::vector<InputChannel>::iterator it = pPerIndexChannels.begin(); it != pPerIndexChannels.end(); ++it)
ExtractDataObjectFromChannel( input, vindex[input.mOffset], pMesh); ExtractDataObjectFromChannel( *it, vindex[it->mOffset], pMesh);
// store the vertex-data index for later assignment of bone vertex weights // store the vertex-data index for later assignment of bone vertex weights
pMesh->mFacePosIndices.push_back( vindex[perVertexOffset]); pMesh->mFacePosIndices.push_back( vindex[perVertexOffset]);

2
include/aiMesh.h
View File

@ -555,7 +555,7 @@ struct aiMesh
* partitioning. * partitioning.
* - Vertex animations refer to meshes by their names. * - Vertex animations refer to meshes by their names.
**/ **/
aiString mName; C_STRUCT aiString mName;
/** The number of attachment meshes */ /** The number of attachment meshes */
unsigned int mNumAnimMeshes; unsigned int mNumAnimMeshes;