Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '87a0e7703258576f1a7e4ba763b961da70c1cd91' into contrib

Browse Source 
Conflicts:
	code/ColladaExporter.cpp
This commit is contained in:
Léo Terziman
2014-01-17 11:19:29 +01:00
parent a940102d70 87a0e77032
commit 6c0ebb679a
37 changed files with 1716 additions and 1197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/ColladaExporter.cpp
View File

@@ -311,16 +311,15 @@ void ColladaExporter::WriteMaterials()
aiString name;
if( mat->Get( AI_MATKEY_NAME, name) != aiReturn_SUCCESS )
name = "mat";
if(material_names.find(name.C_Str()) != material_names.end()) {
materials[a].name = std::string( "m") + boost::lexical_cast<std::string> (a) + "_" + name.C_Str();
material_names.insert(materials[a].name);
} else {
materials[a].name = name.C_Str();
}
for( std::string::iterator it = materials[a].name.begin(); it != materials[a].name.end(); ++it )
if( !isalnum( *it) )
name = "mat";
materials[a].name = std::string( "m") + boost::lexical_cast<std::string> (a) + name.C_Str();
for( std::string::iterator it = materials[a].name.begin(); it != materials[a].name.end(); ++it ) {
// isalnum on MSVC asserts for code points in [0,255]. Thus prevent unwanted promotion
// of char to signed int and take the unsigned char value.
if( !isalnum( static_cast<uint8_t>(*it) ) ) {
*it = '_';
}
}
aiShadingMode shading;
materials[a].shading_model = "phong";