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

Update ColladaExporter.cpp 

Small review findings.
pull/2690/head
Kim Kulling 2019-10-19 12:08:57 +02:00 committed by GitHub
parent 075d05e604
commit c350d4f487
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
code/Collada/ColladaExporter.cpp
View File

@ -94,29 +94,30 @@ void ExportSceneCollada(const char* pFile, IOSystem* pIOSystem, const aiScene* p
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
// Encodes a string into a valid XML ID using the xsd:ID schema qualifications. // Encodes a string into a valid XML ID using the xsd:ID schema qualifications.
const std::string XMLIDEncode(const std::string& name) static const std::string XMLIDEncode(const std::string& name) {
{
const char XML_ID_CHARS[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_-."; const char XML_ID_CHARS[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_-.";
const unsigned int XML_ID_CHARS_COUNT = sizeof(XML_ID_CHARS) / sizeof(char); const unsigned int XML_ID_CHARS_COUNT = sizeof(XML_ID_CHARS) / sizeof(char);
if (name.length() == 0) if (name.length() == 0) {
return name; return name;
}
std::stringstream idEncoded; std::stringstream idEncoded;
// xsd:ID must start with letter or underscore // xsd:ID must start with letter or underscore
if (!((name[0] >= 'A' && name[0] <= 'z') || name[0] == '_')) if (!((name[0] >= 'A' && name[0] <= 'z') || name[0] == '_')) {
idEncoded << '_'; idEncoded << '_';
}
for (std::string::const_iterator it = name.begin(); it != name.end(); ++it) for (std::string::const_iterator it = name.begin(); it != name.end(); ++it) {
{
// xsd:ID can only contain letters, digits, underscores, hyphens and periods // xsd:ID can only contain letters, digits, underscores, hyphens and periods
if (strchr(XML_ID_CHARS, *it) != nullptr) if (strchr(XML_ID_CHARS, *it) != nullptr) {
idEncoded << *it; idEncoded << *it;
else } else {
// Select placeholder character based on invalid character to prevent name collisions // Select placeholder character based on invalid character to prevent name collisions
idEncoded << XML_ID_CHARS[(*it) % XML_ID_CHARS_COUNT]; idEncoded << XML_ID_CHARS[(*it) % XML_ID_CHARS_COUNT];
} }
}
return idEncoded.str(); return idEncoded.str();
} }