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

Use an implementation file for SGReaderWriterOptions.

Browse Source
This commit is contained in:
Mathias Froehlich 2012-03-04 08:40:56 +01:00
parent 49d8b96768
commit c9165a565b
3 changed files with 55 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
simgear/scene/util/CMakeLists.txt
View File

@ -31,6 +31,7 @@ set(SOURCES
PrimitiveUtils.cxx
QuadTreeBuilder.cxx
SGEnlargeBoundingBox.cxx
SGReaderWriterOptions.cxx
SGSceneFeatures.cxx
SGSceneUserData.cxx
SGStateAttributeVisitor.cxx

51
simgear/scene/util/SGReaderWriterOptions.cxx Normal file
View File

@ -0,0 +1,51 @@
// Copyright (C) 2007 Tim Moore timoore@redhat.com
// Copyright (C) 2008 Till Busch buti@bux.at
// Copyright (C) 2011 Mathias Froehlich
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License as
// published by the Free Software Foundation; either version 2 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
#include "SGReaderWriterOptions.hxx"
#include <osgDB/Registry>
namespace simgear
{
SGReaderWriterOptions::~SGReaderWriterOptions()
{
}
SGReaderWriterOptions*
SGReaderWriterOptions::copyOrCreate(const osgDB::Options* options)
{
if (!options)
options = osgDB::Registry::instance()->getOptions();
if (!options)
return new SGReaderWriterOptions;
if (!dynamic_cast<const SGReaderWriterOptions*>(options))
return new SGReaderWriterOptions(*options);
return new SGReaderWriterOptions(*static_cast<const SGReaderWriterOptions*>(options));
}
SGReaderWriterOptions*
SGReaderWriterOptions::fromPath(const std::string& path)
{
SGReaderWriterOptions* options = copyOrCreate(0);
options->setDatabasePath(path);
return options;
}
}

22
simgear/scene/util/SGReaderWriterOptions.hxx
View File

@ -21,7 +21,6 @@
#define SGREADERWRITEROPTIONS_HXX 1
#include <osgDB/Options>
#include <osgDB/Registry>
#include <simgear/scene/model/modellib.hxx>
#include <simgear/props/props.hxx>
@ -93,26 +92,11 @@ public:
void setInstantiateEffects(bool instantiateEffects)
{ _instantiateEffects = instantiateEffects; }
static SGReaderWriterOptions* copyOrCreate(const osgDB::Options* options)
{
if (!options)
options = osgDB::Registry::instance()->getOptions();
if (!options)
return new SGReaderWriterOptions;
if (!dynamic_cast<const SGReaderWriterOptions*>(options))
return new SGReaderWriterOptions(*options);
return new SGReaderWriterOptions(*static_cast<const SGReaderWriterOptions*>(options));
}
static SGReaderWriterOptions* fromPath(const std::string& path)
{
SGReaderWriterOptions* options = copyOrCreate(0);
options->setDatabasePath(path);
return options;
}
static SGReaderWriterOptions* copyOrCreate(const osgDB::Options* options);
static SGReaderWriterOptions* fromPath(const std::string& path);
protected:
virtual ~SGReaderWriterOptions() {}
virtual ~SGReaderWriterOptions();
private:
SGSharedPtr<SGPropertyNode> _propertyNode;