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

12
code/TextureTransform.cpp
View File

@@ -283,9 +283,7 @@ void TextureTransformStep::Execute( aiScene* pScene)
{
// ValidateDS should check this
ai_assert(prop2->mDataLength >= 20);
::memcpy(&info.mTranslation.x,prop2->mData,sizeof(float)*5);
delete[] prop2->mData;
// Directly remove this property from the list
@@ -344,11 +342,8 @@ void TextureTransformStep::Execute( aiScene* pScene)
uv = 0;
}
if (mesh->mNumUVComponents[info.uvIndex] >= 3)
{
DefaultLogger::get()->warn("UV transformations on 3D mapping channels "
"are not supported by this step");
if (mesh->mNumUVComponents[info.uvIndex] >= 3){
DefaultLogger::get()->warn("UV transformations on 3D mapping channels are not supported");
continue;
}
@@ -357,8 +352,7 @@ void TextureTransformStep::Execute( aiScene* pScene)
// Check whether we have this transform setup already
for (it = meshLists[n].begin();it != meshLists[n].end(); ++it)
{
if ((*it) == info && (*it).uvIndex == uv)
{
if ((*it) == info && (*it).uvIndex == uv) {
(*it).updateList.push_back(update);
break;
}