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

fix 3mf rel-parsing

pull/2966/head
kkulling 2020-09-02 17:45:37 +02:00
parent 73fa2cbe88
commit 87d2580aad
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
code/AssetLib/3MF/D3MFOpcPackage.cpp
View File

@ -76,11 +76,14 @@ public:
void ParseRootNode(XmlNode &node) { void ParseRootNode(XmlNode &node) {
ParseAttributes(node); ParseAttributes(node);
for (XmlNode currentNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling()) { for (XmlNode currentNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling()) {
ParseChildNode(currentNode); std::string name = currentNode.name();
if (name == "Relationships") {
ParseRelationsNode(currentNode);
}
} }
} }
void ParseAttributes(XmlNode &/*node*/) { void ParseAttributes(XmlNode & /*node*/) {
// empty // empty
} }
@ -91,18 +94,22 @@ public:
return true; return true;
} }
void ParseChildNode(XmlNode &node) { void ParseRelationsNode(XmlNode &node) {
if (node.empty()) { if (node.empty()) {
return; return;
} }
OpcPackageRelationshipPtr relPtr(new OpcPackageRelationship()); for (XmlNode currentNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling()) {
std::string name = node.name(); std::string name = currentNode.name();
relPtr->id = node.attribute(XmlTag::RELS_ATTRIB_ID.c_str()).as_string(); if (name == "Relationship") {
relPtr->type = node.attribute(XmlTag::RELS_ATTRIB_TYPE.c_str()).as_string(); OpcPackageRelationshipPtr relPtr(new OpcPackageRelationship());
relPtr->target = node.attribute(XmlTag::RELS_ATTRIB_TARGET.c_str()).as_string(); relPtr->id = node.attribute(XmlTag::RELS_ATTRIB_ID.c_str()).as_string();
if (validateRels(relPtr)) { relPtr->type = node.attribute(XmlTag::RELS_ATTRIB_TYPE.c_str()).as_string();
m_relationShips.push_back(relPtr); relPtr->target = node.attribute(XmlTag::RELS_ATTRIB_TARGET.c_str()).as_string();
if (validateRels(relPtr)) {
m_relationShips.push_back(relPtr);
}
}
} }
} }