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

Slight cleanup.

Browse Source 
Remive last reference to plibs file utility library.

Modified Files:
 	simgear/scene/model/SGReaderWriterXML.cxx
This commit is contained in:
frohlich
2009-06-06 10:38:53 +00:00
committed by Tim Moore
parent 671c84ad44
commit 3880d8e2f2
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
simgear/scene/model/SGReaderWriterXML.cxx
View File

@@ -78,11 +78,9 @@ SGReaderWriterXML::readNode(const std::string& fileName,
const SGReaderWriterXMLOptions* xmlOptions
= dynamic_cast<const SGReaderWriterXMLOptions*>(options);
string fg_root;
SGSharedPtr<SGPropertyNode> prop_root;
osg::Node *(*load_panel)(SGPropertyNode *)=0;
SGModelData *model_data=0;
SGPath externalTexturePath;
if (xmlOptions) {
prop_root = xmlOptions->getPropRoot();
@@ -93,8 +91,6 @@ SGReaderWriterXML::readNode(const std::string& fileName,
prop_root = new SGPropertyNode;
}
fg_root=osgDB::Registry::instance()->getDataFilePathList().front();
osg::Node *result=0;
try {
@@ -143,25 +139,28 @@ sgLoad3DModel_internal(const string &path,
SG_LOG(SG_GENERAL, SG_ALERT, "prop_root NULL: " << path);
}
string fg_root=osgDB::Registry::instance()->getDataFilePathList().front();
osgDB::FilePathList filePathList;
filePathList = osgDB::Registry::instance()->getDataFilePathList();
filePathList.push_front(osgDB::convertFileNameToNativeStyle("/"));
SGPath modelpath = osgDB::findFileInPath(path, filePathList);
if (modelpath.str().empty()) {
SG_LOG(SG_INPUT, SG_ALERT, "Failed to load file: \"" << path << "\"");
return 0;
}
SGPath texturepath = modelpath;
osg::ref_ptr<osg::Node> model;
osg::ref_ptr<osg::Group> group;
SGPropertyNode_ptr props = new SGPropertyNode;
// Load the 3D object itself
SGPath modelpath = path, texturepath = path;
if ( !ulIsAbsolutePathName( path.c_str() ) ) {
SGPath tmp = fg_root;
tmp.append(modelpath.str());
modelpath = texturepath = tmp;
}
// Check for an XML wrapper
if (modelpath.str().substr(modelpath.str().size() - 4, 4) == ".xml") {
try {
if (modelpath.extension() == "xml") {
try {
readProperties(modelpath.str(), props);
} catch (const sg_throwable &t) {
SG_LOG(SG_INPUT, SG_ALERT, "Failed to load xml: " << t.getFormattedMessage());
SG_LOG(SG_INPUT, SG_ALERT, "Failed to load xml: "
<< t.getFormattedMessage());
throw;
}
if (overlay)