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
49 lines
1.5 KiB
C++
49 lines
1.5 KiB
C++
#include <osgVolume/Locator>
|
|
#include <osgDB/ObjectWrapper>
|
|
#include <osgDB/InputStream>
|
|
#include <osgDB/OutputStream>
|
|
|
|
static bool checkLocatorCallbacks( const osgVolume::Locator& locator )
|
|
{
|
|
return locator.getLocatorCallbacks().size()>0;
|
|
}
|
|
|
|
static bool readLocatorCallbacks( osgDB::InputStream& is, osgVolume::Locator& locator )
|
|
{
|
|
unsigned int size = is.readSize(); is >> is.BEGIN_BRACKET;
|
|
for ( unsigned int i=0; i<size; ++i )
|
|
{
|
|
osg::ref_ptr<osgVolume::Locator::LocatorCallback> cb = is.readObjectOfType<osgVolume::Locator::LocatorCallback>();
|
|
if ( cb ) locator.addCallback( cb );
|
|
}
|
|
is >> is.END_BRACKET;
|
|
return true;
|
|
}
|
|
|
|
static bool writeLocatorCallbacks( osgDB::OutputStream& os, const osgVolume::Locator& locator )
|
|
{
|
|
const osgVolume::Locator::LocatorCallbacks& callbacks = locator.getLocatorCallbacks();
|
|
os.writeSize( callbacks.size() ); os << os.BEGIN_BRACKET << std::endl;
|
|
for ( osgVolume::Locator::LocatorCallbacks::const_iterator itr=callbacks.begin();
|
|
itr!=callbacks.end(); ++itr )
|
|
{
|
|
os << itr->get();
|
|
}
|
|
os << os.END_BRACKET << std::endl;
|
|
return true;
|
|
}
|
|
|
|
REGISTER_OBJECT_WRAPPER( osgVolume_Locator,
|
|
new osgVolume::Locator,
|
|
osgVolume::Locator,
|
|
"osg::Object osgVolume::Locator" )
|
|
{
|
|
ADD_MATRIXD_SERIALIZER( Transform, osg::Matrixd() ); // _transform
|
|
|
|
ADD_USER_SERIALIZER( LocatorCallbacks );
|
|
{
|
|
UPDATE_TO_VERSION_SCOPED( 90 )
|
|
REMOVE_SERIALIZER( LocatorCallbacks );
|
|
}
|
|
}
|