FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Created a simple XmlNode parser class for reading of basic xml files, such as used by present3D.

Browse Source 
Converted Present3D across from using libxml2 to using the new osgDB::XmlNode/XmlNode::Input classes from Xml Parsing.
This changes removes the dependency on libxml2, and allows the present3D application and p3d to work on all platforms.
This commit is contained in:
Robert Osfield
2009-04-29 20:30:21 +00:00
parent b42706f034
commit 590ac02859
19 changed files with 1895 additions and 1455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
applications/present3D/ReadShowFile.cpp
View File

@@ -24,8 +24,7 @@
#include <osgVolume/VolumeTile>
#include <libxml/xmlmemory.h>
#include <libxml/parser.h>
#include <osgDB/XmlParser>
#include <string.h>
@@ -107,10 +106,14 @@ bool p3d::readEnvVars(const std::string& fileName)
!osgDB::equalCaseInsensitive(ext,"p3d")) return false;
xmlDocPtr doc;
xmlNodePtr cur;
osg::ref_ptr<osgDB::XmlNode> doc = new osgDB::XmlNode;
osgDB::XmlNode* root = 0;
doc = xmlParseFile(fileName.c_str());
osgDB::XmlNode::Input input;
input.open(fileName);
input.readAllDataIntoBuffer();
doc->read(input);
if (doc == NULL )
{
@@ -118,50 +121,43 @@ bool p3d::readEnvVars(const std::string& fileName)
return false;
}
cur = xmlDocGetRootElement(doc);
if (cur == NULL)
{
fprintf(stderr,"empty document\n");
xmlFreeDoc(doc);
return false;
for(osgDB::XmlNode::Children::iterator itr = doc->children.begin();
itr != doc->children.end() && !root;
++itr)
{
if ((*itr)->name=="presentation") root = itr->get();
}
if (xmlStrcmp(cur->name, (const xmlChar *) "presentation"))
{
fprintf(stderr,"document of the wrong type, root node != presentation");
xmlFreeDoc(doc);
return false;
if (root == NULL)
{
fprintf(stderr,"empty document\n");
return false;
}
if (root->name!="presentation")
{
fprintf(stderr,"document of the wrong type, root node != presentation");
return false;
}
bool readVars = false;
xmlChar *key;
cur = cur->xmlChildrenNode;
while (cur != NULL) {
for(osgDB::XmlNode::Children::iterator itr = root->children.begin();
itr != root->children.end();
++itr)
{
osgDB::XmlNode* cur = itr->get();
if ((!xmlStrcmp(cur->name, (const xmlChar *)"env")))
if (cur->name=="env")
{
key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
if (key)
{
char* str = strdup((char*)key);
osg::notify(osg::INFO)<<"putenv("<<str<<")"<<std::endl;
putenv(str);
readVars = true;
}
xmlFree(key);
char* str = strdup(cur->contents.c_str());
osg::notify(osg::INFO)<<"putenv("<<str<<")"<<std::endl;
putenv(str);
readVars = true;
}
cur = cur->next;
}
#ifndef __APPLE__
xmlFreeDoc(doc);
#endif
return readVars;
return readVars;
}
osg::Node* p3d::readHoldingSlide(const std::string& filename)