One map to rule them all

This commit is contained in:
Mike Samsonov
2019-05-21 16:05:38 +01:00
parent 13bba4fb4c
commit 0eec1c1d4a
2 changed files with 5 additions and 9 deletions

View File

@@ -442,16 +442,15 @@ namespace Assimp {
void FBXConverter::GetUniqueName(const std::string &name, std::string &uniqueName)
{
uniqueName = name;
auto it_pair = mNodeNameInstances.insert({ name, 0 }); // duplicate node name instance count
auto it_pair = mNodeNames.insert({ name, 0 }); // duplicate node name instance count
unsigned int& i = it_pair.first->second;
auto uniqueIt_pair = mNodeNames.insert(uniqueName);
while (!uniqueIt_pair.second)
while (!it_pair.second)
{
i++;
std::stringstream ext;
std::ostringstream ext;
ext << name << std::setfill('0') << std::setw(3) << i;
uniqueName = ext.str();
uniqueIt_pair = mNodeNames.insert(uniqueName);
it_pair = mNodeNames.insert({ uniqueName, 0 });
}
}