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

Removed renduent osgDB::Registry DatabasePager methods

Browse Source
This commit is contained in:
Robert Osfield 2008-10-30 13:05:08 +00:00
parent 5141397d6f
commit ae61033a32
3 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/osgDB/Registry
View File

@ -466,17 +466,7 @@ class OSGDB_EXPORT Registry : public osg::Referenced
/** get the attached library with specified name.*/
DynamicLibrary* getLibrary(const std::string& fileName);
/** Set the DatabasePager.*/
void setDatabasePager(DatabasePager* databasePager) { _databasePager = databasePager; }
/** Get the DatabasePager, creating one if one is not already created.*/
DatabasePager* getOrCreateDatabasePager();
/** Get the DatabasePager. Return 0 if no DatabasePager has been assigned.*/
DatabasePager* getDatabasePager() { return _databasePager.get(); }
/** Set the SharedStateManager.*/
void setSharedStateManager(SharedStateManager* SharedStateManager) { _sharedStateManager = SharedStateManager; }
@ -609,7 +599,6 @@ class OSGDB_EXPORT Registry : public osg::Referenced
ArchiveExtensionList _archiveExtList;
osg::ref_ptr<DatabasePager> _databasePager;
osg::ref_ptr<SharedStateManager> _sharedStateManager;
};

11
src/osgDB/Registry.cpp
View File

@ -324,10 +324,6 @@ void Registry::destruct()
{
// osg::notify(osg::NOTICE)<<"Registry::destruct()"<<std::endl;
// switch off the pager and its associated thread before we clean up
// rest of the Registry.
_databasePager = 0;
// clean up the SharedStateManager
_sharedStateManager = 0;
@ -2072,13 +2068,6 @@ void Registry::releaseGLObjects(osg::State* state)
}
}
DatabasePager* Registry::getOrCreateDatabasePager()
{
if (!_databasePager) _databasePager = new DatabasePager;
return _databasePager.get();
}
SharedStateManager* Registry::getOrCreateSharedStateManager()
{
if (!_sharedStateManager) _sharedStateManager = new SharedStateManager;

19
src/osgWrappers/osgDB/Registry.cpp
View File

@ -23,7 +23,6 @@
#include <osg/Uniform>
#include <osgDB/Archive>
#include <osgDB/AuthenticationMap>
#include <osgDB/DatabasePager>
#include <osgDB/DotOsgWrapper>
#include <osgDB/DynamicLibrary>
#include <osgDB/FileCache>
@ -542,21 +541,6 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Registry)
__DynamicLibrary_P1__getLibrary__C5_std_string_R1,
"get the attached library with specified name. ",
"");
I_Method1(void, setDatabasePager, IN, osgDB::DatabasePager *, databasePager,
Properties::NON_VIRTUAL,
__void__setDatabasePager__DatabasePager_P1,
"Set the DatabasePager. ",
"");
I_Method0(osgDB::DatabasePager *, getOrCreateDatabasePager,
Properties::NON_VIRTUAL,
__DatabasePager_P1__getOrCreateDatabasePager,
"Get the DatabasePager, creating one if one is not already created. ",
"");
I_Method0(osgDB::DatabasePager *, getDatabasePager,
Properties::NON_VIRTUAL,
__DatabasePager_P1__getDatabasePager,
"Get the DatabasePager. ",
"Return 0 if no DatabasePager has been assigned. ");
I_Method1(void, setSharedStateManager, IN, osgDB::SharedStateManager *, SharedStateManager,
Properties::NON_VIRTUAL,
__void__setSharedStateManager__SharedStateManager_P1,
@ -617,9 +601,6 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Registry)
I_SimpleProperty(const osgDB::FilePathList &, DataFilePathList,
__C5_FilePathList_R1__getDataFilePathList,
__void__setDataFilePathList__C5_FilePathList_R1);
I_SimpleProperty(osgDB::DatabasePager *, DatabasePager,
__DatabasePager_P1__getDatabasePager,
__void__setDatabasePager__DatabasePager_P1);
I_SimpleProperty(osgDB::FileCache *, FileCache,
__FileCache_P1__getFileCache,
__void__setFileCache__FileCache_P1);