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

Cleanup.

Browse Source 
Modified Files:
	simgear/scene/model/SGReaderWriterXML.cxx
This commit is contained in:
frohlich
2009-06-07 11:27:53 +00:00
committed by Tim Moore
parent 4286cafdeb
commit ec88373eb7
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -188,7 +188,7 @@ sgLoad3DModel_internal(const string &path,
// Assume that textures are in
// the same location as the XML file.
if (!model) {
if (texturepath.extension() != "")
if (!texturepath.extension().empty())
texturepath = texturepath.dir();
options->setDatabasePath(texturepath.str());
@@ -301,7 +301,7 @@ sgLoad3DModel_internal(const string &path,
particle_nodes = props->getChildren("particlesystem");
for (unsigned i = 0; i < particle_nodes.size(); ++i) {
if (i==0) {
if (texturepath.extension() != "")
if (!texturepath.extension().empty())
texturepath = texturepath.dir();
options->setDatabasePath(texturepath.str());
@@ -322,17 +322,17 @@ sgLoad3DModel_internal(const string &path,
SGAnimation::animate(group.get(), animation_nodes[i], prop_root,
options.get());
if (props->hasChild("debug-outfile")) {
std::string outputfile = props->getStringValue("debug-outfile",
"debug-model.osg");
osgDB::writeNodeFile(*group, outputfile);
}
if (!needTransform && group->getNumChildren() < 2) {
model = group->getChild(0);
group->removeChild(model.get());
model->setUserData(group->getUserData());
return model.release();
}
if (props->hasChild("debug-outfile")) {
std::string outputfile = props->getStringValue("debug-outfile",
"debug-model.osg");
osgDB::writeNodeFile(*group, outputfile);
}
return group.release();
}