v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2060 from assimp/fix-unique-names-fix-ci 

Fix unique names fix ci
pull/2061/head
Kim Kulling 2018-07-18 12:51:05 +02:00 committed by GitHub
parent fbc8b4c5d6 417fed1693
commit 54f3043728
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
code/FBXConverter.cpp
View File

@ -73,10 +73,6 @@ using namespace Util;
#define CONVERT_FBX_TIME(time) static_cast<double>(time) / 46186158000L #define CONVERT_FBX_TIME(time) static_cast<double>(time) / 46186158000L
// XXX vc9's debugger won't step into anonymous namespaces
//namespace {
Converter::Converter( aiScene* out, const Document& doc ) Converter::Converter( aiScene* out, const Document& doc )
: defaultMaterialIndex() : defaultMaterialIndex()
, out( out ) , out( out )
@ -407,14 +403,15 @@ static bool HasName( NodeNameCache &cache, const std::string &name ) {
return it != cache.end(); return it != cache.end();
} }
void Converter::GetUniqueName( const std::string &name, std::string uniqueName ) { void Converter::GetUniqueName( const std::string &name, std::string &uniqueName ) {
if ( !HasName( mNodeNames, name ) ) { if ( !HasName( mNodeNames, name ) ) {
uniqueName = name; uniqueName = name;
mNodeNames.push_back( uniqueName );
return; return;
} }
int i( 0 ); int i( 0 );
std::string newName; std::string newName( name );
while ( HasName( mNodeNames, newName ) ) { while ( HasName( mNodeNames, newName ) ) {
++i; ++i;
newName.clear(); newName.clear();
@ -3100,8 +3097,6 @@ void Converter::TransferDataToScene()
} }
} }
//} // !anon
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
void ConvertToAssimpScene(aiScene* out, const Document& doc) void ConvertToAssimpScene(aiScene* out, const Document& doc)
{ {

2
code/FBXConverter.h
View File

@ -131,7 +131,7 @@ private:
void ConvertCamera( const Camera& cam, const std::string &orig_name ); void ConvertCamera( const Camera& cam, const std::string &orig_name );
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
void GetUniqueName( const std::string &name, std::string uniqueName ); void GetUniqueName( const std::string &name, std::string& uniqueName );
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
// this returns unified names usable within assimp identifiers (i.e. no space characters - // this returns unified names usable within assimp identifiers (i.e. no space characters -