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

Moved constructors and destructors to .cpp

Browse Source
This commit is contained in:
Robert Osfield 2018-05-11 11:15:45 +01:00
parent 5e6b081bb0
commit b70ffc9b8a
2 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/osgDB/Options
View File

@ -95,21 +95,9 @@ class OSGDB_EXPORT Options : public osg::Object
}; };
Options(): Options();
osg::Object(true),
_objectCacheHint(CACHE_ARCHIVES),
_precisionHint(FLOAT_PRECISION_ALL),
_buildKdTreesHint(NO_PREFERENCE) {}
Options(const std::string& str): Options(const std::string& str);
osg::Object(true),
_str(str),
_objectCacheHint(CACHE_ARCHIVES),
_precisionHint(FLOAT_PRECISION_ALL),
_buildKdTreesHint(NO_PREFERENCE)
{
parsePluginStringData(str);
}
Options(const Options& options,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); Options(const Options& options,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
@ -257,10 +245,11 @@ class OSGDB_EXPORT Options : public osg::Object
bool operator < (const Options &rhs) const; bool operator < (const Options &rhs) const;
bool operator == (const Options &rhs) const; bool operator == (const Options &rhs) const;
virtual ~Options() {}
protected: protected:
virtual ~Options();
std::string _str; std::string _str;
FilePathList _databasePaths; FilePathList _databasePaths;

28
src/osgDB/Options.cpp
View File

@ -16,6 +16,26 @@
using namespace osgDB; using namespace osgDB;
Options::Options():
osg::Object(true),
_objectCacheHint(CACHE_ARCHIVES),
_precisionHint(FLOAT_PRECISION_ALL),
_buildKdTreesHint(NO_PREFERENCE)
{
}
Options::Options(const std::string& str):
osg::Object(true),
_str(str),
_objectCacheHint(CACHE_ARCHIVES),
_precisionHint(FLOAT_PRECISION_ALL),
_buildKdTreesHint(NO_PREFERENCE)
{
parsePluginStringData(str);
}
Options::Options(const Options& options,const osg::CopyOp& copyop): Options::Options(const Options& options,const osg::CopyOp& copyop):
osg::Object(options,copyop), osg::Object(options,copyop),
_str(options._str), _str(options._str),
@ -32,7 +52,13 @@ Options::Options(const Options& options,const osg::CopyOp& copyop):
_fileLocationCallback(options._fileLocationCallback), _fileLocationCallback(options._fileLocationCallback),
_fileCache(options._fileCache), _fileCache(options._fileCache),
_terrain(options._terrain), _terrain(options._terrain),
_parentGroup(options._parentGroup) {} _parentGroup(options._parentGroup)
{
}
Options::~Options()
{
}
void Options::parsePluginStringData(const std::string& str, char separator1, char separator2) void Options::parsePluginStringData(const std::string& str, char separator1, char separator2)
{ {