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

Fix memory handling of xml-nodes in the parser.

Browse Source
This commit is contained in:
Kim Kulling
2020-09-01 21:48:50 +02:00
parent 3c2133a3b9
commit 73fa2cbe88
10 changed files with 86 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
code/AssetLib/XGL/XGLLoader.cpp
View File

@@ -199,27 +199,18 @@ void XGLImporter::InternReadFile(const std::string &pFile,
#endif
}
// construct the irrXML parser
/*CIrrXML_IOStreamReader st(stream.get());
m_reader.reset( createIrrXMLReader( ( IFileReadCallBack* ) &st ) );*/
mXmlParser = new XmlParser;
XmlNode *root = mXmlParser->parse(stream.get());
if (nullptr == root) {
// parse the XML file
mXmlParser = new XmlParser;
if (!mXmlParser->parse(stream.get())) {
return;
}
// parse the XML file
XmlNode root = mXmlParser->getRootNode();
TempScope scope;
if (!ASSIMP_stricmp(root->name(), "world")) {
if (!ASSIMP_stricmp(root.name(), "world")) {
ReadWorld(scope);
}
/* while (ReadElement()) {
if (!ASSIMP_stricmp(m_reader->getNodeName(),"world")) {
ReadWorld(scope);
}
}*/
std::vector<aiMesh *> &meshes = scope.meshes_linear;
std::vector<aiMaterial *> &materials = scope.materials_linear;
if (!meshes.size() || !materials.size()) {
@@ -249,8 +240,8 @@ void XGLImporter::InternReadFile(const std::string &pFile,
// ------------------------------------------------------------------------------------------------
void XGLImporter::ReadWorld(TempScope &scope) {
XmlNode *root = mXmlParser->getRootNode();
for (XmlNode &node : root->children()) {
XmlNode root = mXmlParser->getRootNode();
for (XmlNode &node : root.children()) {
const std::string &s = node.name();
// XXX right now we'd skip <lighting> if it comes after
// <object> or <mesh>
@@ -261,7 +252,7 @@ void XGLImporter::ReadWorld(TempScope &scope) {
}
}
aiNode *const nd = ReadObject( *root, scope, true);
aiNode *const nd = ReadObject(root, scope, true);
if (!nd) {
ThrowException("failure reading <world>");
}