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

Added support for compressed x files (all files from dx sdk, except car2.x, work, no further tests yet).

Browse Source 
Added a working makefile for mingw, provides more configs now. Not perfect yet.
Added decompression part of zlib (inflate).
Moved IrrXML to ./contrib dir.
Moved some IRR/IRRmesh shared code.
FIXME: makefile for gnu/linux is untested yet.
Code cleanup.
Unified #ifndef ASSIMP_BUILD_nnn_IMPORTER directives.
OBJ loader supports map_bump, map_ka, map_ks, map_ns now.
Endianess conversion in the ply loader is correct now.
Changed IRR/IRRMESH coordinate system conversion. Not absolutely right now, but better than before.


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@305 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2009-01-18 23:48:25 +00:00
parent 9b83f3b3eb
commit d41f570dc0
84 changed files with 7534 additions and 1280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
code/ObjFileMtlImporter.cpp
View File

@@ -40,15 +40,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "AssimpPCH.h"
#ifndef ASSIMP_BUILD_NO_OBJ_IMPORTER
#include "ObjFileMtlImporter.h"
#include "ObjTools.h"
#include "ObjFileData.h"
#include "fast_atof.h"
namespace Assimp
{
namespace Assimp {
// -------------------------------------------------------------------
// Constructor
@@ -152,6 +151,7 @@ void ObjFileMtlImporter::load()
case 'm': // Texture
case 'b': // quick'n'dirty - for 'bump' sections
{
getTexture();
m_DataIt = skipLine<DataArrayIt>( m_DataIt, m_DataItEnd, m_uiLine );
@@ -244,14 +244,50 @@ void ObjFileMtlImporter::createMaterial()
// Gets a texture name from data.
void ObjFileMtlImporter::getTexture()
{
aiString* out = NULL;
// FIXME: just a quick'n'dirty hack, consider cleanup later
// Diffuse texture
if (!ASSIMP_strincmp(&(*m_DataIt),"map_kd",6))
out = & m_pModel->m_pCurrentMaterial->texture;
// Ambient texture
else if (!ASSIMP_strincmp(&(*m_DataIt),"map_ka",6))
out = & m_pModel->m_pCurrentMaterial->textureAmbient;
// Specular texture
else if (!ASSIMP_strincmp(&(*m_DataIt),"map_ks",6))
out = & m_pModel->m_pCurrentMaterial->textureSpecular;
// Ambient texture
else if (!ASSIMP_strincmp(&(*m_DataIt),"map_ka",6))
out = & m_pModel->m_pCurrentMaterial->textureAmbient;
// Bump texture
else if (!ASSIMP_strincmp(&(*m_DataIt),"map_bump",8) || !ASSIMP_strincmp(&(*m_DataIt),"bump",4))
out = & m_pModel->m_pCurrentMaterial->textureBump;
// Specularity scaling (glossiness)
else if (!ASSIMP_strincmp(&(*m_DataIt),"map_ns",6))
out = & m_pModel->m_pCurrentMaterial->textureSpecularity;
else
{
DefaultLogger::get()->error("OBJ/MTL: Encountered unknown texture type");
return;
}
std::string strTexture;
m_DataIt = getName<DataArrayIt>( m_DataIt, m_DataItEnd, strTexture );
if ( m_DataItEnd == m_DataIt )
return;
m_pModel->m_pCurrentMaterial->texture.Set( strTexture );
out->Set( strTexture );
}
// -------------------------------------------------------------------
} // Namespace Assimp
#endif // !! ASSIMP_BUILD_NO_OBJ_IMPORTER