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

Optimized GenVertexNormal-Step.

Browse Source 
Added SharedPostProcessInfo-class to allow pp-steps to interact with each other.
Used this new feature for some cross-optimization between the steps: SpatialSort is now solely computed once, not up to three times.
3DS bugfix - orientation was wrong.
ASE normal vectors - although they are normally wrong and not orthonormal they are working now.
Fix in fast_atof.h - 1.45E45 (major 'E') is handlded correctly now.
Improvements on jAssimp, still WIP and not working.
Some LightWave bugfixes, still WIP.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@164 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2008-09-27 16:46:05 +00:00
parent a4f2aab6c3
commit 9279513700
41 changed files with 2128 additions and 1128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
code/LWOBLoader.cpp
View File

@@ -192,6 +192,18 @@ void LWOImporter::CopyFaceIndicesLWOB(FaceList::iterator& it,
}
}
// ------------------------------------------------------------------------------------------------
LWO::Texture* LWOImporter::SetupNewTextureLWOB(LWO::TextureList& list,unsigned int size)
{
list.push_back(LWO::Texture());
LWO::Texture* tex = &list.back();
std::string type;
GetS0(type,size);
return tex;
}
// ------------------------------------------------------------------------------------------------
void LWOImporter::LoadLWOBSurface(unsigned int size)
{
@@ -278,39 +290,39 @@ void LWOImporter::LoadLWOBSurface(unsigned int size)
// color texture
case AI_LWO_CTEX:
{
surf.mColorTextures.push_back(Texture());
pTex = &surf.mColorTextures.back();
pTex = SetupNewTextureLWOB(surf.mColorTextures,
head->length);
break;
}
// diffuse texture
case AI_LWO_DTEX:
{
surf.mDiffuseTextures.push_back(Texture());
pTex = &surf.mDiffuseTextures.back();
pTex = SetupNewTextureLWOB(surf.mDiffuseTextures,
head->length);
break;
}
// specular texture
case AI_LWO_STEX:
{
surf.mSpecularTextures.push_back(Texture());
pTex = &surf.mSpecularTextures.back();
pTex = SetupNewTextureLWOB(surf.mSpecularTextures,
head->length);
break;
}
// bump texture
case AI_LWO_BTEX:
{
surf.mBumpTextures.push_back(Texture());
pTex = &surf.mBumpTextures.back();
pTex = SetupNewTextureLWOB(surf.mBumpTextures,
head->length);
break;
}
// transparency texture
case AI_LWO_TTEX:
{
surf.mOpacityTextures.push_back(Texture());
pTex = &surf.mOpacityTextures.back();
pTex = SetupNewTextureLWOB(surf.mOpacityTextures,
head->length);
break;
}
// texture path
// texture path
case AI_LWO_TIMG:
{
if (pTex)