2
0
Эх сурвалжийг харах

Merge pull request #1161 from NolaDonato/spacesinfilenames

OBJParser: Support spaces in texture file names
Kim Kulling 8 жил өмнө
parent
commit
cbaec4cae8
1 өөрчлөгдсөн 2 нэмэгдсэн , 4 устгасан
  1. 2 4
      code/ObjTools.h

+ 2 - 4
code/ObjTools.h

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