- finished support for multi-part player models
 - skin files are now read 
 - shaders are parsed, but not yet processed yet

DefaultIOSystem
 - file size is now cached over multiple calls to FileSize()

MaterialSystem
 - added AI_MATKEY_BLEND_FUNC property and the aiBlendMode enum to allow MD3 and Collada to pass transparency information correctly.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@346 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2009-02-13 22:03:57 +00:00
parent d70c092b71
commit 2b9461fbf7
10 changed files with 729 additions and 266 deletions

View File

@@ -360,7 +360,7 @@ protected:
// -------------------------------------------------------------------
inline bool SkipLine( const char* in, const char** out)
{
::SkipLine(in,out);
Assimp::SkipLine(in,out);
++iLineNumber;
return true;
}
@@ -368,7 +368,7 @@ protected:
inline bool SkipSpacesAndLineEnd( const char* in, const char** out)
{
++iLineNumber;
return ::SkipSpacesAndLineEnd(in,out);
return Assimp::SkipSpacesAndLineEnd(in,out);
}
private: