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

Bugfix: Collada loader now reads scenes with translucent materials correctly again. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@365 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
ulfjorensen 2009-03-12 14:15:57 +00:00
parent de50bb915b
commit 68d7e43056
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
code/ColladaLoader.cpp
View File

@ -747,25 +747,25 @@ void ColladaLoader::FillMaterials( const ColladaParser& pParser, aiScene* pScene
// add textures, if given // add textures, if given
if( !effect.mTexAmbient.mName.empty()) if( !effect.mTexAmbient.mName.empty())
/* It is merely a lightmap */ /* It is merely a lightmap */
AddTexture( mat, pParser, effect, effect.mTexAmbient,aiTextureType_LIGHTMAP); AddTexture( mat, pParser, effect, effect.mTexAmbient, aiTextureType_LIGHTMAP);
if( !effect.mTexEmissive.mName.empty()) if( !effect.mTexEmissive.mName.empty())
AddTexture( mat, pParser, effect, effect.mTexEmissive,aiTextureType_EMISSIVE); AddTexture( mat, pParser, effect, effect.mTexEmissive, aiTextureType_EMISSIVE);
if( !effect.mTexSpecular.mName.empty()) if( !effect.mTexSpecular.mName.empty())
AddTexture( mat, pParser, effect, effect.mTexSpecular,aiTextureType_SPECULAR); AddTexture( mat, pParser, effect, effect.mTexSpecular, aiTextureType_SPECULAR);
if( !effect.mTexDiffuse.mName.empty()) if( !effect.mTexDiffuse.mName.empty())
AddTexture( mat, pParser, effect, effect.mTexDiffuse,aiTextureType_DIFFUSE); AddTexture( mat, pParser, effect, effect.mTexDiffuse, aiTextureType_DIFFUSE);
if( !effect.mTexBump.mName.empty()) if( !effect.mTexBump.mName.empty())
AddTexture( mat, pParser, effect, effect.mTexBump,aiTextureType_HEIGHT); AddTexture( mat, pParser, effect, effect.mTexBump, aiTextureType_HEIGHT);
if( !effect.mTexTransparent.mName.empty()) if( !effect.mTexTransparent.mName.empty())
AddTexture( mat, pParser, effect, effect.mTexBump,aiTextureType_OPACITY); AddTexture( mat, pParser, effect, effect.mTexTransparent, aiTextureType_OPACITY);
if( !effect.mTexReflective.mName.empty()) if( !effect.mTexReflective.mName.empty())
AddTexture( mat, pParser, effect, effect.mTexReflective,aiTextureType_REFLECTION); AddTexture( mat, pParser, effect, effect.mTexReflective, aiTextureType_REFLECTION);
} }
} }