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

Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml

pull/2966/head
kimkulling 2020-09-22 15:20:35 +02:00
parent 8c88526da8 c4039d5cf0
commit dee8e5bee1
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/AssetLib/Collada/ColladaParser.cpp
View File

@ -256,6 +256,7 @@ void ColladaParser::ReadContents(XmlNode &node) {
void ColladaParser::ReadStructure(XmlNode &node) { void ColladaParser::ReadStructure(XmlNode &node) {
for (XmlNode currentNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling()) { for (XmlNode currentNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling()) {
const std::string name = std::string(currentNode.name()); const std::string name = std::string(currentNode.name());
ASSIMP_LOG_DEBUG("last name" + name);
if (name == "asset") if (name == "asset")
ReadAssetInfo(currentNode); ReadAssetInfo(currentNode);
else if (name == "library_animations") else if (name == "library_animations")
@ -405,7 +406,7 @@ void ColladaParser::PostProcessControllers() {
for (ControllerLibrary::iterator it = mControllerLibrary.begin(); it != mControllerLibrary.end(); ++it) { for (ControllerLibrary::iterator it = mControllerLibrary.begin(); it != mControllerLibrary.end(); ++it) {
meshId = it->second.mMeshId; meshId = it->second.mMeshId;
if (meshId.empty()) { if (meshId.empty()) {
break; continue;
} }
ControllerLibrary::iterator findItr = mControllerLibrary.find(meshId); ControllerLibrary::iterator findItr = mControllerLibrary.find(meshId);

2
include/assimp/StringUtils.h
View File

@ -165,6 +165,7 @@ AI_FORCE_INLINE std::string Rgba2Hex(int r, int g, int b, int a, bool with_head)
return ss.str(); return ss.str();
} }
// trim from start (in place)
inline void ltrim(std::string &s) { inline void ltrim(std::string &s) {
s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](unsigned char ch) { s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](unsigned char ch) {
return !std::isspace(ch); return !std::isspace(ch);
@ -183,4 +184,5 @@ inline void trim(std::string &s) {
ltrim(s); ltrim(s);
rtrim(s); rtrim(s);
} }
#endif // INCLUDED_AI_STRINGUTILS_H #endif // INCLUDED_AI_STRINGUTILS_H