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

Fix material-base AMF-unittest.

pull/2966/head
kimkulling 2020-09-10 13:56:04 +02:00
parent c2f0bf68af
commit cca9eddb1c
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
code/AssetLib/AMF/AMFImporter.cpp
View File

@ -86,8 +86,13 @@ void AMFImporter::Clear() {
} }
} }
AMFImporter::AMFImporter() AI_NO_EXCEPT : mNodeElement_Cur(nullptr), AMFImporter::AMFImporter() AI_NO_EXCEPT :
mXmlParser(nullptr) { mNodeElement_Cur(nullptr),
mXmlParser(nullptr),
mUnit(),
mVersion(),
mMaterial_Converted(),
mTexture_Converted() {
// empty // empty
} }
@ -295,15 +300,14 @@ void AMFImporter::ParseHelper_Node_Exit() {
// Root XML element. // Root XML element.
// Multi elements - No. // Multi elements - No.
void AMFImporter::ParseNode_Root() { void AMFImporter::ParseNode_Root() {
std::string unit, version; AMFNodeElementBase *ne = nullptr;
AMFNodeElementBase *ne(nullptr);
XmlNode *root = mXmlParser->findNode("amf"); XmlNode *root = mXmlParser->findNode("amf");
if (nullptr == root) { if (nullptr == root) {
throw DeadlyImportError("Root node \"amf\" not found."); throw DeadlyImportError("Root node \"amf\" not found.");
} }
XmlNode node = *root; XmlNode node = *root;
unit = node.attribute("unit").as_string(); mUnit = node.attribute("unit").as_string();
version = node.attribute("version").as_string(); mVersion = node.attribute("version").as_string();
// Read attributes for node <amf>. // Read attributes for node <amf>.
// Check attributes // Check attributes
@ -318,11 +322,11 @@ void AMFImporter::ParseNode_Root() {
mNodeElement_Cur = ne; // set first "current" element mNodeElement_Cur = ne; // set first "current" element
// and assign attribute's values // and assign attribute's values
((AMFRoot *)ne)->Unit = unit; ((AMFRoot *)ne)->Unit = mUnit;
((AMFRoot *)ne)->Version = version; ((AMFRoot *)ne)->Version = mVersion;
// Check for child nodes // Check for child nodes
for (XmlNode currentNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling()) { for (XmlNode &currentNode : node.children() ) {
const std::string currentName = currentNode.name(); const std::string currentName = currentNode.name();
if (currentName == "object") { if (currentName == "object") {
ParseNode_Object(currentNode); ParseNode_Object(currentNode);
@ -335,6 +339,7 @@ void AMFImporter::ParseNode_Root() {
} else if (currentName == "metadata") { } else if (currentName == "metadata") {
ParseNode_Metadata(currentNode); ParseNode_Metadata(currentNode);
} }
mNodeElement_Cur = ne;
} }
mNodeElement_Cur = ne; // force restore "current" element mNodeElement_Cur = ne; // force restore "current" element
mNodeElement_List.push_back(ne); // add to node element list because its a new object in graph. mNodeElement_List.push_back(ne); // add to node element list because its a new object in graph.

1
code/AssetLib/AMF/AMFImporter.hpp
View File

@ -301,6 +301,7 @@ private:
std::list<AMFNodeElementBase *> mNodeElement_List; ///< All elements of scene graph. std::list<AMFNodeElementBase *> mNodeElement_List; ///< All elements of scene graph.
XmlParser *mXmlParser; XmlParser *mXmlParser;
std::string mUnit; std::string mUnit;
std::string mVersion;
std::list<SPP_Material> mMaterial_Converted; ///< List of converted materials for postprocessing step. std::list<SPP_Material> mMaterial_Converted; ///< List of converted materials for postprocessing step.
std::list<SPP_Texture> mTexture_Converted; ///< List of converted textures for postprocessing step. std::list<SPP_Texture> mTexture_Converted; ///< List of converted textures for postprocessing step.
}; };