From 9f6238f3af3a013ac77bb2da285167abcc84338b Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Sat, 22 Sep 2018 15:50:40 +0200 Subject: [PATCH 1/4] INtroduce unittests. --- code/Q3BSPFileData.h | 17 ++--- code/Q3BSPFileImporter.cpp | 60 ++++++++-------- code/Q3BSPFileImporter.h | 6 +- code/Q3BSPFileParser.cpp | 3 +- test/CMakeLists.txt | 3 + test/models-nonbsd/PK3/SGDTT3.pk3 | Bin 314762 -> 314764 bytes test/unit/ImportExport/utOgreImportExport.cpp | 64 ++++++++++++++++++ .../ImportExport/utQ3BSPFileImportExport.cpp | 64 ++++++++++++++++++ 8 files changed, 170 insertions(+), 47 deletions(-) create mode 100644 test/unit/ImportExport/utOgreImportExport.cpp create mode 100644 test/unit/ImportExport/utQ3BSPFileImportExport.cpp diff --git a/code/Q3BSPFileData.h b/code/Q3BSPFileData.h index eb3a1444a..d814837c2 100644 --- a/code/Q3BSPFileData.h +++ b/code/Q3BSPFileData.h @@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define ASSIMP_Q3BSPFILEDATA_H_INC #include -#include //memset +#include #include namespace Assimp { @@ -77,25 +77,21 @@ struct sQ3BSPHeader { }; /// Describes an entry. -struct sQ3BSPLump -{ +struct sQ3BSPLump { int iOffset; ///< Offset from start pointer of file int iSize; ///< Size of part }; -struct vec2f -{ +struct vec2f { float x,y; }; -struct vec3f -{ +struct vec3f { float x, y, z; }; /// Vertex of a Q3 level -struct sQ3BSPVertex -{ +struct sQ3BSPVertex { vec3f vPosition; ///< Position of vertex vec2f vTexCoord; ///< (u,v) Texturecoordinate of detailtexture vec2f vLightmap; ///< (u,v) Texturecoordinate of lightmap @@ -104,8 +100,7 @@ struct sQ3BSPVertex }; /// A face in bsp format info -struct sQ3BSPFace -{ +struct sQ3BSPFace { int iTextureID; ///< Index in texture array int iEffect; ///< Index in effect array (-1 = no effect) int iType; ///< 1=Polygon, 2=Patch, 3=Mesh, 4=Billboard diff --git a/code/Q3BSPFileImporter.cpp b/code/Q3BSPFileImporter.cpp index aad2bf93c..c06636df0 100644 --- a/code/Q3BSPFileImporter.cpp +++ b/code/Q3BSPFileImporter.cpp @@ -82,39 +82,39 @@ using namespace Q3BSP; // ------------------------------------------------------------------------------------------------ // Local function to create a material key name. -static void createKey( int id1, int id2, std::string &rKey ) -{ +static void createKey( int id1, int id2, std::string &key ) { std::ostringstream str; str << id1 << "." << id2; - rKey = str.str(); + key = str.str(); } // ------------------------------------------------------------------------------------------------ // Local function to extract the texture ids from a material key-name. -static void extractIds( const std::string &rKey, int &rId1, int &rId2 ) -{ - rId1 = -1; - rId2 = -1; - if ( rKey.empty() ) +static void extractIds( const std::string &key, int &id1, int &id2 ) { + id1 = -1; + id2 = -1; + if (key.empty()) { return; + } - std::string::size_type pos = rKey.find( "." ); - if ( std::string::npos == pos ) + const std::string::size_type pos = key.find( "." ); + if (std::string::npos == pos) { return; + } - std::string tmp1 = rKey.substr( 0, pos ); - std::string tmp2 = rKey.substr( pos + 1, rKey.size() - pos - 1 ); - rId1 = atoi( tmp1.c_str() ); - rId2 = atoi( tmp2.c_str() ); + std::string tmp1 = key.substr( 0, pos ); + std::string tmp2 = key.substr( pos + 1, key.size() - pos - 1 ); + id1 = atoi( tmp1.c_str() ); + id2 = atoi( tmp2.c_str() ); } // ------------------------------------------------------------------------------------------------ // Local helper function to normalize filenames. -static void normalizePathName( const std::string &rPath, std::string &rNormalizedPath ) -{ - rNormalizedPath = ""; - if ( rPath.empty() ) +static void normalizePathName( const std::string &rPath, std::string &normalizedPath ) { + normalizedPath = ""; + if (rPath.empty()) { return; + } #ifdef _WIN32 std::string sep = "\\"; @@ -124,14 +124,11 @@ static void normalizePathName( const std::string &rPath, std::string &rNormalize static const unsigned int numDelimiters = 2; const char delimiters[ numDelimiters ] = { '/', '\\' }; - rNormalizedPath = rPath; - for (const char delimiter : delimiters) - { - for ( size_t j=0; j #include +#include struct aiMesh; struct aiNode; @@ -53,6 +54,7 @@ struct aiMaterial; struct aiTexture; namespace Assimp { + namespace Q3BSP { class Q3BSPZipArchive; struct Q3BSPModel; @@ -71,12 +73,11 @@ public: /// @brief Destructor. ~Q3BSPFileImporter(); -public: /// @brief Returns whether the class can handle the format of the given file. /// @remark See BaseImporter::CanRead() for details. bool CanRead( const std::string& pFile, IOSystem* pIOHandler, bool checkSig ) const; -private: +protected: typedef std::map*> FaceMap; typedef std::map* >::iterator FaceMapIt; typedef std::map*>::const_iterator FaceMapConstIt; @@ -115,5 +116,4 @@ private: } // Namespace Assimp - #endif // ASSIMP_Q3BSPFILEIMPORTER_H_INC diff --git a/code/Q3BSPFileParser.cpp b/code/Q3BSPFileParser.cpp index c53280cb5..f4aea28e6 100644 --- a/code/Q3BSPFileParser.cpp +++ b/code/Q3BSPFileParser.cpp @@ -103,8 +103,7 @@ bool Q3BSPFileParser::readData( const std::string &rMapName ) m_Data.resize( size ); const size_t readSize = pMapFile->Read( &m_Data[0], sizeof( char ), size ); - if ( readSize != size ) - { + if ( readSize != size ) { m_Data.clear(); return false; } diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 2c1496d65..687432085 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -118,6 +118,8 @@ SET( IMPORTERS unit/utMDCImportExport.cpp unit/utAssbinImportExport.cpp unit/ImportExport/utCOBImportExport.cpp + unit/ImportExport/utOgreImportExport.cpp + unit/ImportExport/utQ3BSPFileImportExport.cpp ) SET( MATERIAL @@ -175,6 +177,7 @@ add_executable( unit ) add_definitions(-DASSIMP_TEST_MODELS_DIR="${CMAKE_CURRENT_LIST_DIR}/models") +add_definitions(-DASSIMP_TEST_MODELS_NONBSD_DIR="${CMAKE_CURRENT_LIST_DIR}/models-nonbsd") SET_PROPERTY( TARGET assimp PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX} ) diff --git a/test/models-nonbsd/PK3/SGDTT3.pk3 b/test/models-nonbsd/PK3/SGDTT3.pk3 index 3eeb015c32ccc14a97fdbecb3fd4cabdf2587fea..0d997e5d92421a0a509d637f0ffaea1117b761e2 100644 GIT binary patch delta 33 ncmeC0E!;C(xS@ryg{g&k3roNRM&9iK6Ig@=fpqdh7Ihr}y(0<= delta 29 lcmeB~E!;I*xS@ryg{g&k3roO+?ST_mgax;!E@V;H0RW&D3Gn~` diff --git a/test/unit/ImportExport/utOgreImportExport.cpp b/test/unit/ImportExport/utOgreImportExport.cpp new file mode 100644 index 000000000..1950fc90a --- /dev/null +++ b/test/unit/ImportExport/utOgreImportExport.cpp @@ -0,0 +1,64 @@ +/* +--------------------------------------------------------------------------- +Open Asset Import Library (assimp) +--------------------------------------------------------------------------- + +Copyright (c) 2006-2018, assimp team + + + +All rights reserved. + +Redistribution and use of this software in source and binary forms, +with or without modification, are permitted provided that the following +conditions are met: + +* Redistributions of source code must retain the above +copyright notice, this list of conditions and the +following disclaimer. + +* Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the +following disclaimer in the documentation and/or other +materials provided with the distribution. + +* Neither the name of the assimp team, nor the names of its +contributors may be used to endorse or promote products +derived from this software without specific prior +written permission of the assimp team. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--------------------------------------------------------------------------- +*/ + +#include "UnitTestPCH.h" +#include "SceneDiffer.h" +#include "AbstractImportExportBase.h" + +#include +#include + +using namespace Assimp; + +class utOgreImportExport : public AbstractImportExportBase { +public: + virtual bool importerTest() { + Assimp::Importer importer; + const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/Ogre/TheThing/Mesh.mesh.xml", aiProcess_ValidateDataStructure); + return nullptr != scene; + } +}; + +TEST_F(utOgreImportExport, importerTest ) { + EXPECT_TRUE(importerTest()); +} diff --git a/test/unit/ImportExport/utQ3BSPFileImportExport.cpp b/test/unit/ImportExport/utQ3BSPFileImportExport.cpp new file mode 100644 index 000000000..ba12652b4 --- /dev/null +++ b/test/unit/ImportExport/utQ3BSPFileImportExport.cpp @@ -0,0 +1,64 @@ +/* +--------------------------------------------------------------------------- +Open Asset Import Library (assimp) +--------------------------------------------------------------------------- + +Copyright (c) 2006-2018, assimp team + + + +All rights reserved. + +Redistribution and use of this software in source and binary forms, +with or without modification, are permitted provided that the following +conditions are met: + +* Redistributions of source code must retain the above +copyright notice, this list of conditions and the +following disclaimer. + +* Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the +following disclaimer in the documentation and/or other +materials provided with the distribution. + +* Neither the name of the assimp team, nor the names of its +contributors may be used to endorse or promote products +derived from this software without specific prior +written permission of the assimp team. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--------------------------------------------------------------------------- +*/ + +#include "UnitTestPCH.h" +#include "SceneDiffer.h" +#include "AbstractImportExportBase.h" + +#include +#include + +using namespace Assimp; + +class utQ3BSPImportExport : public AbstractImportExportBase { +public: + virtual bool importerTest() { + Assimp::Importer importer; + const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_NONBSD_DIR "/PK3/SGDTT3.pk3", 0); + return nullptr != scene; + } +}; + +TEST_F(utQ3BSPImportExport, importerTest) { + EXPECT_TRUE(importerTest()); +} From 6146ff818c726b3e846bf40038fd74562ab66a55 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 25 Sep 2018 20:15:48 +0200 Subject: [PATCH 2/4] Enable coveralls for export tests. --- .travis.yml | 3 +- code/Q3BSPFileImporter.cpp | 161 +++++++++++++++---------------------- 2 files changed, 65 insertions(+), 99 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0b8d2f328..e768c530c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,7 +51,8 @@ matrix: env: ANALYZE=ON - os: linux compiler: gcc - env: DISABLE_EXPORTERS=YES ENABLE_COVERALLS=ON +# env: DISABLE_EXPORTERS=YES ENABLE_COVERALLS=ON + env: ENABLE_COVERALLS=ON - os: linux compiler: gcc env: SHARED_BUILD=ON diff --git a/code/Q3BSPFileImporter.cpp b/code/Q3BSPFileImporter.cpp index c06636df0..e6672596a 100644 --- a/code/Q3BSPFileImporter.cpp +++ b/code/Q3BSPFileImporter.cpp @@ -137,12 +137,10 @@ static void normalizePathName( const std::string &rPath, std::string &normalized // ------------------------------------------------------------------------------------------------ // Constructor. Q3BSPFileImporter::Q3BSPFileImporter() -: - m_pCurrentMesh( nullptr ), - m_pCurrentFace(nullptr), - m_MaterialLookupMap(), - mTextures() -{ +: m_pCurrentMesh( nullptr ) +, m_pCurrentFace(nullptr) +, m_MaterialLookupMap() +, mTextures() { // empty } @@ -164,48 +162,41 @@ Q3BSPFileImporter::~Q3BSPFileImporter() { // ------------------------------------------------------------------------------------------------ // Returns true, if the loader can read this. -bool Q3BSPFileImporter::CanRead( const std::string& rFile, IOSystem* /*pIOHandler*/, bool checkSig ) const -{ +bool Q3BSPFileImporter::CanRead( const std::string& rFile, IOSystem* /*pIOHandler*/, bool checkSig ) const { if(!checkSig) { return SimpleExtensionCheck( rFile, "pk3", "bsp" ); } - // TODO perhaps add keyword based detection + return false; } // ------------------------------------------------------------------------------------------------ // Adds extensions. -const aiImporterDesc* Q3BSPFileImporter::GetInfo () const -{ +const aiImporterDesc* Q3BSPFileImporter::GetInfo () const { return &desc; } // ------------------------------------------------------------------------------------------------ // Import method. -void Q3BSPFileImporter::InternReadFile(const std::string &rFile, aiScene* pScene, IOSystem* pIOHandler) -{ - Q3BSPZipArchive Archive( pIOHandler, rFile ); - if ( !Archive.isOpen() ) - { +void Q3BSPFileImporter::InternReadFile(const std::string &rFile, aiScene* scene, IOSystem* ioHandler) { + Q3BSPZipArchive Archive( ioHandler, rFile ); + if ( !Archive.isOpen() ) { throw DeadlyImportError( "Failed to open file " + rFile + "." ); } std::string archiveName( "" ), mapName( "" ); separateMapName( rFile, archiveName, mapName ); - if ( mapName.empty() ) - { - if ( !findFirstMapInArchive( Archive, mapName ) ) - { + if ( mapName.empty() ) { + if ( !findFirstMapInArchive( Archive, mapName ) ) { return; } } Q3BSPFileParser fileParser( mapName, &Archive ); Q3BSPModel *pBSPModel = fileParser.getModel(); - if ( NULL != pBSPModel ) - { - CreateDataFromImport( pBSPModel, pScene, &Archive ); + if ( nullptr != pBSPModel ) { + CreateDataFromImport( pBSPModel, scene, &Archive ); } } @@ -405,64 +396,50 @@ aiNode *Q3BSPFileImporter::CreateTopology( const Q3BSP::Q3BSPModel *pModel, // ------------------------------------------------------------------------------------------------ // Creates the triangle topology from a face array. -void Q3BSPFileImporter::createTriangleTopology( const Q3BSP::Q3BSPModel *pModel, - Q3BSP::sQ3BSPFace *pQ3BSPFace, - aiMesh* pMesh, - unsigned int &rFaceIdx, - unsigned int &rVertIdx ) -{ - ai_assert( rFaceIdx < pMesh->mNumFaces ); +void Q3BSPFileImporter::createTriangleTopology( const Q3BSP::Q3BSPModel *pModel, sQ3BSPFace *pQ3BSPFace, + aiMesh* pMesh, unsigned int &faceIdx, unsigned int &vertIdx ) { + ai_assert( faceIdx < pMesh->mNumFaces ); - m_pCurrentFace = getNextFace( pMesh, rFaceIdx ); - ai_assert( NULL != m_pCurrentFace ); - if ( NULL == m_pCurrentFace ) - { + m_pCurrentFace = getNextFace( pMesh, faceIdx ); + if ( nullptr == m_pCurrentFace ) { return; } m_pCurrentFace->mNumIndices = 3; m_pCurrentFace->mIndices = new unsigned int[ m_pCurrentFace->mNumIndices ]; - size_t idx = 0; - for ( size_t i = 0; i < (size_t) pQ3BSPFace->iNumOfFaceVerts; i++ ) - { + size_t idx( 0 ); + for ( size_t i = 0; i < (size_t) pQ3BSPFace->iNumOfFaceVerts; ++i ) { const size_t index = pQ3BSPFace->iVertexIndex + pModel->m_Indices[ pQ3BSPFace->iFaceVertexIndex + i ]; - ai_assert( index < pModel->m_Vertices.size() ); - if ( index >= pModel->m_Vertices.size() ) - { + if ( index >= pModel->m_Vertices.size() ) { continue; } sQ3BSPVertex *pVertex = pModel->m_Vertices[ index ]; - ai_assert( NULL != pVertex ); - if ( NULL == pVertex ) - { + if ( nullptr == pVertex ) { continue; } - pMesh->mVertices[ rVertIdx ].Set( pVertex->vPosition.x, pVertex->vPosition.y, pVertex->vPosition.z ); - pMesh->mNormals[ rVertIdx ].Set( pVertex->vNormal.x, pVertex->vNormal.y, pVertex->vNormal.z ); + pMesh->mVertices[ vertIdx ].Set( pVertex->vPosition.x, pVertex->vPosition.y, pVertex->vPosition.z ); + pMesh->mNormals[ vertIdx ].Set( pVertex->vNormal.x, pVertex->vNormal.y, pVertex->vNormal.z ); - pMesh->mTextureCoords[ 0 ][ rVertIdx ].Set( pVertex->vTexCoord.x, pVertex->vTexCoord.y, 0.0f ); - pMesh->mTextureCoords[ 1 ][ rVertIdx ].Set( pVertex->vLightmap.x, pVertex->vLightmap.y, 0.0f ); + pMesh->mTextureCoords[ 0 ][ vertIdx ].Set( pVertex->vTexCoord.x, pVertex->vTexCoord.y, 0.0f ); + pMesh->mTextureCoords[ 1 ][ vertIdx ].Set( pVertex->vLightmap.x, pVertex->vLightmap.y, 0.0f ); - ai_assert( m_pCurrentFace ); - m_pCurrentFace->mIndices[ idx ] = rVertIdx; - rVertIdx++; + m_pCurrentFace->mIndices[ idx ] = vertIdx; + vertIdx++; idx++; - if ( idx > 2 ) - { + if ( idx > 2 ) { idx = 0; - m_pCurrentFace = getNextFace( pMesh, rFaceIdx ); - if ( NULL != m_pCurrentFace ) - { + m_pCurrentFace = getNextFace( pMesh, faceIdx ); + if ( nullptr != m_pCurrentFace ) { m_pCurrentFace->mNumIndices = 3; m_pCurrentFace->mIndices = new unsigned int[ 3 ]; } } } - rFaceIdx--; + //faceIdx--; } // ------------------------------------------------------------------------------------------------ @@ -470,8 +447,7 @@ void Q3BSPFileImporter::createTriangleTopology( const Q3BSP::Q3BSPModel *pModel, void Q3BSPFileImporter::createMaterials( const Q3BSP::Q3BSPModel *pModel, aiScene* pScene, Q3BSPZipArchive *pArchive ) { - if ( m_MaterialLookupMap.empty() ) - { + if ( m_MaterialLookupMap.empty() ) { return; } @@ -479,11 +455,9 @@ void Q3BSPFileImporter::createMaterials( const Q3BSP::Q3BSPModel *pModel, aiScen aiString aiMatName; int textureId( -1 ), lightmapId( -1 ); for ( FaceMapIt it = m_MaterialLookupMap.begin(); it != m_MaterialLookupMap.end(); - ++it ) - { - const std::string matName = (*it).first; - if ( matName.empty() ) - { + ++it ) { + const std::string matName( it->first ); + if ( matName.empty() ) { continue; } @@ -524,17 +498,16 @@ void Q3BSPFileImporter::createMaterials( const Q3BSP::Q3BSPModel *pModel, aiScen // ------------------------------------------------------------------------------------------------ // Counts the number of referenced vertices. -size_t Q3BSPFileImporter::countData( const std::vector &rArray ) const -{ - size_t numVerts = 0; - for ( std::vector::const_iterator it = rArray.begin(); it != rArray.end(); +size_t Q3BSPFileImporter::countData( const std::vector &faceArray ) const { + size_t numVerts( 0 ); + for ( std::vector::const_iterator it = faceArray.begin(); it != faceArray.end(); ++it ) { sQ3BSPFace *pQ3BSPFace = *it; if ( pQ3BSPFace->iType == Polygon || pQ3BSPFace->iType == TriangleMesh ) { Q3BSP::sQ3BSPFace *pQ3BSPFace = *it; - ai_assert( NULL != pQ3BSPFace ); + ai_assert( nullptr != pQ3BSPFace ); numVerts += pQ3BSPFace->iNumOfFaceVerts; } } @@ -580,8 +553,7 @@ size_t Q3BSPFileImporter::countTriangles( const std::vector // ------------------------------------------------------------------------------------------------ // Creates the faces-to-material map. -void Q3BSPFileImporter::createMaterialMap( const Q3BSP::Q3BSPModel *pModel ) -{ +void Q3BSPFileImporter::createMaterialMap( const Q3BSP::Q3BSPModel *pModel ) { std::string key( "" ); std::vector *pCurFaceArray = NULL; for ( size_t idx = 0; idx < pModel->m_Faces.size(); idx++ ) @@ -591,8 +563,7 @@ void Q3BSPFileImporter::createMaterialMap( const Q3BSP::Q3BSPModel *pModel ) const int lightMapId = pQ3BSPFace->iLightmapID; createKey( texId, lightMapId, key ); FaceMapIt it = m_MaterialLookupMap.find( key ); - if ( m_MaterialLookupMap.end() == it ) - { + if ( m_MaterialLookupMap.end() == it ) { pCurFaceArray = new std::vector; m_MaterialLookupMap[ key ] = pCurFaceArray; } @@ -600,8 +571,8 @@ void Q3BSPFileImporter::createMaterialMap( const Q3BSP::Q3BSPModel *pModel ) { pCurFaceArray = (*it).second; } - ai_assert( NULL != pCurFaceArray ); - if ( NULL != pCurFaceArray ) + ai_assert( nullptr != pCurFaceArray ); + if (nullptr != pCurFaceArray ) { pCurFaceArray->push_back( pQ3BSPFace ); } @@ -610,32 +581,31 @@ void Q3BSPFileImporter::createMaterialMap( const Q3BSP::Q3BSPModel *pModel ) // ------------------------------------------------------------------------------------------------ // Returns the next face. -aiFace *Q3BSPFileImporter::getNextFace( aiMesh *pMesh, unsigned int &rFaceIdx ) -{ - aiFace *pFace( NULL ); - if ( rFaceIdx < pMesh->mNumFaces ) { - pFace = &pMesh->mFaces[ rFaceIdx ]; - rFaceIdx++; +aiFace *Q3BSPFileImporter::getNextFace( aiMesh *mesh, unsigned int &faceIdx ) { + aiFace *face( nullptr ); + if ( faceIdx < mesh->mNumFaces ) { + face = &mesh->mFaces[ faceIdx ]; + ++faceIdx; } - return pFace; + return face; } // ------------------------------------------------------------------------------------------------ // Imports a texture file. -bool Q3BSPFileImporter::importTextureFromArchive( const Q3BSP::Q3BSPModel *pModel, - Q3BSP::Q3BSPZipArchive *pArchive, aiScene*, +bool Q3BSPFileImporter::importTextureFromArchive( const Q3BSP::Q3BSPModel *model, + Q3BSP::Q3BSPZipArchive *archive, aiScene*, aiMaterial *pMatHelper, int textureId ) { - if ( NULL == pArchive || NULL == pMatHelper ) { + if (nullptr == archive || nullptr == pMatHelper ) { return false; } - if ( textureId < 0 || textureId >= static_cast( pModel->m_Textures.size() ) ) { + if ( textureId < 0 || textureId >= static_cast( model->m_Textures.size() ) ) { return false; } bool res = true; - sQ3BSPTexture *pTexture = pModel->m_Textures[ textureId ]; + sQ3BSPTexture *pTexture = model->m_Textures[ textureId ]; if ( !pTexture ) { return false; } @@ -645,8 +615,8 @@ bool Q3BSPFileImporter::importTextureFromArchive( const Q3BSP::Q3BSPModel *pMode supportedExtensions.push_back( ".png" ); supportedExtensions.push_back( ".tga" ); std::string textureName, ext; - if ( expandFile( pArchive, pTexture->strName, supportedExtensions, textureName, ext ) ) { - IOStream *pTextureStream = pArchive->Open( textureName.c_str() ); + if ( expandFile( archive, pTexture->strName, supportedExtensions, textureName, ext ) ) { + IOStream *pTextureStream = archive->Open( textureName.c_str() ); if ( pTextureStream ) { size_t texSize = pTextureStream->FileSize(); aiTexture *pTexture = new aiTexture; @@ -667,7 +637,7 @@ bool Q3BSPFileImporter::importTextureFromArchive( const Q3BSP::Q3BSPModel *pMode name.data[ 0 ] = '*'; name.length = 1 + ASSIMP_itoa10( name.data + 1, static_cast(MAXLEN-1), static_cast(mTextures.size()) ); - pArchive->Close( pTextureStream ); + archive->Close( pTextureStream ); pMatHelper->AddProperty( &name, AI_MATKEY_TEXTURE_DIFFUSE( 0 ) ); mTextures.push_back( pTexture ); @@ -689,19 +659,16 @@ bool Q3BSPFileImporter::importTextureFromArchive( const Q3BSP::Q3BSPModel *pMode bool Q3BSPFileImporter::importLightmap( const Q3BSP::Q3BSPModel *pModel, aiScene* pScene, aiMaterial *pMatHelper, int lightmapId ) { - if ( NULL == pModel || NULL == pScene || NULL == pMatHelper ) - { + if (nullptr == pModel || nullptr == pScene || nullptr == pMatHelper ) { return false; } - if ( lightmapId < 0 || lightmapId >= static_cast( pModel->m_Lightmaps.size() ) ) - { + if ( lightmapId < 0 || lightmapId >= static_cast( pModel->m_Lightmaps.size() ) ) { return false; } sQ3BSPLightmap *pLightMap = pModel->m_Lightmaps[ lightmapId ]; - if ( NULL == pLightMap ) - { + if (nullptr == pLightMap ) { return false; } @@ -713,8 +680,7 @@ bool Q3BSPFileImporter::importLightmap( const Q3BSP::Q3BSPModel *pModel, aiScene ::memcpy( pTexture->pcData, pLightMap->bLMapData, pTexture->mWidth ); size_t p = 0; - for ( size_t i = 0; i < CE_BSP_LIGHTMAPWIDTH * CE_BSP_LIGHTMAPHEIGHT; ++i ) - { + for ( size_t i = 0; i < CE_BSP_LIGHTMAPWIDTH * CE_BSP_LIGHTMAPHEIGHT; ++i ) { pTexture->pcData[ i ].r = pLightMap->bLMapData[ p++ ]; pTexture->pcData[ i ].g = pLightMap->bLMapData[ p++ ]; pTexture->pcData[ i ].b = pLightMap->bLMapData[ p++ ]; @@ -731,7 +697,6 @@ bool Q3BSPFileImporter::importLightmap( const Q3BSP::Q3BSPModel *pModel, aiScene return true; } - // ------------------------------------------------------------------------------------------------ // Will search for a supported extension. bool Q3BSPFileImporter::expandFile( Q3BSP::Q3BSPZipArchive *pArchive, const std::string &rFilename, From 9c8e6f2127ba2fba57f7ca08cd176ebbc47b1d41 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 26 Sep 2018 20:52:59 +0200 Subject: [PATCH 3/4] Fix overflow by face allocation. --- code/Q3BSPFileImporter.cpp | 47 ++++++++++++++------------------- code/Q3BSPFileParser.cpp | 54 ++++++++++++++++---------------------- code/Q3BSPZipArchive.cpp | 21 +++++++-------- 3 files changed, 51 insertions(+), 71 deletions(-) diff --git a/code/Q3BSPFileImporter.cpp b/code/Q3BSPFileImporter.cpp index e6672596a..485869f77 100644 --- a/code/Q3BSPFileImporter.cpp +++ b/code/Q3BSPFileImporter.cpp @@ -252,14 +252,13 @@ bool Q3BSPFileImporter::findFirstMapInArchive( Q3BSPZipArchive &rArchive, std::s // ------------------------------------------------------------------------------------------------ // Creates the assimp specific data. void Q3BSPFileImporter::CreateDataFromImport( const Q3BSP::Q3BSPModel *pModel, aiScene* pScene, - Q3BSPZipArchive *pArchive ) -{ - if ( NULL == pModel || NULL == pScene ) + Q3BSPZipArchive *pArchive ) { + if (nullptr == pModel || nullptr == pScene) { return; + } pScene->mRootNode = new aiNode; - if ( !pModel->m_ModelName.empty() ) - { + if ( !pModel->m_ModelName.empty() ) { pScene->mRootNode->mName.Set( pModel->m_ModelName ); } @@ -276,32 +275,24 @@ void Q3BSPFileImporter::CreateDataFromImport( const Q3BSP::Q3BSPModel *pModel, a // ------------------------------------------------------------------------------------------------ // Creates all assimp nodes. void Q3BSPFileImporter::CreateNodes( const Q3BSP::Q3BSPModel *pModel, aiScene* pScene, - aiNode *pParent ) -{ - ai_assert( NULL != pModel ); - if ( NULL == pModel ) - { + aiNode *pParent ) { + if ( nullptr == pModel ) { return; } - unsigned int matIdx = 0; + unsigned int matIdx( 0 ); std::vector MeshArray; std::vector NodeArray; - for ( FaceMapIt it = m_MaterialLookupMap.begin(); it != m_MaterialLookupMap.end(); ++it ) - { + for ( FaceMapIt it = m_MaterialLookupMap.begin(); it != m_MaterialLookupMap.end(); ++it ) { std::vector *pArray = (*it).second; size_t numVerts = countData( *pArray ); - if ( 0 != numVerts ) - { + if ( 0 != numVerts ) { aiMesh* pMesh = new aiMesh; aiNode *pNode = CreateTopology( pModel, matIdx, *pArray, pMesh ); - if ( NULL != pNode ) - { + if ( nullptr != pNode ) { NodeArray.push_back( pNode ); MeshArray.push_back( pMesh ); - } - else - { + } else { delete pMesh; } } @@ -419,6 +410,14 @@ void Q3BSPFileImporter::createTriangleTopology( const Q3BSP::Q3BSPModel *pModel, if ( nullptr == pVertex ) { continue; } + if (idx > 2) { + idx = 0; + m_pCurrentFace = getNextFace(pMesh, faceIdx); + if (nullptr != m_pCurrentFace) { + m_pCurrentFace->mNumIndices = 3; + m_pCurrentFace->mIndices = new unsigned int[3]; + } + } pMesh->mVertices[ vertIdx ].Set( pVertex->vPosition.x, pVertex->vPosition.y, pVertex->vPosition.z ); pMesh->mNormals[ vertIdx ].Set( pVertex->vNormal.x, pVertex->vNormal.y, pVertex->vNormal.z ); @@ -430,14 +429,6 @@ void Q3BSPFileImporter::createTriangleTopology( const Q3BSP::Q3BSPModel *pModel, vertIdx++; idx++; - if ( idx > 2 ) { - idx = 0; - m_pCurrentFace = getNextFace( pMesh, faceIdx ); - if ( nullptr != m_pCurrentFace ) { - m_pCurrentFace->mNumIndices = 3; - m_pCurrentFace->mIndices = new unsigned int[ 3 ]; - } - } } //faceIdx--; } diff --git a/code/Q3BSPFileParser.cpp b/code/Q3BSPFileParser.cpp index f4aea28e6..f7038adeb 100644 --- a/code/Q3BSPFileParser.cpp +++ b/code/Q3BSPFileParser.cpp @@ -55,48 +55,44 @@ namespace Assimp { using namespace Q3BSP; // ------------------------------------------------------------------------------------------------ -Q3BSPFileParser::Q3BSPFileParser( const std::string &rMapName, Q3BSPZipArchive *pZipArchive ) : +Q3BSPFileParser::Q3BSPFileParser( const std::string &mapName, Q3BSPZipArchive *pZipArchive ) : m_sOffset( 0 ), m_Data(), - m_pModel( NULL ), + m_pModel(nullptr), m_pZipArchive( pZipArchive ) { - ai_assert( NULL != m_pZipArchive ); - ai_assert( !rMapName.empty() ); + ai_assert(nullptr != m_pZipArchive ); + ai_assert( !mapName.empty() ); - if ( !readData( rMapName ) ) + if ( !readData( mapName ) ) return; m_pModel = new Q3BSPModel; - m_pModel->m_ModelName = rMapName; - if ( !parseFile() ) - { + m_pModel->m_ModelName = mapName; + if ( !parseFile() ) { delete m_pModel; - m_pModel = NULL; + m_pModel = nullptr; } } // ------------------------------------------------------------------------------------------------ -Q3BSPFileParser::~Q3BSPFileParser() -{ +Q3BSPFileParser::~Q3BSPFileParser() { delete m_pModel; - m_pModel = NULL; + m_pModel = nullptr; } // ------------------------------------------------------------------------------------------------ -Q3BSP::Q3BSPModel *Q3BSPFileParser::getModel() const -{ +Q3BSP::Q3BSPModel *Q3BSPFileParser::getModel() const { return m_pModel; } // ------------------------------------------------------------------------------------------------ -bool Q3BSPFileParser::readData( const std::string &rMapName ) -{ +bool Q3BSPFileParser::readData( const std::string &rMapName ) { if ( !m_pZipArchive->Exists( rMapName.c_str() ) ) return false; IOStream *pMapFile = m_pZipArchive->Open( rMapName.c_str() ); - if ( NULL == pMapFile ) + if ( nullptr == pMapFile ) return false; const size_t size = pMapFile->FileSize(); @@ -113,10 +109,8 @@ bool Q3BSPFileParser::readData( const std::string &rMapName ) } // ------------------------------------------------------------------------------------------------ -bool Q3BSPFileParser::parseFile() -{ - if ( m_Data.empty() ) - { +bool Q3BSPFileParser::parseFile() { + if ( m_Data.empty() ) { return false; } @@ -128,7 +122,7 @@ bool Q3BSPFileParser::parseFile() // Imports the dictionary of the level getLumps(); - // Conunt data and prepare model data + // Count data and prepare model data countLumps(); // Read in Vertices @@ -208,7 +202,7 @@ void Q3BSPFileParser::getVertices() // ------------------------------------------------------------------------------------------------ void Q3BSPFileParser::getIndices() { - ai_assert( NULL != m_pModel ); + ai_assert(nullptr != m_pModel ); sQ3BSPLump *lump = m_pModel->m_Lumps[ kMeshVerts ]; size_t Offset = (size_t) lump->iOffset; @@ -220,7 +214,7 @@ void Q3BSPFileParser::getIndices() // ------------------------------------------------------------------------------------------------ void Q3BSPFileParser::getFaces() { - ai_assert( NULL != m_pModel ); + ai_assert(nullptr != m_pModel ); size_t Offset = m_pModel->m_Lumps[ kFaces ]->iOffset; for ( size_t idx = 0; idx < m_pModel->m_Faces.size(); idx++ ) @@ -235,7 +229,7 @@ void Q3BSPFileParser::getFaces() // ------------------------------------------------------------------------------------------------ void Q3BSPFileParser::getTextures() { - ai_assert( NULL != m_pModel ); + ai_assert(nullptr != m_pModel ); size_t Offset = m_pModel->m_Lumps[ kTextures ]->iOffset; for ( size_t idx=0; idx < m_pModel->m_Textures.size(); idx++ ) @@ -250,7 +244,7 @@ void Q3BSPFileParser::getTextures() // ------------------------------------------------------------------------------------------------ void Q3BSPFileParser::getLightMaps() { - ai_assert( NULL != m_pModel ); + ai_assert(nullptr != m_pModel ); size_t Offset = m_pModel->m_Lumps[kLightmaps]->iOffset; for ( size_t idx=0; idx < m_pModel->m_Lightmaps.size(); idx++ ) @@ -263,12 +257,10 @@ void Q3BSPFileParser::getLightMaps() } // ------------------------------------------------------------------------------------------------ -void Q3BSPFileParser::getEntities() -{ - int size = m_pModel->m_Lumps[ kEntities ]->iSize; +void Q3BSPFileParser::getEntities() { + const int size = m_pModel->m_Lumps[ kEntities ]->iSize; m_pModel->m_EntityData.resize( size ); - if ( size > 0 ) - { + if ( size > 0 ) { size_t Offset = m_pModel->m_Lumps[ kEntities ]->iOffset; memcpy( &m_pModel->m_EntityData[ 0 ], &m_Data[ Offset ], sizeof( char ) * size ); } diff --git a/code/Q3BSPZipArchive.cpp b/code/Q3BSPZipArchive.cpp index 5c9209512..3e1087b9a 100644 --- a/code/Q3BSPZipArchive.cpp +++ b/code/Q3BSPZipArchive.cpp @@ -183,7 +183,7 @@ Q3BSPZipArchive::Q3BSPZipArchive(IOSystem* pIOHandler, const std::string& rFile) m_ZipFileHandle = unzOpen2(rFile.c_str(), &mapping); - if(m_ZipFileHandle != NULL) { + if(m_ZipFileHandle != nullptr) { mapArchive(); } } @@ -197,26 +197,23 @@ Q3BSPZipArchive::~Q3BSPZipArchive() { } m_ArchiveMap.clear(); - if(m_ZipFileHandle != NULL) { + if(m_ZipFileHandle != nullptr) { unzClose(m_ZipFileHandle); - m_ZipFileHandle = NULL; + m_ZipFileHandle = nullptr; } } // ------------------------------------------------------------------------------------------------ // Returns true, if the archive is already open. bool Q3BSPZipArchive::isOpen() const { - return (m_ZipFileHandle != NULL); + return (m_ZipFileHandle != nullptr); } // ------------------------------------------------------------------------------------------------ // Returns true, if the filename is part of the archive. bool Q3BSPZipArchive::Exists(const char* pFile) const { - ai_assert(pFile != NULL); - bool exist = false; - - if (pFile != NULL) { + if (pFile != nullptr) { std::string rFile(pFile); std::map::const_iterator it = m_ArchiveMap.find(rFile); @@ -241,9 +238,9 @@ char Q3BSPZipArchive::getOsSeparator() const { // ------------------------------------------------------------------------------------------------ // Opens a file, which is part of the archive. IOStream *Q3BSPZipArchive::Open(const char* pFile, const char* /*pMode*/) { - ai_assert(pFile != NULL); + ai_assert(pFile != nullptr); - IOStream* result = NULL; + IOStream* result = nullptr; std::map::iterator it = m_ArchiveMap.find(pFile); @@ -258,7 +255,7 @@ IOStream *Q3BSPZipArchive::Open(const char* pFile, const char* /*pMode*/) { // Close a filestream. void Q3BSPZipArchive::Close(IOStream *pFile) { (void)(pFile); - ai_assert(pFile != NULL); + ai_assert(pFile != nullptr); // We don't do anything in case the file would be opened again in the future } @@ -277,7 +274,7 @@ void Q3BSPZipArchive::getFileList(std::vector &rFileList) { bool Q3BSPZipArchive::mapArchive() { bool success = false; - if(m_ZipFileHandle != NULL) { + if(m_ZipFileHandle != nullptr) { if(m_ArchiveMap.empty()) { // At first ensure file is already open if(unzGoToFirstFile(m_ZipFileHandle) == UNZ_OK) { From 74db0e906bbe4bf2a3409ab6399bdf0b27d60465 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 26 Sep 2018 21:19:40 +0200 Subject: [PATCH 4/4] Fix some minor findings. --- code/Q3BSPFileImporter.cpp | 140 ++++++++++++++++--------------------- code/Q3BSPFileImporter.h | 2 +- 2 files changed, 61 insertions(+), 81 deletions(-) diff --git a/code/Q3BSPFileImporter.cpp b/code/Q3BSPFileImporter.cpp index 485869f77..58fbef985 100644 --- a/code/Q3BSPFileImporter.cpp +++ b/code/Q3BSPFileImporter.cpp @@ -47,6 +47,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "Q3BSPFileParser.h" #include "Q3BSPFileData.h" +#include + #ifdef ASSIMP_BUILD_NO_OWN_ZLIB # include #else @@ -202,45 +204,40 @@ void Q3BSPFileImporter::InternReadFile(const std::string &rFile, aiScene* scene, // ------------------------------------------------------------------------------------------------ // Separates the map name from the import name. -void Q3BSPFileImporter::separateMapName( const std::string &rImportName, std::string &rArchiveName, - std::string &rMapName ) -{ - rArchiveName = ""; - rMapName = ""; - if ( rImportName.empty() ) - return; - - std::string::size_type pos = rImportName.rfind( "," ); - if ( std::string::npos == pos ) - { - rArchiveName = rImportName; +void Q3BSPFileImporter::separateMapName( const std::string &importName, std::string &archiveName, std::string &mapName ) { + archiveName = ""; + mapName = ""; + if (importName.empty()) { return; } - rArchiveName = rImportName.substr( 0, pos ); - rMapName = rImportName.substr( pos, rImportName.size() - pos - 1 ); + const std::string::size_type pos = importName.rfind( "," ); + if ( std::string::npos == pos ) { + archiveName = importName; + return; + } + + archiveName = importName.substr( 0, pos ); + mapName = importName.substr( pos, importName.size() - pos - 1 ); } // ------------------------------------------------------------------------------------------------ // Returns the first map in the map archive. -bool Q3BSPFileImporter::findFirstMapInArchive( Q3BSPZipArchive &rArchive, std::string &rMapName ) -{ - rMapName = ""; +bool Q3BSPFileImporter::findFirstMapInArchive( Q3BSPZipArchive &bspArchive, std::string &mapName ) { + mapName = ""; std::vector fileList; - rArchive.getFileList( fileList ); - if ( fileList.empty() ) + bspArchive.getFileList( fileList ); + if (fileList.empty()) { return false; + } - for ( std::vector::iterator it = fileList.begin(); it != fileList.end(); - ++it ) - { - std::string::size_type pos = (*it).find( "maps/" ); - if ( std::string::npos != pos ) - { + std::vector::iterator it( fileList.begin() ); + for ( ; it != fileList.end(); ++it ) { + const std::string::size_type pos = (*it).find( "maps/" ); + if ( std::string::npos != pos ) { std::string::size_type extPos = (*it).find( ".bsp" ); - if ( std::string::npos != extPos ) - { - rMapName = *it; + if ( std::string::npos != extPos ) { + mapName = *it; return true; } } @@ -287,27 +284,22 @@ void Q3BSPFileImporter::CreateNodes( const Q3BSP::Q3BSPModel *pModel, aiScene* p std::vector *pArray = (*it).second; size_t numVerts = countData( *pArray ); if ( 0 != numVerts ) { - aiMesh* pMesh = new aiMesh; - aiNode *pNode = CreateTopology( pModel, matIdx, *pArray, pMesh ); + aiMesh *pMesh( nullptr ); + aiNode *pNode = CreateTopology( pModel, matIdx, *pArray, &pMesh ); if ( nullptr != pNode ) { NodeArray.push_back( pNode ); MeshArray.push_back( pMesh ); - } else { - delete pMesh; } } matIdx++; } pScene->mNumMeshes = static_cast( MeshArray.size() ); - if ( pScene->mNumMeshes > 0 ) - { + if ( pScene->mNumMeshes > 0 ) { pScene->mMeshes = new aiMesh*[ pScene->mNumMeshes ]; - for ( size_t i = 0; i < MeshArray.size(); i++ ) - { + for ( size_t i = 0; i < MeshArray.size(); i++ ) { aiMesh *pMesh = MeshArray[ i ]; - if ( NULL != pMesh ) - { + if ( nullptr != pMesh ) { pScene->mMeshes[ i ] = pMesh; } } @@ -315,8 +307,7 @@ void Q3BSPFileImporter::CreateNodes( const Q3BSP::Q3BSPModel *pModel, aiScene* p pParent->mNumChildren = static_cast(MeshArray.size()); pParent->mChildren = new aiNode*[ pScene->mRootNode->mNumChildren ]; - for ( size_t i=0; imParent = pParent; pParent->mChildren[ i ] = pNode; @@ -326,54 +317,46 @@ void Q3BSPFileImporter::CreateNodes( const Q3BSP::Q3BSPModel *pModel, aiScene* p // ------------------------------------------------------------------------------------------------ // Creates the topology. -aiNode *Q3BSPFileImporter::CreateTopology( const Q3BSP::Q3BSPModel *pModel, - unsigned int materialIdx, - std::vector &rArray, - aiMesh* pMesh ) -{ +aiNode *Q3BSPFileImporter::CreateTopology( const Q3BSP::Q3BSPModel *pModel, unsigned int materialIdx, + std::vector &rArray, aiMesh **pMesh ) { size_t numVerts = countData( rArray ); - if ( 0 == numVerts ) - { - return NULL; + if ( 0 == numVerts ) { + return nullptr; } size_t numFaces = countFaces( rArray ); - if ( 0 == numFaces ) - { - return NULL; + if ( 0 == numFaces ) { + return nullptr; } + aiMesh *mesh = new aiMesh; size_t numTriangles = countTriangles( rArray ); - pMesh->mPrimitiveTypes = aiPrimitiveType_TRIANGLE; + mesh->mPrimitiveTypes = aiPrimitiveType_TRIANGLE; - pMesh->mFaces = new aiFace[ numTriangles ]; - pMesh->mNumFaces = static_cast(numTriangles); + mesh->mFaces = new aiFace[ numTriangles ]; + mesh->mNumFaces = static_cast(numTriangles); - pMesh->mNumVertices = static_cast(numVerts); - pMesh->mVertices = new aiVector3D[ numVerts ]; - pMesh->mNormals = new aiVector3D[ numVerts ]; - pMesh->mTextureCoords[ 0 ] = new aiVector3D[ numVerts ]; - pMesh->mTextureCoords[ 1 ] = new aiVector3D[ numVerts ]; - pMesh->mMaterialIndex = materialIdx; + mesh->mNumVertices = static_cast(numVerts); + mesh->mVertices = new aiVector3D[ numVerts ]; + mesh->mNormals = new aiVector3D[ numVerts ]; + mesh->mTextureCoords[ 0 ] = new aiVector3D[ numVerts ]; + mesh->mTextureCoords[ 1 ] = new aiVector3D[ numVerts ]; + mesh->mMaterialIndex = materialIdx; unsigned int faceIdx = 0; unsigned int vertIdx = 0; - pMesh->mNumUVComponents[ 0 ] = 2; - pMesh->mNumUVComponents[ 1 ] = 2; - for ( std::vector::const_iterator it = rArray.begin(); it != rArray.end(); ++it ) - { + mesh->mNumUVComponents[ 0 ] = 2; + mesh->mNumUVComponents[ 1 ] = 2; + for ( std::vector::const_iterator it = rArray.begin(); it != rArray.end(); ++it ) { Q3BSP::sQ3BSPFace *pQ3BSPFace = *it; ai_assert( NULL != pQ3BSPFace ); - if ( NULL == pQ3BSPFace ) - { + if ( nullptr == pQ3BSPFace ) { continue; } - if ( pQ3BSPFace->iNumOfFaceVerts > 0 ) - { - if ( pQ3BSPFace->iType == Polygon || pQ3BSPFace->iType == TriangleMesh ) - { - createTriangleTopology( pModel, pQ3BSPFace, pMesh, faceIdx, vertIdx ); + if ( pQ3BSPFace->iNumOfFaceVerts > 0 ) { + if ( pQ3BSPFace->iType == Polygon || pQ3BSPFace->iType == TriangleMesh ) { + createTriangleTopology( pModel, pQ3BSPFace, mesh, faceIdx, vertIdx ); } } } @@ -381,6 +364,7 @@ aiNode *Q3BSPFileImporter::CreateTopology( const Q3BSP::Q3BSPModel *pModel, aiNode *pNode = new aiNode; pNode->mNumMeshes = 1; pNode->mMeshes = new unsigned int[ 1 ]; + *pMesh = mesh; return pNode; } @@ -430,14 +414,12 @@ void Q3BSPFileImporter::createTriangleTopology( const Q3BSP::Q3BSPModel *pModel, idx++; } - //faceIdx--; } // ------------------------------------------------------------------------------------------------ // Creates all referenced materials. void Q3BSPFileImporter::createMaterials( const Q3BSP::Q3BSPModel *pModel, aiScene* pScene, - Q3BSPZipArchive *pArchive ) -{ + Q3BSPZipArchive *pArchive ) { if ( m_MaterialLookupMap.empty() ) { return; } @@ -459,18 +441,16 @@ void Q3BSPFileImporter::createMaterials( const Q3BSP::Q3BSPModel *pModel, aiScen extractIds( matName, textureId, lightmapId ); // Adding the texture - if ( -1 != textureId ) - { + if ( -1 != textureId ) { sQ3BSPTexture *pTexture = pModel->m_Textures[ textureId ]; - if ( NULL != pTexture ) - { + if ( nullptr != pTexture ) { std::string tmp( "*" ), texName( "" ); tmp += pTexture->strName; tmp += ".jpg"; normalizePathName( tmp, texName ); - if ( !importTextureFromArchive( pModel, pArchive, pScene, pMatHelper, textureId ) ) - { + if ( !importTextureFromArchive( pModel, pArchive, pScene, pMatHelper, textureId ) ) { + ASSIMP_LOG_ERROR("Cannot import texture from archive " + texName); } } diff --git a/code/Q3BSPFileImporter.h b/code/Q3BSPFileImporter.h index 0e25c8374..5f3e31157 100644 --- a/code/Q3BSPFileImporter.h +++ b/code/Q3BSPFileImporter.h @@ -89,7 +89,7 @@ protected: void CreateDataFromImport( const Q3BSP::Q3BSPModel *pModel, aiScene* pScene, Q3BSP::Q3BSPZipArchive *pArchive ); void CreateNodes( const Q3BSP::Q3BSPModel *pModel, aiScene* pScene, aiNode *pParent ); aiNode *CreateTopology( const Q3BSP::Q3BSPModel *pModel, unsigned int materialIdx, - std::vector &rArray, aiMesh* pMesh ); + std::vector &rArray, aiMesh **pMesh ); void createTriangleTopology( const Q3BSP::Q3BSPModel *pModel, Q3BSP::sQ3BSPFace *pQ3BSPFace, aiMesh* pMesh, unsigned int &rFaceIdx, unsigned int &rVertIdx ); void createMaterials( const Q3BSP::Q3BSPModel *pModel, aiScene* pScene, Q3BSP::Q3BSPZipArchive *pArchive );