Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IRRMESH/IRR

Browse Source 
- improved handling of materials with multiple textures
  - BUG: lightmapping is now broken for the moment

AssimpView
  - Skyboxes and bg images work again
  - Improved lightmap handling.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@341 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2009-02-11 22:24:17 +00:00
parent c865999420
commit 055c3f0d24
6 changed files with 56 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/IRRMeshLoader.cpp
View File

@@ -217,12 +217,15 @@ void IRRMeshImporter::InternReadFile( const std::string& pFile,
int idx = 1;
MaterialHelper* mat = ( MaterialHelper* ) curMat;
if (curMatFlags & (AI_IRRMESH_MAT_solid_2layer | AI_IRRMESH_MAT_lightmap)){
if (curMatFlags & AI_IRRMESH_MAT_lightmap){
mat->AddProperty(&idx,1,AI_MATKEY_UVWSRC_LIGHTMAP(0));
}
else if (curMatFlags & AI_IRRMESH_MAT_normalmap_solid){
mat->AddProperty(&idx,1,AI_MATKEY_UVWSRC_NORMALS(0));
}
else if (curMatFlags & AI_IRRMESH_MAT_solid_2layer) {
mat->AddProperty(&idx,1,AI_MATKEY_UVWSRC_DIFFUSE(1));
}
}
}
else if (!ASSIMP_stricmp("tangents", t))