dd996a3289
forcing users to use osgDB::readRef*File() methods. The later is preferable as it closes a potential threading bug when using paging databases in conjunction
with the osgDB::Registry Object Cache. This threading bug occurs when one thread gets an object from the Cache via an osgDB::read*File() call where only
a pointer to the object is passed back, so taking a reference to the object is delayed till it gets reassigned to a ref_ptr<>, but at the same time another
thread calls a flush of the Object Cache deleting this object as it's referenceCount is now zero. Using osgDB::readREf*File() makes sure the a ref_ptr<> is
passed back and the referenceCount never goes to zero.
To ensure the OSG builds when OSG_PROVIDE_READFILE is to OFF the many cases of osgDB::read*File() usage had to be replaced with a ref_ptr<> osgDB::readRef*File()
usage. The avoid this change causing lots of other client code to be rewritten to handle the use of ref_ptr<> in place of C pointer I introduced a serious of
templte methods in various class to adapt ref_ptr<> to the underly C pointer to be passed to old OSG API's, example of this is found in include/osg/Group:
bool addChild(Node* child); // old method which can only be used with a Node*
tempalte<class T> bool addChild(const osg::ref_ptr<T>& child) { return addChild(child.get()); } // adapter template method
These changes together cover 149 modified files, so it's a large submission. This extent of changes are warrent to make use of the Object Cache
and multi-threaded loaded more robust.
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15164 16af8721-9629-0410-8352-f15c8da7e697
115 lines
3.4 KiB
C++
115 lines
3.4 KiB
C++
#include <osg/UserDataContainer>
|
|
|
|
#include <osgDB/ObjectWrapper>
|
|
#include <osgDB/InputStream>
|
|
#include <osgDB/OutputStream>
|
|
|
|
static bool checkUDC_UserData( const osg::DefaultUserDataContainer& udc )
|
|
{
|
|
return dynamic_cast<const osg::Object*>(udc.getUserData())!=0;
|
|
}
|
|
|
|
static bool readUDC_UserData( osgDB::InputStream& is, osg::DefaultUserDataContainer& udc )
|
|
{
|
|
is >> is.BEGIN_BRACKET;
|
|
osg::ref_ptr<osg::Object> object = is.readObject();
|
|
if(object) udc.setUserData(object);
|
|
is >> is.END_BRACKET;
|
|
return true;
|
|
}
|
|
|
|
static bool writeUDC_UserData( osgDB::OutputStream& os, const osg::DefaultUserDataContainer& udc )
|
|
{
|
|
os << os.BEGIN_BRACKET << std::endl;
|
|
os.writeObject(dynamic_cast<const osg::Object*>(udc.getUserData()));
|
|
os << os.END_BRACKET << std::endl;
|
|
return true;
|
|
}
|
|
|
|
// _descriptions
|
|
static bool checkUDC_Descriptions( const osg::DefaultUserDataContainer& udc )
|
|
{
|
|
return udc.getNumDescriptions()>0;
|
|
}
|
|
|
|
static bool readUDC_Descriptions( osgDB::InputStream& is, osg::DefaultUserDataContainer& udc )
|
|
{
|
|
unsigned int size = is.readSize(); is >> is.BEGIN_BRACKET;
|
|
for ( unsigned int i=0; i<size; ++i )
|
|
{
|
|
std::string value;
|
|
is.readWrappedString( value );
|
|
udc.addDescription( value );
|
|
}
|
|
is >> is.END_BRACKET;
|
|
return true;
|
|
}
|
|
|
|
static bool writeUDC_Descriptions( osgDB::OutputStream& os, const osg::DefaultUserDataContainer& udc )
|
|
{
|
|
const osg::UserDataContainer::DescriptionList& slist = udc.getDescriptions();
|
|
os.writeSize(slist.size()); os << os.BEGIN_BRACKET << std::endl;
|
|
for ( osg::UserDataContainer::DescriptionList::const_iterator itr=slist.begin();
|
|
itr!=slist.end(); ++itr )
|
|
{
|
|
os.writeWrappedString( *itr );
|
|
os << std::endl;
|
|
}
|
|
os << os.END_BRACKET << std::endl;
|
|
return true;
|
|
}
|
|
|
|
|
|
static bool checkUDC_UserObjects( const osg::DefaultUserDataContainer& udc )
|
|
{
|
|
return udc.getNumUserObjects()>0;
|
|
}
|
|
|
|
static bool readUDC_UserObjects( osgDB::InputStream& is, osg::DefaultUserDataContainer& udc )
|
|
{
|
|
unsigned int size = is.readSize(); is >> is.BEGIN_BRACKET;
|
|
for( unsigned int i=0; i<size; ++i )
|
|
{
|
|
osg::ref_ptr<osg::Object> read_object = is.readObject();
|
|
if (read_object) udc.addUserObject( read_object );
|
|
}
|
|
is >> is.END_BRACKET;
|
|
return true;
|
|
}
|
|
|
|
static bool writeUDC_UserObjects( osgDB::OutputStream& os, const osg::DefaultUserDataContainer& udc )
|
|
{
|
|
unsigned int numObjects = udc.getNumUserObjects();
|
|
os.writeSize(numObjects); os << os.BEGIN_BRACKET << std::endl;
|
|
for ( unsigned int i=0; i<numObjects; ++i )
|
|
{
|
|
os << udc.getUserObject(i);
|
|
}
|
|
os << os.END_BRACKET << std::endl;
|
|
return true;
|
|
}
|
|
|
|
|
|
namespace UserDataContainerNamespace
|
|
{
|
|
REGISTER_OBJECT_WRAPPER( UserDataContainer,
|
|
0,
|
|
osg::UserDataContainer,
|
|
"osg::Object osg::UserDataContainer" )
|
|
{
|
|
}
|
|
}
|
|
|
|
namespace DefaultUserDataContainerNamespace
|
|
{
|
|
REGISTER_OBJECT_WRAPPER( DefaultUserDataContainer,
|
|
new osg::DefaultUserDataContainer,
|
|
osg::DefaultUserDataContainer,
|
|
"osg::Object osg::UserDataContainer osg::DefaultUserDataContainer" )
|
|
{
|
|
ADD_USER_SERIALIZER( UDC_UserData ); // _userData
|
|
ADD_USER_SERIALIZER( UDC_Descriptions ); // _descriptions
|
|
ADD_USER_SERIALIZER( UDC_UserObjects ); // _userData
|
|
}
|
|
}
|