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

- Collada Exporter id naming scheme once again revised to exclude any potential invalid chars

Browse Source 
- Collada Exporter outputs proper URLs for texture file names now.
- Updated Collada Loader to understand and convert texture file name URLs

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1191 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
ulfjorensen
2012-03-08 16:08:46 +00:00
parent 3ed356d3c4
commit 6970307b4e
2 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ColladaExporter.cpp
+14 -8
View File
@@ -156,7 +156,17 @@ void ColladaExporter::WriteImageEntry( const Surface& pSurface, const std::strin
{
mOutput << startstr << "<image id=\"" << pNameAdd << "\">" << endstr;
PushTag();
mOutput << startstr << "<init_from>" << pSurface.texture << "</init_from>" << endstr;
mOutput << startstr << "<init_from>";
if( pSurface.texture.find( "file://") == std::string::npos )
mOutput << "file://";
for( std::string::const_iterator it = std::begin( pSurface.texture); it != std::end( pSurface.texture); ++it )
{
if( isalnum( *it) || *it == '_' || *it == '.' || *it == '/' || *it == '\\' )
mOutput << *it;
else
mOutput << '%' << std::hex << size_t( (unsigned char) *it) << std::dec;
}
mOutput << "</init_from>" << endstr;
PopTag();
mOutput << startstr << "</image>" << endstr;
}
@@ -224,13 +234,9 @@ void ColladaExporter::WriteMaterials()
if( mat->Get( AI_MATKEY_NAME, name) != aiReturn_SUCCESS )
name = "mat";
materials[a].name = std::string( "m") + boost::lexical_cast<std::string> (a) + name.C_Str();
size_t pos;
while( (pos = materials[a].name.find( '#')) != std::string::npos )
materials[a].name[pos] = 'x';
while( (pos = materials[a].name.find( ' ')) != std::string::npos )
materials[a].name[pos] = '_';
while( (pos = materials[a].name.find( '"')) != std::string::npos )
materials[a].name[pos] = '_';
for( std::string::iterator it = materials[a].name.begin(); it != materials[a].name.end(); ++it )
if( !isalnum( *it) )
*it = '_';
ReadMaterialSurface( materials[a].ambient, mat, aiTextureType_AMBIENT, AI_MATKEY_COLOR_AMBIENT);
if( !materials[a].ambient.texture.empty() ) numTextures++;