coverity findings: initialize lookup table for materials.
parent
0f1874d954
commit
e1818d8ab6
|
@ -95,12 +95,16 @@ void FindMeshCenter (aiMesh* mesh, aiVector3D& out, aiVector3D& min, aiVector3D&
|
||||||
}
|
}
|
||||||
|
|
||||||
// -------------------------------------------------------------------------------
|
// -------------------------------------------------------------------------------
|
||||||
void FindSceneCenter (aiScene* scene, aiVector3D& out, aiVector3D& min, aiVector3D& max)
|
void FindSceneCenter (aiScene* scene, aiVector3D& out, aiVector3D& min, aiVector3D& max) {
|
||||||
{
|
if ( NULL == scene ) {
|
||||||
if (scene->mNumMeshes == 0) return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( 0 == scene->mNumMeshes ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
FindMeshCenter(scene->mMeshes[0], out, min, max);
|
FindMeshCenter(scene->mMeshes[0], out, min, max);
|
||||||
for (unsigned int i = 1; i < scene->mNumMeshes; ++i)
|
for (unsigned int i = 1; i < scene->mNumMeshes; ++i) {
|
||||||
{
|
|
||||||
aiVector3D tout, tmin, tmax;
|
aiVector3D tout, tmin, tmax;
|
||||||
FindMeshCenter(scene->mMeshes[i], tout, tmin, tmax);
|
FindMeshCenter(scene->mMeshes[i], tout, tmin, tmax);
|
||||||
if (min[0] > tmin[0]) min[0] = tmin[0];
|
if (min[0] > tmin[0]) min[0] = tmin[0];
|
||||||
|
@ -151,6 +155,8 @@ float ComputePositionEpsilon(const aiMesh* pMesh)
|
||||||
// -------------------------------------------------------------------------------
|
// -------------------------------------------------------------------------------
|
||||||
float ComputePositionEpsilon(const aiMesh* const* pMeshes, size_t num)
|
float ComputePositionEpsilon(const aiMesh* const* pMeshes, size_t num)
|
||||||
{
|
{
|
||||||
|
ai_assert( NULL != pMeshes );
|
||||||
|
|
||||||
const float epsilon = 1e-4f;
|
const float epsilon = 1e-4f;
|
||||||
|
|
||||||
// calculate the position bounds so we have a reliable epsilon to check position differences against
|
// calculate the position bounds so we have a reliable epsilon to check position differences against
|
||||||
|
|
|
@ -55,7 +55,7 @@ using namespace Assimp;
|
||||||
// ------------------------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------------------------
|
||||||
// Constructor to be privately used by Importer
|
// Constructor to be privately used by Importer
|
||||||
RemoveRedundantMatsProcess::RemoveRedundantMatsProcess()
|
RemoveRedundantMatsProcess::RemoveRedundantMatsProcess()
|
||||||
{
|
: configFixedMaterials() {
|
||||||
// nothing to do here
|
// nothing to do here
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -126,16 +126,18 @@ void RemoveRedundantMatsProcess::Execute( aiScene* pScene)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: reimplement this algorithm to work in-place
|
// TODO: re-implement this algorithm to work in-place
|
||||||
unsigned int* aiMappingTable = new unsigned int[pScene->mNumMaterials];
|
unsigned int *aiMappingTable = new unsigned int[pScene->mNumMaterials];
|
||||||
|
for ( unsigned int i=0; i<pScene->mNumMaterials; i++ ) {
|
||||||
|
aiMappingTable[ i ] = 0;
|
||||||
|
}
|
||||||
unsigned int iNewNum = 0;
|
unsigned int iNewNum = 0;
|
||||||
|
|
||||||
// Iterate through all materials and calculate a hash for them
|
// Iterate through all materials and calculate a hash for them
|
||||||
// store all hashes in a list and so a quick search whether
|
// store all hashes in a list and so a quick search whether
|
||||||
// we do already have a specific hash. This allows us to
|
// we do already have a specific hash. This allows us to
|
||||||
// determine which materials are identical.
|
// determine which materials are identical.
|
||||||
uint32_t* aiHashes;
|
uint32_t *aiHashes = new uint32_t[ pScene->mNumMaterials ];;
|
||||||
aiHashes = new uint32_t[pScene->mNumMaterials];
|
|
||||||
for (unsigned int i = 0; i < pScene->mNumMaterials;++i)
|
for (unsigned int i = 0; i < pScene->mNumMaterials;++i)
|
||||||
{
|
{
|
||||||
// No mesh is referencing this material, remove it.
|
// No mesh is referencing this material, remove it.
|
||||||
|
@ -177,18 +179,18 @@ void RemoveRedundantMatsProcess::Execute( aiScene* pScene)
|
||||||
|
|
||||||
// generate new names for all modified materials
|
// generate new names for all modified materials
|
||||||
const unsigned int idx = aiMappingTable[p];
|
const unsigned int idx = aiMappingTable[p];
|
||||||
if (ppcMaterials[idx])
|
if (ppcMaterials[idx]) {
|
||||||
{
|
|
||||||
aiString sz;
|
aiString sz;
|
||||||
sz.length = ::sprintf(sz.data,"JoinedMaterial_#%u",p);
|
sz.length = ::sprintf(sz.data,"JoinedMaterial_#%u",p);
|
||||||
((aiMaterial*)ppcMaterials[idx])->AddProperty(&sz,AI_MATKEY_NAME);
|
((aiMaterial*)ppcMaterials[idx])->AddProperty(&sz,AI_MATKEY_NAME);
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
ppcMaterials[idx] = pScene->mMaterials[p];
|
ppcMaterials[idx] = pScene->mMaterials[p];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// update all material indices
|
// update all material indices
|
||||||
for (unsigned int p = 0; p < pScene->mNumMeshes;++p) {
|
for (unsigned int p = 0; p < pScene->mNumMeshes;++p) {
|
||||||
aiMesh* mesh = pScene->mMeshes[p];
|
aiMesh* mesh = pScene->mMeshes[p];
|
||||||
|
ai_assert( NULL!=mesh );
|
||||||
mesh->mMaterialIndex = aiMappingTable[mesh->mMaterialIndex];
|
mesh->mMaterialIndex = aiMappingTable[mesh->mMaterialIndex];
|
||||||
}
|
}
|
||||||
// delete the old material list
|
// delete the old material list
|
||||||
|
|
Loading…
Reference in New Issue