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

Ran script to remove trailing spaces and tabs

Browse Source
This commit is contained in:
Robert Osfield
2012-03-21 17:36:20 +00:00
parent 1e35f8975d
commit 14a563dc9f
1495 changed files with 21873 additions and 21873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/osgPlugins/ive/ProxyNode.cpp
View File

@@ -66,20 +66,20 @@ void ProxyNode::write(DataOutputStream* out)
out->writeUInt(getNumFileNames());
unsigned int numChildrenToWriteOut = 0;
unsigned int i;
std::string writeDirectory;
if (!(out->getOptions()->getDatabasePathList().empty())) writeDirectory = out->getOptions()->getDatabasePathList().front();
if (!writeDirectory.empty()) writeDirectory = writeDirectory + "/";
bool writeOutExternalIVEFIles = !out->getIncludeExternalReferences() && out->getWriteExternalReferenceFiles() && !out->getUseOriginalExternalReferences();
for(i=0; i<getNumFileNames(); i++)
{
if (getFileName(i).empty())
{
out->writeString("");
if (i<getNumChildren()) ++numChildrenToWriteOut;
}
else
@@ -161,7 +161,7 @@ void ProxyNode::read(DataInputStream* in)
if (in->getOptions() && !in->getOptions()->getDatabasePathList().empty())
{
const std::string& path = in->getOptions()->getDatabasePathList().front();
if (!path.empty())
if (!path.empty())
{
setDatabasePath(path);
}
@@ -183,7 +183,7 @@ void ProxyNode::read(DataInputStream* in)
{
osgDB::FilePathList& fpl = ((osgDB::ReaderWriter::Options*)in->getOptions())->getDatabasePathList();
fpl.push_front( fpl.empty() ? osgDB::getFilePath(getFileName(i)) : fpl.front()+'/'+ osgDB::getFilePath(getFileName(i)));
addChild(in->readNode());
addChild(in->readNode());
fpl.pop_front();
}