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

- Refactorized obj-material-loader: removed duplicated float separation and made it to a template. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@235 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
kimmi 2008-11-09 18:22:01 +00:00
parent d3e9607ab6
commit 06e4262f80
2 changed files with 49 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
code/ObjFileMtlImporter.cpp
View File

@ -189,17 +189,13 @@ void ObjFileMtlImporter::getColorRGBA( aiColor3D *pColor )
ai_assert( NULL != pColor );
float r, g, b;
m_DataIt = CopyNextWord<DataArrayIt>( m_DataIt, m_DataItEnd, m_buffer, BUFFERSIZE );
r = (float) fast_atof(m_buffer);
m_DataIt = CopyNextWord<DataArrayIt>( m_DataIt, m_DataItEnd, m_buffer, BUFFERSIZE );
g = (float) fast_atof(m_buffer);
m_DataIt = CopyNextWord<DataArrayIt>( m_DataIt, m_DataItEnd, m_buffer, BUFFERSIZE );
b = (float) fast_atof(m_buffer);
m_DataIt = getFloat<DataArrayIt>( m_DataIt, m_DataItEnd, r );
pColor->r = r;
m_DataIt = getFloat<DataArrayIt>( m_DataIt, m_DataItEnd, g );
pColor->g = g;
m_DataIt = getFloat<DataArrayIt>( m_DataIt, m_DataItEnd, b );
pColor->b = b;
}

55
code/ObjTools.h
View File

@ -51,10 +51,13 @@ namespace Assimp
* @param token Token to search in
* @return true, if token is a space
*/
inline bool isSpace(char token)
inline bool isSpace( char token )
{
return (token == ' ' || token == '\n' || token == '\f' || token == '\r' ||
token == '\t');
return ( token == ' ' ||
token == '\n' ||
token == '\f' ||
token == '\r' ||
token == '\t' );
}
/** @brief Returns true, fi token id a new line marking token.
@ -72,7 +75,7 @@ inline bool isNewLine( char token )
* @return Pointer to next space
*/
template<class Char_T>
inline Char_T getNextWord(Char_T pBuffer, Char_T pEnd)
inline Char_T getNextWord( Char_T pBuffer, Char_T pEnd )
{
while (pBuffer != pEnd)
{
@ -89,25 +92,25 @@ inline Char_T getNextWord(Char_T pBuffer, Char_T pEnd)
* @return Pointer to next token
*/
template<class Char_T>
inline Char_T getNextToken(Char_T pBuffer, Char_T pEnd)
inline Char_T getNextToken( Char_T pBuffer, Char_T pEnd )
{
while (pBuffer != pEnd)
{
if (isSpace(*pBuffer))
if ( isSpace( *pBuffer ) )
break;
pBuffer++;
}
return getNextWord(pBuffer, pEnd);
return getNextWord( pBuffer, pEnd );
}
/** @brief Skips a line
* @param Iterator set to current position
* @param Iterator set to end of scratch buffer for readout
* @param Current linenumber in format
* @param it Iterator set to current position
* @param end Iterator set to end of scratch buffer for readout
* @param uiLine Current linenumber in format
* @return Current-iterator with new position
*/
template<class char_t>
inline char_t skipLine(char_t it, char_t end, unsigned int &uiLine)
inline char_t skipLine( char_t it, char_t end, unsigned int &uiLine )
{
while ( it != end && *it != '\n' )
++it;
@ -119,6 +122,12 @@ inline char_t skipLine(char_t it, char_t end, unsigned int &uiLine)
return it;
}
/** @brief Get a name, must be separated with a blank.
* @param it set to current position
* @param end set to end of scratch buffer for readout
* @param name Separated name
* @return Current-iterator with new position
*/
template<class char_t>
inline char_t getName( char_t it, char_t end, std::string &name )
{
@ -141,6 +150,13 @@ inline char_t getName( char_t it, char_t end, std::string &name )
return it;
}
/** @brief Get next word from given line
* @param it set to current position
* @param end set to end of scratch buffer for readout
* @param pBuffer Buffer for next word
* @param length Buffer length
* @return Current-iterator with new position
*/
template<class char_t>
inline char_t CopyNextWord( char_t it, char_t end, char *pBuffer, size_t length )
{
@ -158,6 +174,23 @@ inline char_t CopyNextWord( char_t it, char_t end, char *pBuffer, size_t length
return it;
}
/** @brief Get next float from given line
* @param it set to current position
* @param end set to end of scratch buffer for readout
* @param value Separated float value.
* @return Current-iterator with new position
*/
template<class char_t>
inline char_t getFloat( char_t it, char_t end, float &value )
{
static const size_t BUFFERSIZE = 1024;
char buffer[ BUFFERSIZE ];
memset( buffer, '\0', BUFFERSIZE );
it = CopyNextWord<char_t>( it, end, buffer, BUFFERSIZE );
value = (float) fast_atof( buffer );
return it;
}
} // Namespace Assimp