- extract MaterialHelper and move all of its members to aiMaterial in /include.
- pull in IOhannes' patch to set the gcc default visibility for all symbols to NO and to mark ASSIMP_API with __attribute__ ((visibility("default"))).
- drop unneeded ASSIMP_API from most internal classes in /code, we just need to keep some exports on Windows to keep AssimpView alive.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1066 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
@@ -481,7 +481,7 @@ void Q3BSPFileImporter::createMaterials( const Q3BSP::Q3BSPModel *pModel, aiScen
|
||||
}
|
||||
|
||||
aiMatName.Set( matName );
|
||||
Assimp::MaterialHelper *pMatHelper = new Assimp::MaterialHelper;
|
||||
aiMaterial *pMatHelper = new aiMaterial;
|
||||
pMatHelper->AddProperty( &aiMatName, AI_MATKEY_NAME );
|
||||
|
||||
extractIds( matName, textureId, lightmapId );
|
||||
@@ -623,7 +623,7 @@ aiFace *Q3BSPFileImporter::getNextFace( aiMesh *pMesh, unsigned int &rFaceIdx )
|
||||
// Imports a texture file.
|
||||
bool Q3BSPFileImporter::importTextureFromArchive( const Q3BSP::Q3BSPModel *pModel,
|
||||
Q3BSP::Q3BSPZipArchive *pArchive, aiScene* /*pScene*/,
|
||||
Assimp::MaterialHelper *pMatHelper, int textureId )
|
||||
aiMaterial *pMatHelper, int textureId )
|
||||
{
|
||||
std::vector<std::string> supportedExtensions;
|
||||
supportedExtensions.push_back( ".jpg" );
|
||||
@@ -690,7 +690,7 @@ bool Q3BSPFileImporter::importTextureFromArchive( const Q3BSP::Q3BSPModel *pMode
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
// Imports a light map file.
|
||||
bool Q3BSPFileImporter::importLightmap( const Q3BSP::Q3BSPModel *pModel, aiScene* pScene,
|
||||
Assimp::MaterialHelper *pMatHelper, int lightmapId )
|
||||
aiMaterial *pMatHelper, int lightmapId )
|
||||
{
|
||||
if ( NULL == pModel || NULL == pScene || NULL == pMatHelper )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user