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

OSG_INIT_SINGLETON_PROXY into DatabasePager::prototype() and Registry::instance(), removing the InitRegistry proxy object in src/osgViewer/ViewerBase.cpp.

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.4@15148 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield 2015-10-05 11:18:46 +00:00
parent 61d317b0b8
commit f4e71bad3a
3 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgDB/DatabasePager.cpp
View File

@ -1236,6 +1236,8 @@ osg::ref_ptr<DatabasePager>& DatabasePager::prototype()
return s_DatabasePager; return s_DatabasePager;
} }
OSG_INIT_SINGLETON_PROXY(ProxyInitDatabasePager, DatabasePager::prototype())
DatabasePager* DatabasePager::create() DatabasePager* DatabasePager::create()
{ {
return DatabasePager::prototype().valid() ? return DatabasePager::prototype().valid() ?

2
src/osgDB/Registry.cpp
View File

@ -214,6 +214,8 @@ Registry* Registry::instance(bool erase)
return s_registry.get(); // will return NULL on erase return s_registry.get(); // will return NULL on erase
} }
OSG_INIT_SINGLETON_PROXY(ProxyInitRegistry, Registry::instance())
// definition of the Registry // definition of the Registry
Registry::Registry() Registry::Registry()

17
src/osgViewer/ViewerBase.cpp
View File

@ -40,23 +40,6 @@ static osg::ApplicationUsageProxy ViewerBase_e5(osg::ApplicationUsage::ENVIRONME
using namespace osgViewer; using namespace osgViewer;
struct InitRegistry
{
InitRegistry()
{
osgDB::Registry::instance();
}
~InitRegistry()
{
osgDB::DatabasePager::prototype() = 0;
osgDB::Registry::instance(true);
}
};
static InitRegistry s_InitRegistry;
ViewerBase::ViewerBase(): ViewerBase::ViewerBase():
osg::Object(true) osg::Object(true)
{ {