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

Revert "Moved the Options constructors and destructor implementaions into the cpp to make it easier to do debugging"

Browse Source 
This reverts commit 0fc7aa8cc0.
This commit is contained in:
Robert Osfield
2018-05-11 11:11:48 +01:00
parent fcde92ad89
commit a211ea4e68
2 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/osgDB/Options
View File

@@ -95,9 +95,21 @@ 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);
@@ -245,11 +257,10 @@ 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;

29
src/osgDB/Options.cpp
View File

@@ -16,26 +16,6 @@
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),
@@ -52,14 +32,7 @@ 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()
{
abort();
}
void Options::parsePluginStringData(const std::string& str, char separator1, char separator2) void Options::parsePluginStringData(const std::string& str, char separator1, char separator2)
{ {