From e23767a170644184d5207e0669fc7cbe2a271f7b Mon Sep 17 00:00:00 2001 From: kimmi Date: Wed, 11 May 2011 17:28:12 +0000 Subject: [PATCH] Bugfix : Set right extension for Q3bsp loader git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1001 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/Q3BSPFileImporter.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/code/Q3BSPFileImporter.cpp b/code/Q3BSPFileImporter.cpp index 9c884053b..3b0046a1a 100644 --- a/code/Q3BSPFileImporter.cpp +++ b/code/Q3BSPFileImporter.cpp @@ -658,9 +658,9 @@ bool Q3BSPFileImporter::importTextureFromArchive( const Q3BSP::Q3BSPModel *pMode size_t readSize = pTextureStream->Read( pData, sizeof( unsigned char ), pTexture->mWidth ); ai_assert( readSize == pTexture->mWidth ); pTexture->pcData = reinterpret_cast( pData ); - pTexture->achFormatHint[ 0 ] = 'j'; - pTexture->achFormatHint[ 1 ] = 'p'; - pTexture->achFormatHint[ 2 ] = 'g'; + pTexture->achFormatHint[ 0 ] = ext[ 0 ]; + pTexture->achFormatHint[ 1 ] = ext[ 1 ]; + pTexture->achFormatHint[ 2 ] = ext[ 2 ]; pTexture->achFormatHint[ 2 ] = '\0'; res = true; @@ -734,6 +734,13 @@ bool Q3BSPFileImporter::importLightmap( const Q3BSP::Q3BSPModel *pModel, aiScene return true; } +// ------------------------------------------------------------------------------------------------ +// Imports the entities. +bool Q3BSPFileImporter::importEntities( const Q3BSP::Q3BSPModel *pModel, aiScene* pScene ) +{ + return true; +} + // ------------------------------------------------------------------------------------------------ // Will search for a supported extension. bool Q3BSPFileImporter::expandFile( Q3BSP::Q3BSPZipArchive *pArchive, const std::string &rFilename,