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

Merge pull request #1161 from NolaDonato/spacesinfilenames 

OBJParser: Support spaces in texture file names
pull/1180/head
Kim Kulling 2017-01-31 08:40:36 +01:00 committed by GitHub
parent a046268a67 df5fc5f68d
commit cbaec4cae8
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/ObjTools.h
View File

@ -140,15 +140,13 @@ inline char_t getName( char_t it, char_t end, std::string &name )
} }
char *pStart = &( *it ); char *pStart = &( *it );
while( !isEndOfBuffer( it, end ) && !IsLineEnd( *it ) && !IsSpaceOrNewLine( *it ) ) { while( !isEndOfBuffer( it, end ) && !IsLineEnd( *it )) {
++it; ++it;
} }
/*while( isEndOfBuffer( it, end ) || IsLineEnd( *it ) || IsSpaceOrNewLine( *it ) ) { while(IsSpace( *it ) ) {
--it; --it;
} }
++it;
*/
// Get name // Get name
// if there is no name, and the previous char is a separator, come back to start // if there is no name, and the previous char is a separator, come back to start
while (&(*it) < pStart) { while (&(*it) < pStart) {