- anonym XFile materials are named now, to prevent them from being merged somehow
- added another boost dependency - lexical_cast - and a little replacement for all those boost haters out there git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@826 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
@@ -128,6 +128,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#include <boost/format.hpp>
|
||||
#include <boost/foreach.hpp>
|
||||
#include <boost/static_assert.hpp>
|
||||
#include <boost/lexical_cast.hpp>
|
||||
|
||||
// Public ASSIMP headers
|
||||
#include "../include/DefaultLogger.h"
|
||||
|
||||
23
code/BoostWorkaround/boost/lexical_cast.hpp
Normal file
23
code/BoostWorkaround/boost/lexical_cast.hpp
Normal file
@@ -0,0 +1,23 @@
|
||||
/// A quick replacement for boost::lexical_cast for all the Boost haters out there
|
||||
|
||||
#ifndef __AI_BOOST_WORKAROUND_LEXICAL_CAST
|
||||
#define __AI_BOOST_WORKAROUND_LEXICAL_CAST
|
||||
|
||||
namespace boost
|
||||
{
|
||||
|
||||
/// A quick replacement for boost::lexical_cast - should work for all types a stringstream can handle
|
||||
template <typename TargetType, typename SourceType>
|
||||
TargetType lexical_cast( const SourceType& source)
|
||||
{
|
||||
std::stringstream stream;
|
||||
TargetType result;
|
||||
|
||||
stream << source;
|
||||
stream >> result;
|
||||
return result;
|
||||
}
|
||||
|
||||
} // namespace boost
|
||||
|
||||
#endif // __AI_BOOST_WORKAROUND_LEXICAL_CAST
|
||||
@@ -710,6 +710,8 @@ void XFileParser::ParseDataObjectMaterial( Material* pMaterial)
|
||||
{
|
||||
std::string matName;
|
||||
readHeadOfDataObject( &matName);
|
||||
if( matName.empty())
|
||||
matName = std::string( "material") + boost::lexical_cast<std::string>( mLineNumber);
|
||||
pMaterial->mName = matName;
|
||||
pMaterial->mIsReference = false;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user