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

From Colin McDonald and Robert Osfield, "When a serializer shared library is loaded it registers all of

Browse Source 
the wrappers it contains.  The registration creates a prototype
object for all of the wrapped classes.  For some of the higher-level
classes this can be a bit heavy.

I noticed a problem with a model which required a single class from
osgSim.  When osgdb_serializers_osgsim.so was loaded it registered
wrappers and created prototype objects for all of the osgSim classes,
including osgSim::ScalarBar.  The constructor for that class creates
several drawables, and loads arial.ttf using the freetype plugin.  I
don't need that, and don't even ship the font or plugin with my
application, resulting in an unexplained warning message loading
the model.

I've modified the ObjectWrapper class to defer the prototype object
creation until if & when actually required."
This commit is contained in:
Robert Osfield
2013-10-02 13:59:00 +00:00
parent 0ec35d5a5d
commit 69f2fb56b3
3 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osgDB/ObjectWrapper.cpp
View File

@@ -84,18 +84,18 @@ void osgDB::split( const std::string& src, StringList& list, char separator )
//
// ObjectWrapper
//
ObjectWrapper::ObjectWrapper( osg::Object* proto, const std::string& name,
ObjectWrapper::ObjectWrapper( CreateInstanceFunc* createInstanceFunc, const std::string& name,
const std::string& associates )
: osg::Referenced(),
_proto(proto), _name(name), _version(0)
_createInstanceFunc(createInstanceFunc), _name(name), _version(0)
{
split( associates, _associates );
}
ObjectWrapper::ObjectWrapper( osg::Object* proto, const std::string& domain, const std::string& name,
ObjectWrapper::ObjectWrapper( CreateInstanceFunc* createInstanceFunc, const std::string& domain, const std::string& name,
const std::string& associates )
: osg::Referenced(),
_proto(proto), _domain(domain), _name(name), _version(0)
_createInstanceFunc(createInstanceFunc), _domain(domain), _name(name), _version(0)
{
split( associates, _associates );
}
@@ -312,10 +312,10 @@ void ObjectWrapper::writeSchema( StringList& properties, TypeList& types )
//
// RegisterWrapperProxy
//
RegisterWrapperProxy::RegisterWrapperProxy( osg::Object* proto, const std::string& name,
RegisterWrapperProxy::RegisterWrapperProxy( ObjectWrapper::CreateInstanceFunc *createInstanceFunc, const std::string& name,
const std::string& associates, AddPropFunc func )
{
_wrapper = new ObjectWrapper( proto, name, associates );
_wrapper = new ObjectWrapper( createInstanceFunc, name, associates );
if ( func ) (*func)( _wrapper.get() );
if (Registry::instance())
@@ -337,10 +337,10 @@ RegisterWrapperProxy::~RegisterWrapperProxy()
// RegisterCustomWrapperProxy
//
RegisterCustomWrapperProxy::RegisterCustomWrapperProxy(
osg::Object* proto, const std::string& domain, const std::string& name,
ObjectWrapper::CreateInstanceFunc *createInstanceFunc, const std::string& domain, const std::string& name,
const std::string& associates, AddPropFunc func )
{
_wrapper = new ObjectWrapper( proto, domain, name, associates );
_wrapper = new ObjectWrapper( createInstanceFunc, domain, name, associates );
if ( func ) (*func)( domain.c_str(), _wrapper.get() );
if (Registry::instance())